* Some serious code cleanups

- adjusted @reloadbattleconf to not depend on variable ordering
- changed all battle vars to 'int' (removes pointless duplicit coding)
- added min, max and default columns to battle config data structure
- added properly bounded values for these columns (or at least tried to)
- battle-conf loading will now complain if it finds unknown settings,
  and will reject values that are outside of the allowed range
- added CHATROOM_TITLE_SIZE and CHATROOM_PASS_SIZE 
- partially cleaned up chatroom manipulation code
* Fixed 'Job_Professer' typo in mage jobchange quest

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

15 files changed, 66 insertions, 131 deletions

diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index db04fdd0b..9c0f708fd 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -17,21 +17,17 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: Value is a bit field. If no description is given,
+// Note 3: Value is a bit field. If no description is given,
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
-// Who should have a baseatk value (makes str affect damage)? (Note 4)
+// Who should have a baseatk value (makes str affect damage)? (Note 3)
 enable_baseatk: 9
 
-// Who can have perfect flee? (Note 4)
+// Who can have perfect flee? (Note 3)
 enable_perfect_flee: 1
 
-// Who can have critical attacks? (Note 4)
+// Who can have critical attacks? (Note 3)
 // (Note that there are some skills that always do critical hit regardless of this)
 enable_critical: 1
 
@@ -83,7 +79,7 @@ max_hitrate: 100
 // 2 = agi_penalty_num is reduced from FLEE as an exact amount
 agi_penalty_type: 1
 
-// When agi penalty is enabled, to whom it should apply to? (Note 4)
+// When agi penalty is enabled, to whom it should apply to? (Note 3)
 // By default, only players get the penalty.
 agi_penalty_target: 1
 
@@ -99,7 +95,7 @@ agi_penalty_num: 10
 // 2 = vit_penalty_num is reduced from FLEE as an exact amount
 vit_penalty_type: 1
 
-// When vit penalty is enabled, to whom it should apply to? (Note 4)
+// When vit penalty is enabled, to whom it should apply to? (Note 3)
 // By default, only players get the penalty.
 vit_penalty_target: 1
 
@@ -132,11 +128,11 @@ agi_penalty_count_lv: 2
 // 4+: None of the above, count will always be 0
 vit_penalty_count_lv: 3
 
-// Change attacker's direction to face opponent on every attack? (Note 4)
+// Change attacker's direction to face opponent on every attack? (Note 3)
 attack_direction_change: 15
 
 // For those who is set, attacks of Neutral element will not get any elemental
-// adjustment (100% versus on all defense-elements) (Note 4)
+// adjustment (100% versus on all defense-elements) (Note 3)
 // NOTE: This is the setting that makes it so non-players can hit for full
 // damage against Ghost-type targets (eg: Ghostring wearing players).
 attack_attr_none: 14
diff --git a/conf-tmpl/battle/client.conf b/conf-tmpl/battle/client.conf
index 3e6b72415..756083f85 100644
--- a/conf-tmpl/battle/client.conf
+++ b/conf-tmpl/battle/client.conf
@@ -17,10 +17,6 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // Set here which client version do you accept. Add all values of clients:
diff --git a/conf-tmpl/battle/drops.conf b/conf-tmpl/battle/drops.conf
index ea50c4701..c46de1c85 100644
--- a/conf-tmpl/battle/drops.conf
+++ b/conf-tmpl/battle/drops.conf
@@ -17,41 +17,37 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // If an item is dropped, does it go stright into the users inventory? (Note 1)
 item_auto_get: no
 
-// How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds) [Note 3]
+// How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds)
 flooritem_lifetime: 60000
 
-// Grace time during which only the person who did the most damage to a monster can get the item? (in milliseconds) (Note 3)
+// Grace time during which only the person who did the most damage to a monster can get the item? (in milliseconds)
 item_first_get_time: 3000
 
