17 files changed, 61 insertions, 100 deletions
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
index 87ad91597..94f80a2a6 100644
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
diff --git a/conf/battle/battleground.conf b/conf/battle/battleground.conf
index 98b2dd8db..b4c0b2fbd 100644
--- a/conf/battle/battleground.conf
+++ b/conf/battle/battleground.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -9,21 +9,6 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------
 
-// Melee damage adjustments (non skills) for Battleground maps (Note 2)
-bg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for Battleground maps (Note 2)
-bg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for Battleground maps (Note 2)
-bg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for Battleground maps (Note 2)
-bg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for Battleground maps (Note 2)
-bg_misc_attack_damage_rate: 60
-
 // Flee penalty on BG grounds.
 // NOTE: It's %, not absolute, so 20 is -20% of your total flee
 bg_flee_penalty: 20
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index 0522e9425..086932d4b 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -9,29 +9,6 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
 //--------------------------------------------------------------
 
-// Set here which client version do you accept. Add all values of clients:
-// Clients older than accepted versions, and versions not set to 'accepted'
-// here will be rejected when logging in
-// 0x00001: Clients older than 2004-09-06aSakray (packet versions 5-9)
-// 0x00002: 2004-09-06aSakexe (version 10)
-// 0x00004: 2004-09-20aSakexe (version 11)
-// 0x00008: 2004-10-05aSakexe (version 12)
-// 0x00010: 2004-10-25aSakexe (version 13)
-// 0x00020: 2004-11-29aSakexe (version 14)
-// 0x00040: 2005-01-10bSakexe (version 15)
-// 0x00080: 2005-05-09aSakexe (version 16)
-// 0x00100: 2005-06-28aSakexe (version 17)
-// 0x00200: 2005-07-18aSakexe (version 18)
-// 0x00400: 2005-07-19bSakexe (version 19)
-// 0x00800: 2006-03-27aSakexe (version 20)
-// 0x01000: 2007-01-08aSakexe (version 21)
-// 0x02000: 2007-02-12aSakexe (version 22)
-// 0x04000: 2008-09-10aSakexe (version 23)
-// 0x08000: 2008-08-27aRagexeRE (version 24)
-// 0x10000: 2008-09-10aRagexeRE (version 25)
-// default value: 0xFFFFFF (all clients)
-packet_ver_flag: 0xFFFFFF
-
 // Minimum delay between whisper/global/party/guild messages (in ms)
 // Messages that break this threshold are silently omitted. 
 min_chat_delay: 0
@@ -61,6 +38,10 @@ pet_hair_style: 100
 // Visible area size (how many squares away from a player can they see)
 area_size: 14
 
+// Maximum walk path (how many cells a player can walk going to cursor)
+// default: 17(official)
+max_walk_path: 17
+
 // Maximum allowed 'level' value that can be sent in unit packets.
 // Use together with the aura_lv setting to tell when exactly to show the aura.
 // NOTE: You also need to adjust the client if you want this to work.
@@ -88,25 +69,29 @@ wedding_modifydisplay: no
 // Save Clothes color. (This will degrade performance) (Note 1)
 save_clothcolor: yes
 
-// Do not display cloth colors for the wedding class?
+// 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 
 // pack doesn't has wedding palettes (or has less than the other jobs)
 wedding_ignorepalette: no
 
-// Do not display cloth colors for the Xmas class?
+// Do not display cloth colors for the Xmas costume?
 // Set this to yes if your cloth palettes pack doesn't has Xmas palettes (or has less than the other jobs)
 xmas_ignorepalette: no
 
-// Do not display cloth colors for the Summer class?
+// Do not display cloth colors for the Summer costume?
 // Set this to yes if your cloth palettes pack doesn't has Summer palettes (or has less than the other jobs)
 summer_ignorepalette: no
 
+// Do not display cloth colors for the Hanbok costume?
+// Set this to yes if your cloth palettes pack doesn't has Hanbok palettes (or has less than the other jobs)
+hanbok_ignorepalette: no
+
 // Set this to 1 if your clients have langtype problems and can't display motd properly
 motd_type: 0
 
-// Show rAthena version to users when the login?
-display_version: yes
+// Show Hercules version to users when the login?
+display_version: no
 
 // When affected with the "Hallucination" status effect, send the effect to client? (Note 1)
 // Note: Set to 'no' if the client lags due to the "Wavy" screen effect.
diff --git a/conf/battle/drops.conf b/conf/battle/drops.conf
index 104f08467..3704b9a0e 100644
--- a/conf/battle/drops.conf
+++ b/conf/battle/drops.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
diff --git a/conf/battle/exp.conf b/conf/battle/exp.conf
index fbc7c2967..7c781d3a3 100644
--- a/conf/battle/exp.conf
+++ b/conf/battle/exp.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf
index fa05efd8b..7e1f83707 100644
--- a/conf/battle/feature.conf
+++ b/conf/battle/feature.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Feature Configuration File
+// Hercules Feature Configuration File
 //--------------------------------------------------------------
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf
index e02efa9a8..7370da6c5 100644
--- a/conf/battle/gm.conf
+++ b/conf/battle/gm.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -29,4 +29,9 @@ ban_hack_trade: 5
 // requires RENEWAL_DROP to be enabled (src/map/config/renewal.h)
 // modifies @mobinfo to display the users' real drop rate as per renewal_drop formula
 // modifies @iteminfo to not display the minimum item drop rate (since it can't tell the mob level)
-atcommand_mobinfo_type: 0
-\ No newline at end of file
+atcommand_mobinfo_type: 0
+
+// Ignore warpable area configuration.
+// Set the minimum group id to ignore invalid cells when warping.
+// Default group is 2. Use 100 to disable this setting.
+gm_ignore_warpable_area: 2
diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf
index 234c73994..cc22c327f 100644
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -23,21 +23,6 @@ guild_skill_relog_delay: yes
 // Damage adjustments for WOE battles against defending Guild monsters (Note 2)
 castle_defense_rate: 100
 
-// Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_misc_attack_damage_rate: 60
-
 // Flee penalty on gvg grounds. Official value is 20 (Note 2)
 // NOTE: It's %, not absolute, so 20 is -20% of your total flee
 gvg_flee_penalty: 20
diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf
index 6ebd43bec..fb34792ce 100644
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
index 7c0ee1ad3..05aadfecd 100644
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -75,3 +75,14 @@ gtb_sc_immunity: 50
 // NOTE: Different cards that grant the same skill will both 
 // always work independently of each other regardless of setting.
 autospell_stacking: no
+
+// Will disabled consumables (disabled by map_zone_db.conf) be consumed when trying to use them?
+// 1 (official): yes
+// 0: no
+item_restricted_consumption_type:1
+
+// Enable all NPC to allow changing of equipments while interacting? (Note 1)
+// Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt)
+// 1 : yes(official)
+// 0 : no
+item_enabled_npc:1
+\ No newline at end of file
diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf
index 0105e542b..32b9c511e 100644
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -35,14 +35,6 @@ pk_min_level: 55
 // players to let them attack each other. 0 disables said limit.
 pk_level_range: 0
 
-// For PK servers. Damage adjustment settings, these follow the same logic
-// as their WoE counterparts (see guild.conf)  
-pk_short_attack_damage_rate: 80
-pk_long_attack_damage_rate: 70
-pk_weapon_attack_damage_rate: 60
-pk_magic_attack_damage_rate: 60
-pk_misc_attack_damage_rate: 60
-
 // Display skill usage in console? (for debug only) (default: off) (Note 3)
 skill_log: off
 
diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf
index fa9947ec5..51136fbe0 100644
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
diff --git a/conf/battle/party.conf b/conf/battle/party.conf
index 63fc3a94a..e57bc4fc9 100644
--- a/conf/battle/party.conf
+++ b/conf/battle/party.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -15,7 +15,7 @@ party_update_interval: 1000
 
 // Method used to update party-mate hp-bars:
 // 0: Aegis - bar is updated every time HP changes (bandwidth intensive)
-// 1: rAthena - bar is updated with the party map dots (up to 1 second delay)
+// 1: Hercules - 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, 
diff --git a/conf/battle/pet.conf b/conf/battle/pet.conf
index de9056972..e80826ce8 100644
--- a/conf/battle/pet.conf
+++ b/conf/battle/pet.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index 32e3673f7..f493f6b67 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -46,7 +46,8 @@ basic_skill_check: yes
 
 // When teleporting, or spawning to a map, how long before a monster sees you if you don't move? (time is in milliseconds)
 // That is, when you go to a map and don't move, how long before the monsters will notice you.
-// If you attack a monster, it will attack you back regaurdless of this setting. (I think)
+// When moving, attacking or doing similar actions, the effect ends instantly.
+// Value is also affected by 'invincible_time_inc' mapflag
 player_invincible_time: 5000
 
 // The time interval for HP to restore naturally. (in milliseconds)
@@ -139,6 +140,6 @@ character_size: 0
 // items from Autoloot (0: disabled).
 idle_no_autoloot: 0
 
-// Minimum distance a vending must be from a NPC in order to be placed
+// Minimum distance a vending/chat room must be from a NPC in order to be placed
 // Default: 3 (0: disabled).
-min_npc_vending_distance: 3
-\ No newline at end of file
+min_npc_vendchat_distance: 3
+\ No newline at end of file
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index 39e1b357a..df419b262 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -234,10 +234,6 @@ emergency_call: 11
 //16: Disable skill from affecting Guild Master
 guild_aura: 31
 
-// Max Possible Level of Monster skills
-// Note: If your MVPs are too tough, reduce it to 10.
-mob_max_skilllvl: 100
-
 // Allows players to skip menu when casting Teleport level 1
 // Menu contains two options. "Random" and "Cancel"
 skip_teleport_lv1_menu: no
@@ -275,3 +271,12 @@ invincible.nodamage: no
 // On official server, a fix is in place that prevents the switching of weapons to cancel songs.
 // Default: yes
 dancing_weaponswitch_fix: yes
+
+// Skill Trap Type (GvG)
+// 0: (official) Traps in GvG only make player stop moving after its walk path is complete, and it activates other traps on the way.
+// 1: Traps in GvG make player stop moving right when stepping over it.
+skill_trap_type: 0
+
+// Max Possible Level of Monster skills
+// Note: If your MVPs are too tough, reduce it to 10.
+mob_max_skilllvl: 100
+\ No newline at end of file
diff --git a/conf/battle/status.conf b/conf/battle/status.conf
index 717db68bf..5341b606b 100644
--- a/conf/battle/status.conf
+++ b/conf/battle/status.conf
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------
-// rAthena Battle Configuration File
+// Hercules Battle Configuration File
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
@@ -27,14 +27,6 @@ debuff_on_logout: 3
 pc_status_def_rate: 100
 mob_status_def_rate: 100
 
-// Required luk to gain inmunity to status changes.
-// Luk increases resistance by closing the gap between natural resist and max 
-// linearly. This setting indicates required luk to gain complete immunity.
-// Eg: 40 vit -> 40% resist. 150 luk -> +50% of the missing gap. 
-//     So 40% + (50% of 60%) = 70%
-pc_luk_status_def: 300
-mob_luk_status_def: 300
-
 // Maximum resistance to status changes. (100 = 100%)
 // NOTE: Cards and equipment can go over this limit, so it only applies to natural resist.
 pc_max_status_def: 100