-// Grace time during which only the first and second person who did the most damage to a monster can get the item? (in milliseconds) (Note 3)
+// Grace time during which only the first and second person who did the most damage to a monster can get the item? (in milliseconds)
 // (Takes effect after item_first_get_time elapses)
 item_second_get_time: 1000
 
-// Grace time during which only the first, second and third person who did the most damage to a monster can get the item? (in milliseconds) (Note 3)
+// Grace time during which only the first, second and third person who did the most damage to a monster can get the item? (in milliseconds)
 // (Takes effect after the item_second_get_time elapses)
 item_third_get_time: 1000
 
-// Grace time to apply to MvP reward items when the Most Valuable Player can't get the prize item and it drops on the ground? (in milliseconds) (Note 3)
+// Grace time to apply to MvP reward items when the Most Valuable Player can't get the prize item and it drops on the ground? (in milliseconds)
 mvp_item_first_get_time: 10000
 
-// Grace time for the first and second MvP so they can get the item? (in milliseconds) (Note 3)
+// Grace time for the first and second MvP so they can get the item? (in milliseconds)
 // (Takes effect after mvp_item_first_get_time elapses)
 mvp_item_second_get_time: 10000
 
-// Grace time for the first, second and third MvP so they can get the item? (in milliseconds) (Note 3)
+// Grace time for the first, second and third MvP so they can get the item? (in milliseconds)
 // (Takes effect after mvp_item_second_get_time elapses)
 mvp_item_third_get_time: 2000
 
-// Item drop rates (Note 2) (Note 3 applies to the rate settings only)
+// Item drop rates (Note 2)
 
 // The rate the common items are dropped (Items that are in the ETC tab, besides card)
 item_rate_common: 100
diff --git a/conf-tmpl/battle/exp.conf b/conf-tmpl/battle/exp.conf
index 1d10156c8..7a9fa6ae0 100644
--- a/conf-tmpl/battle/exp.conf
+++ b/conf-tmpl/battle/exp.conf
@@ -17,19 +17,14 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: The max level of classes is stored in the exp table.
+// Note 3: The max level of classes is stored in the exp table.
 //         See files db/exp.txt and db/exp2.txt to change them.
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
-//--------------------------------------------------------------
 //--------------------------------------------------------------
 
-// Rate at which exp. is given. (Note 2) (Note 3)
+// Rate at which exp. is given. (Note 2)
 base_exp_rate: 100
 
-// Rate at which job exp. is given. (Note 2) (Note 3)
+// Rate at which job exp. is given. (Note 2)
 job_exp_rate: 100
 
 // Turn this on to allow a player to level up more than once from a kill. (Note 1)
@@ -57,7 +52,7 @@ exp_bonus_attacker: 25
 // (eg: if set at 5, the max bonus is 4*bonus-per-char regardless of attackers)
 exp_bonus_max_attacker: 12
 
-// MVP bonus exp rate. (Note 2) (Note 3)
+// MVP bonus exp rate. (Note 2)
 mvp_exp_rate: 100
 
 // The rate of job exp. from using Heal skill (100 is the same as the heal amount, 200 is double.
@@ -89,7 +84,7 @@ death_penalty_base: 100
 // Job exp. penalty rate (Each 100 is 1% of their exp)
 death_penalty_job: 100
 
-// When a player dies, how much zeny should we penalize them with? (Note 3)
+// When a player dies, how much zeny should we penalize them with?
 // NOTE: It is a percentage of their zeny, so 100 = 1%
 zeny_penalty: 0
 
diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index e034db2bf..981672103 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -17,10 +17,6 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // The maximum quantity of monsters that can be summoned per GM command (0 denotes an unlimited quantity)
@@ -59,8 +55,7 @@ atcommand_gm_only: no
 hide_GM_session: no
 
 // Ban people that try trade dupe.
-// Duration of the ban, in minutes (default: 5). Value from 0 to 32767
-// to disable the ban, set 0
+// Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
 ban_hack_trade: 5
 
 // Set here minimum level of a (online) GM that can receive all informations about any player that try to hack, spoof a name, etc.
@@ -76,14 +71,14 @@ hack_info_GM_level: 60
 // default: 20 (first level after normal player or super'normal' player)
 any_warp_GM_min_level: 20
 
-// The minimum level for a GM to be unable to distribyte items.
+// The minimum level for a GM to be unable to distribute items.
 // You should set this to the same level @item is set to in the atcommand.conf
 // NEVER SET THIS VALUE TO 0, or you will block drop/trade for normal players
 gm_cant_drop_min_lv: 1
 
 //The trust level for your GMs. Any GMs ABOVE this level will be able to distribute items
 //ie: Use Storage/Guild Storage, Drop Items, Use Vend, Trade items. 
-gm_cant_drop_max_lv: 98
+gm_cant_drop_max_lv: 0
 
 // Minimum GM level to see the hp of every player? (Default: 60)
 // no/0 can be used to disable it.
diff --git a/conf-tmpl/battle/guild.conf b/conf-tmpl/battle/guild.conf
index 311df8c1f..2c474552e 100644
--- a/conf-tmpl/battle/guild.conf
+++ b/conf-tmpl/battle/guild.conf
@@ -17,10 +17,6 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // When making a guild, an Emperium is consumed? (Note 1)
@@ -55,7 +51,7 @@ gvg_misc_attack_damage_rate: 60
 gvg_flee_penalty: 20
 
 // When the emperium is broken during WoE, how long before the removal
-// of monsters/players from the castle? (in miliseconds) (Note 3)
+// of monsters/players from the castle? (in miliseconds)
 gvg_eliminate_time: 7000
 
 // Can the 'Glory of Guild' skill be learnt in the Guild window,
diff --git a/conf-tmpl/battle/homunc.conf b/conf-tmpl/battle/homunc.conf
index 3022926a1..6d4e0ba38 100644
--- a/conf-tmpl/battle/homunc.conf
+++ b/conf-tmpl/battle/homunc.conf
@@ -17,13 +17,11 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------
 
-// Homunculus setting [Note 4]
+// Homunculus setting (Note 3)
 // Activates various 'quirks' that makes them behave unlike normal characters.
 // 0x001: Can't be targetted by support skills (except for their master)
 // 0x002: Immunity to land skills
@@ -45,4 +43,4 @@ hom_rename: no
 hvan_explosion_intimate: 45000
 
 // Show stat growth to the owner when an Homunculus levels up
-homunculus_show_growth: 0
+homunculus_show_growth: no
diff --git a/conf-tmpl/battle/items.conf b/conf-tmpl/battle/items.conf
index bdd201d6f..8ef1aac3e 100644
--- a/conf-tmpl/battle/items.conf
+++ b/conf-tmpl/battle/items.conf
@@ -17,15 +17,11 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: Value is a bit field. If no description is given,
+// Note 3: Value is a bit field. If no description is given,
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
-// The highest value at which an item can be sold via the merchant vend skill. (in zeny) (Note 3)
+// The highest value at which an item can be sold via the merchant vend skill. (in zeny)
 vending_max_value: 1000000000
 
 // Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
@@ -42,7 +38,7 @@ weapon_produce_rate: 100
 // Prepare Potion success rate. (Note 2)
 potion_produce_rate: 100
 
-// Do produced items have the maker's name on them? (Note 4)
+// Do produced items have the maker's name on them? (Note 3)
 // 0x01: Produced Weapons
 // 0x02: Produced Potions
 // 0x04: Produced Arrows
diff --git a/conf-tmpl/battle/misc.conf b/conf-tmpl/battle/misc.conf
index e58378bcb..3fa7b34e6 100644
--- a/conf-tmpl/battle/misc.conf
+++ b/conf-tmpl/battle/misc.conf
@@ -17,12 +17,8 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: Value is a bit field. If no description is given,
+// Note 3: Value is a bit field. If no description is given,
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // PK Server Mode.  Turns entire server pvp(excluding towns). Experience loss is doubled if killed by another player.
@@ -59,8 +55,8 @@ pk_weapon_attack_damage_rate: 60
 pk_magic_attack_damage_rate: 60
 pk_misc_attack_damage_rate: 60
 
-// Display skill usage/errors in console? (for debug only) (default: off) (Note 4)
-skill_log: 0
+// Display skill usage/errors in console? (for debug only) (default: off) (Note 3)
+skill_log: off
 
 // Display battle log? (for debug only) (default: off) (Note 1)
 battle_log: off
@@ -84,12 +80,12 @@ night_at_start: no
 
 // Define duration in msec of the day (default: 7200000 = 2 hours)
 // Set to 0 to disable day cycle (but not @day GM command).
-// Except 0, minimum is 60000 (1 minute) (Note 3)
+// Except 0, minimum is 60000 (1 minute)
 day_duration: 0
 
 // Define duration in msec of the night (default: 1800000 = 30 min)
 // Set to 0 to disable night cycle (but not @night GM command).
-// Except 0, minimum is 60000 (1 minute) (Note 3)
+// Except 0, minimum is 60000 (1 minute)
 night_duration: 0
 
 // Using duel on pvp-maps
diff --git a/conf-tmpl/battle/monster.conf b/conf-tmpl/battle/monster.conf
index c8f01be40..58111ab2d 100644
--- a/conf-tmpl/battle/monster.conf
+++ b/conf-tmpl/battle/monster.conf
@@ -17,12 +17,8 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: Value is a bit field. If no description is given,
+// Note 3: Value is a bit field. If no description is given,
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // [MVP] Summoned monsters HP rate, that is, monsters summoned by an MVP will have this much HP. (Note 2)
@@ -34,7 +30,7 @@ monster_hp_rate: 100
 // The maximum attack speed of a monster
 monster_max_aspd: 199
 
-// Defines various mob AI related settings. [Note 4]
+// Defines various mob AI related settings. (Note 3)
 // 0x001: When enabled mobs will update their target cell every few iterations
 //        (normally they never update their target cell until they reach it while
 //        chasing)
diff --git a/conf-tmpl/battle/party.conf b/conf-tmpl/battle/party.conf
index 0623210ad..2dce065af 100644
--- a/conf-tmpl/battle/party.conf
+++ b/conf-tmpl/battle/party.conf
@@ -17,10 +17,6 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // If someone steals (gank/steal skills), show name in party? (Note 1)
@@ -46,7 +42,7 @@ show_party_share_picker: no
 // 3: 1+2
 party_item_share_type: 0
 
-// Is exp sharing disabled for idle members in the party?
+// Is exp/item sharing disabled for idle members in the party?
 // Set to no, or the amount of seconds (NOT milliseconds) that need to pass before considering
 // a character idle.
 // Characters in a chat/vending are always considered idle.
@@ -56,6 +52,3 @@ idle_no_share: no
 // Give additional experience bonus per party-member involved on even-share parties?
 // (eg: If set to 10, a even-share party of 5 people will receive +40% exp)
 party_even_share_bonus: 0
-
-// If a party uses a skill with penalties do they apply? (Note 1)
-party_skill_penalty: yes
diff --git a/conf-tmpl/battle/pet.conf b/conf-tmpl/battle/pet.conf
index 40995cdc5..0d13d26b9 100644
--- a/conf-tmpl/battle/pet.conf
+++ b/conf-tmpl/battle/pet.conf
@@ -17,12 +17,8 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: Value is a bit field. If no description is given,
+// Note 3: Value is a bit field. If no description is given,
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // Rate for catching pets (Note 2)
diff --git a/conf-tmpl/battle/player.conf b/conf-tmpl/battle/player.conf
index 118620baf..58f0f9bb1 100644
--- a/conf-tmpl/battle/player.conf
+++ b/conf-tmpl/battle/player.conf
@@ -17,10 +17,6 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // Players' maximum HP rate? (Default is 100)
@@ -46,7 +42,6 @@ player_skillfree: no
 
 // When set to yes, forces skill points gained from 1st class to be put into 1st class
 // skills, and forces novice skill points to be put into the basic skill. (Note 1)
-// Default: yes [Kevin]
 player_skillup_limit: yes
 
 // Quest skills can be learned? (Note 1)
@@ -66,13 +61,13 @@ basic_skill_check: yes
 // If you attack a monster, it will attack you back regaurdless of this setting. (I think)
 player_invincible_time: 5000
 
-// The time interval for HP to restore naturally. (in milliseconds) (Note 3)
+// The time interval for HP to restore naturally. (in milliseconds)
 natural_healhp_interval: 6000
 
-// The time interval for SP to restore naturally. (in milliseconds) (Note 3)
+// The time interval for SP to restore naturally. (in milliseconds)
 natural_healsp_interval: 8000
 
-// Automatic healing skill's time interval. (in milliseconds) (Note 3)
+// Automatic healing skill's time interval. (in milliseconds)
 natural_heal_skill_interval: 10000
 
 // The maximum weight for a character to carry when the character stops healing naturally. (in %)
@@ -84,10 +79,10 @@ max_aspd: 190
 // Maximum walk speed rate (200 would be capped to twice the normal speed)
 max_walk_speed: 300
 
-// Maximum HP. (Default is 1000000) (Note 3)
+// Maximum HP. (Default is 1000000)
 max_hp: 1000000
 
-// Maximum SP. (Default is 1000000) (Note 3)
+// Maximum SP. (Default is 1000000)
 max_sp: 1000000
 
 // Max limit of char stats. (agi, str, etc.)
@@ -107,7 +102,7 @@ max_def: 99
 // (eg: if set to 10, every armor point above the max becomes 10 vit defense points)
 over_def_bonus: 0
 
-// Max weight carts can hold. (Note 3)
+// Max weight carts can hold.
 max_cart_weight: 8000
 
 // Prevent logout of players after being hit for how long (in ms, 0 disables)?
@@ -124,8 +119,7 @@ show_hp_sp_gain: yes
 // NOTE: this setting only enables friend auto-adding; auto-deletion does not work yet
 friend_auto_add: yes
 
-// Are other requests accepted during [various things[party,guild]] a request or not?
-// It does not accept by no accepted by yes.
+// Are simultaneous trade/party/guild invite requests automatically rejected?
 invite_request_check: yes
 
 // Players' will drop a 'Skull' when killed?
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index 3b4a58d2b..e6827b796 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -17,12 +17,8 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: Value is a bit field. If no description is given,
+// Note 3: Value is a bit field. If no description is given,
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // The rate of time it takes to cast a spell (Note 2, 0 = No casting time)
@@ -47,7 +43,7 @@ min_skill_delay_limit: 100
 // appear to "teleport" afterwards.
 default_skill_delay: 300
 
-//Completely disable skill delay of the following types (Note 4)
+//Completely disable skill delay of the following types (Note 3)
 //NOTE: By default mobs don't have the skill delay as specified in the skill
 //  database, but follow their own 'reuse' skill delay which is specified on
 //  the mob skill db. When set, the delay for all skills become
@@ -68,13 +64,13 @@ skill_add_range: 0
 // If the target moves out of range while casting, do we take the items and SP for the skill anyway? (Note 1)
 skill_out_range_consume: no
 
-// Does the distance between caster and target define if the skill is a ranged skill? (Note 4)
+// Does the distance between caster and target define if the skill is a ranged skill? (Note 3)
 // If set, when the distance between caster and target is greater than 3 the skill is considered long-range, otherwise it's a melee range.
 // If not set, then the range is determined by the skill's range (if it is above 5, the skill is ranged).
 // Default 14 (mobs + pets + homun)
 skillrange_by_distance: 14
 
-// Should the equipped weapon's range override the skill's range defined in the skill_db for most weapon-based skills? (Note 4)
+// Should the equipped weapon's range override the skill's range defined in the skill_db for most weapon-based skills? (Note 3)
 // NOTE: Skills affected by this option are those whose range in the skill_db are negative. Note that unless monster_ai&0x400 is
 // set, the range of all skills is 9 for monsters.
 skillrange_from_weapon: 14
@@ -84,10 +80,10 @@ skillrange_from_weapon: 14
 // no effect while the caster is unable to fight (eg: stunned).
 skill_caster_check: yes
 
-// Should ground placed skills be removed as soon as the caster dies? [Note 4]
+// Should ground placed skills be removed as soon as the caster dies? (Note 3)
 clear_skills_on_death: 0
 
-// Should ground placed skills be removed when the caster changes maps? [Note 4]
+// Should ground placed skills be removed when the caster changes maps? (Note 3)
 clear_skills_on_warp: 15
 
 //Setting this to YES will override the target mode of ground-based skills with the flag 0x01 to "No Enemies"
@@ -103,21 +99,21 @@ skill_min_damage: 6
 // The delay rate of monk's combo (Note 2)
 combo_delay_rate: 100
 
-// Use alternate auto Counter Attack Skill Type? (Note 4)
+// Use alternate auto Counter Attack Skill Type? (Note 3)
 // For those characters on which it is set, 100% Critical,
 // Otherwise it disregard DEF and HIT+20, CRI*2
 auto_counter_type: 15
 
-// Can ground skills be placed on top of each other? (Note 4)
+// 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 
 // other skills, this setting will override that. (skill_unit_db)
 skill_reiteration: 0
 
-// Can ground skills NOT be placed underneath/near players/monsters? (Note 4)
+// Can ground skills NOT be placed underneath/near players/monsters? (Note 3)
 // If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db)
 skill_nofootset: 1
 
-// Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 4)
+// Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 3)
 // Default on official servers: yes for player-traps
 gvg_traps_target_all: 1
 
@@ -149,7 +145,7 @@ skill_wall_check: yes
 player_cloak_check_type: 1
 monster_cloak_check_type: 4
 
-// Can't place unlimited land skills at the same time (Note 4)
+// Can't place unlimited land skills at the same time (Note 3)
 land_skill_limit: 1
 
 //Determines which kind of skill-failed messages should be sent:
@@ -169,9 +165,9 @@ chat_warpportal: no
 // 3: Both (the addition of both) [default]
 sense_type: 3
 
-// Which finger offensive style can be used?
-// 0 = Aegis style
-// 1 = Athena style
+// Which finger offensive style will be used?
+// 0 = Aegis style (single multi-hit attack)
+// 1 = Athena style (multiple consecutive attacks)
 finger_offensive_type: 0
 
 // Number of hits at a time that undead/fire elemental enemies receive from firewall.
@@ -198,13 +194,13 @@ player_skill_partner_check: yes
 
 // Remove trap type
 // 0 = Aegis system : Returns 1 'Trap' item
-// 1 = Athena system : Allows the returned item and amount to be defined
+// 1 = Athena system : Returns all items used to deploy the trap
 skill_removetrap_type: 0
 
 // Does using bow to do a backstab give a 50% damage penalty? (Note 1)
 backstab_bow_penalty: yes
 
-// Use kRO new steal formula?
+// Use kRO new steal formula? (favors skillv more than dex difference) (Note 1)
 skill_steal_type: yes
 
 // How many times you could try to steal from a mob.
diff --git a/conf-tmpl/battle/status.conf b/conf-tmpl/battle/status.conf
index 8883b6802..87d76de7a 100644
--- a/conf-tmpl/battle/status.conf
+++ b/conf-tmpl/battle/status.conf
@@ -17,15 +17,11 @@
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is not limited to 60k (see below)
-// Note 4: Value is a bit field. If no description is given,
+// Note 3: Value is a bit field. If no description is given,
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-// Other Information:
-// All values are limited to a number between 0 and 60k
-// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
-// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc (includes silence) [Note 4]?
+// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc (includes silence) (Note 3)?
 status_cast_cancel: 0
 
 // Will certain skill status-changes be removed on logout?