- Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.

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

60 files changed, 8605 insertions, 8605 deletions

diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index a4dee842d..487ec5371 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,218 +1,218 @@
-Date	Added

-

-2006/11/29

-	* Added Rachel Santuary to nomemo mapflags [Playtester]

-2006/11/22

-	* Added import/script_conf.txt to keep OnPCxxxxxEven settings [Lupus]

-	* Modified slaves_inherit_speed (monster.conf): 0 never. 1 - when the

-	  master can move. 2 - when the master can't move. 3 - always (default)

-	* Also modified slaves_inherit_mode: 0 don't change mode. 1 slaves are

-	  always aggressive. 2 slaves are always passive. 3 they copy the

-	  agro/passive mode from their master. Defaults to 2.

-2006/11/20

-	* Added monster_ai&0x200 (monster.conf). When set, mob skill delays are

-	  shared. That is, if the mob has several lines with the same skill, when the

-	  skill is used, the delay will be set to all of them, not just the one entry

-	  used. [Skotlex]

-2006/11/07

-	* Added nosave mapflag for Guild Dungeons [KarLaeda]

-	* New Setting "stdout_with_ansisequence"

-	  (login_athena/char_athena/map_athena) allows you to specify whether color

-	  control chars should be printed or not. Is useful to disable for a

-	  "cleaner" output when you are logging the console output. All credit goes

-	  to FlavioJS for coding the whole thing. [Skotlex]

-2006/11/05

-	* Added maplags for PowerNPC quest. [KarLaeda]

-2006/10/31

-	* Modified the player_cloak_check_type and monster_cloak_check_type

-	  settings. 1 makes it check for walls, 2 makes cloaking NOT end on normal

-	  attacks, and 4 makes cloaking NOT end when using skills. The default

-	  setting for players is still 1, but for mobs the default has been changed

-	  to 4 (skill.conf). [Skotlex]

-2006/10/25

-	* Added exp-bonus settings exp_bonus_attacker and exp_bonus_max_attacker

-	  (exp.conf, default to 25 and 12) [Skotlex]

-	* Changed the way the party_even_share_bonus setting works. It now uses a

-	  simple linear bonus increase (party.conf) [Skotlex]

-2006/10/24

-	* Changed the way the skill_steal_max_tries work. Now it actually MEANS the

-	  max number of steal tries, use 0 to disable (unlimited tries). [Skotlex]

-	* Changed the default of skill_steal_max_tries to 0 as there's no proof

-	  anywhere that there should be such a limit. [Skotlex]

-2006/10/20

-	* Added config setting "summon_flora_setting" (skill.conf), with it you can

-	  decide now two things: a. Whether or not players can harm your floras

-	  outside versus grounds, and b. Whether or not you can summon out and mix

-	  different types of plants at the same time. [Skotlex]

-2006/10/19

-	* Commented out the monster_noteleport mapflag from the guild castles as

-	  this is the Aegis behaviour [Skotlex]

-2006/10/18

-	* Added monster_noteleport mapflag to the guild castle maps to prevent

-	  "avoiding MVPs" by forcing them to teleport from rude-attacks. [Skotlex]

-2006/10/16

-	* Added &16 to the default of the emergency_call setting (skill.conf)

-	  [Skotlex]

-2006/10/12

-	* Added Homunculus atcommands [Playtester]

-2006/10/11

-	* Removed useless inter_athena settings (they were doing absolutely

-	  nothing): read_gm_interval, gm_db, gm_db_level, gm_db_account_id,

-	  use_new_sql_db [Skotlex]

-2006/10/06

-	* status_cast_cancel is now a type 4 (object bitmasks) setting

-	  (status.conf). [Skotlex]

-2006/10/06

-	* Removed gm_all_skill_add_abra which was doing nothing anyway. [Skotlex]

-2006/10/03

-	* Renamed setting delay_dependon_dex to delay_dependon_agi, the delay of

-	  skills is reduced now (when enabled) by AGI instead of DEX, which makes a

-	  lot more sense than DEX. [Skotlex]

-2006/09/25

-	* Removed config setting allow_atcommand_when_mute as it's no longer used

-	  (see manner_system in misc.conf for it's replacement) [Skotlex]

-2006/09/19

-	* Removed setting ban_spoof_namer (as now invalid chat packets just cause

-	  the sending character to be disconnected). [Skotlex]

-2006/09/18

-	* The new socket update code includes support for two new config settings

-	  (packet_athena.txt): frame_size, which can be used to alter the logic

-	  packet-size allowed by the code, and mode_neg, which when set to yes, sets

-	  TCP_NODELAY on all connections (defaults to yes). [Skotlex]

-	* Due to a recent update of how cards/equipment status change defense

-	  works, the max sc resistance settings (battle/status.conf) no longer apply

-	  to them. [Skotlex]

-2006/09/16

-	* Added monster_ai&256. When set, a monster will pick a random starting

-	  position to begin checking versus it's skills, otherwise, it will always

-	  begin checking from the beginning. [Skotlex]

-2006/09/15

-	* Added atcommand.conf entries for @adjgmlvl and @adjcmdlvl [Skotlex]

-2006/09/14

-	* Adjusted gvg long damage rate to 80%, magic damage rate to 60%

-	  (battle/guild.conf) [Skotlex]

-2006/09/12

-	* Changed back the default of case-sensitive to ON since it shouldn't be

-	  such a bad performance hog now. [Skotlex]

-	* case_sensitive is now off by default due to performance issues

-	  (login_athena.conf). [Skotlex]

-2006/09/11

-	* Corrected name of config settings pc_luk_status_def, mob_luk_status_def

-	  (status.conf) [Skotlex]

-	* Changed the default of enable_baseatk to 9 (player + homun) [Skotlex]

-	* Changed the default of enable_perfect_flee to 1 (players only) [Skotlex]

-2006/09/09

-	* Removed noteleport flags from Geffenia maps [Playtester]

-2006/09/08

-	* Removed sg_miracle_skill_duration, replaced it with

-	  sg_miracle_skill_min_duration and sg_miracle_skill_max_duration, to specify

-	  a range for the duration of the skill. [Skotlex]

-	* Skill duration for sg miracle is now 1h ~ 2.5h [Skotlex]

-2006/09/07

-	* Changed the default of sg_angel_skill_ratio to 10 based on recent

-	  information from Tharis. [Skotlex]

-	* Added sg_angel_skill_ratio to specify rate at which the Angel skill

-	  triggers. [Skotlex]

-	* Increased duration of Miracle of the Sun/Moon/Stars to one hour.

-	  [Skotlex]

-	* Changed gvg_short_attack_damage_rate to 80, as leaked X.2 [Vicious]

-2006/09/06

-	* Reverted back the default view/chase range of mobs to 100% since eA now

-	  uses square view areas, like Aegis. [Skotlex]

-2006/09/05

-	* Removed setting mob_show_hp, it's been replaced now by mob_show_info,

-	  which can be used to specify what kind of info should be displayed from a

-	  mob. Current options are two different formats for Hp display, and current

-	  level (monster.conf). [Skotlex]

-2006/08/31

-	* Added setting attack_walk_delay which specifies whether a character

-	  should (or not) be able to move inmediately after starting a normal attack

-	  (battle.conf). Defaults to 0 since that's what Aegis uses. [Skotlex]

-	* Corrected battle config name max_walk_rate, it should be named

-	  max_walk_speed. [Skotlex]

-2006/08/29

-	* monster_ai&1 now only signals whether mobs should update their target

-	  cell while chasing more frequently (rather than being state-driven like

-	  Aegis) [Skotlex]

-	* Changed the defaults of view_range_rate and chase_range_rate to 120 to

-	  aproximate better Aegis's view ranges (which are square areas and not

-	  circles), so eA's default of 100 leads to a circular area contained

-	  within a 21x21 square zone (what Aegis uses), by using 20%, the circular

-	  area increases range to 12, which better approximates Aegis's 21x21 area.

-	  [Skotlex]

-2006/08/24

-	* Changed the default of clear_skills_on_death to 0 [Skotlex]

-	* Added setting clear_skills_on_warp to specify when a character's

-	  land-based skills are deleted when the caster changes maps. Defaults to all

-	  types (skill.conf). [Skotlex]

-	* The previous setting now obsoletes traps_setting &2, which now can only

-	  be 0/1. [Skotlex]

-2006/08/21

-	* Removed config setting "muting_players", and expanded the manner_system

-	  config to specify how having negative manner (mute) affects a player (see

-	  battle/misc.conf). [Skotlex]

-	* Expanded the pk_mode setting from no/yes to 0/1/2. 1 is normal pk_mode,

-	  if 2 is used, it makes killing players give you a loss of 5 manner points.

-	  [Skotlex]

-2006/08/18

-	* Added monster_ai&128 to make aggressive mobs ignore that behaviour of

-	  always picking Homun targets above player targets regardless of who is

-	  closer. [Skotlex]

-	* Added guild_aura (skill.conf) setting so you can specify when it works

-	  and if it works on the guild-master itself. Defaults to working all the

-	  time on everyone except GM. [Skotlex]

-2006/08/14

-	* Removed support for negative autosave intervals, instead added a

-	  minsave_interval setting which specifies which is the minimum time between

-	  character saves. Default to 100ms (map_athena.conf). [Skotlex]

-	* Modified emergency_call setting to allow for more specific configuration

-	  (woe/non-woe, gvg-grounds/non-gvg-grounds, disable from nowarpto maps), see

-	  skill.conf for details. [Skotlex]

-2006/08/10

-	* Removed setting mob_ghostring_fix [Skotlex]

-	* Changed setting attack_attr_none to affect all neutral-element attacks.

-	  Basicly, this setting is now used to determine who can hit for full damage

-	  always when using neutral-attacks (defaults to non-players) [Skotlex]

-2006/08/09

-	* Change the default of attack_attr_none to all classes except players.

-	  This means that pet/mobs/homun will always do normal attacks with

-	  no-element modifiers (but elemental reduction cards still apply) [Skotlex]

-2006/08/08

-	* Removed config settings display_delay_skill_fail and

-	  display_snatcher_skill_fail, replaced them with display_skill_fail, which

-	  can be used to determine whether you hide ALL skill-failed messages, those

-	  from delay, those from Snatcher or those from Envenom (battle/skill.conf)

-	  [Skotlex]

-2006/08/07

-	* Added config force_random_spawn which overrides the spawn-files defined

-	  coordinates to make all mobs always spawn randomly on the map. [Skotlex]

-	* SC_SPEEDUP0 is no longer dispellable by SA_DISPEL [Skotlex]

-2006/08/04

-	* Removed settings enemy_critical_rate, homun_critical_rate. Added settings

-	  enable_critical (defaults to specify only players), mob_critical_rate and

-	  critical_rate. The last applies to all non-mobs and non-players

-	  (battle/battle.conf) [Skotlex]

-	* Removed settings mob_npc_warp, mob_warpportal. Replaced with setting

-	  mob_warp which specifies which types of warp can a mob step into

-	  (battle/monster.conf) [Skotlex]

-	* Changed name of the setting log_pick to log_filter since that's what it

-	  does now. [Skotlex]

-	* Modified enable_logs so that instead of a 0/1 setting, you can specify

-	  which kind of events to log (so you can use a combination), see log_athena

-	  for the bitmask configuration. [Skotlex]

-	* Cleaned a bit the contents of log_athena.conf

-2006/08/02

-	* Updated status_cast_cancel to also include silence (so the cast bar is

-	  cancelled if you are silenced during it) [Skotlex]

-2006/08/01

-	* merged in atcommands jailfor, jailtime, charjailtime. Thanks to Meruru

-	  and Coltaro for the code. [Skotlex]

-	* Expanded setting debuff_on_logout so that &1 removes negative buffs and

-	  &2 removes positive buffs. [Skotlex]

-	* Added battle config file status.conf, moved some settings from skill.conf

-	  and battle.conf to it since they are entirely Status-Change related.

-	  [Skotlex]

-2006/07/27

-	* Added config setting party_update_interval so you can specify how often

-	  the party-mate minidots should be updated (defaults to 1 sec). [Skotlex]

-	* Removed a bunch of broken comments in skill.c [Skotlex]

+Date	Added
+
+2006/11/29
+	* Added Rachel Santuary to nomemo mapflags [Playtester]
+2006/11/22
+	* Added import/script_conf.txt to keep OnPCxxxxxEven settings [Lupus]
+	* Modified slaves_inherit_speed (monster.conf): 0 never. 1 - when the
+	  master can move. 2 - when the master can't move. 3 - always (default)
+	* Also modified slaves_inherit_mode: 0 don't change mode. 1 slaves are
+	  always aggressive. 2 slaves are always passive. 3 they copy the
+	  agro/passive mode from their master. Defaults to 2.
+2006/11/20
+	* Added monster_ai&0x200 (monster.conf). When set, mob skill delays are
+	  shared. That is, if the mob has several lines with the same skill, when the
+	  skill is used, the delay will be set to all of them, not just the one entry
+	  used. [Skotlex]
+2006/11/07
+	* Added nosave mapflag for Guild Dungeons [KarLaeda]
+	* New Setting "stdout_with_ansisequence"
+	  (login_athena/char_athena/map_athena) allows you to specify whether color
+	  control chars should be printed or not. Is useful to disable for a
+	  "cleaner" output when you are logging the console output. All credit goes
+	  to FlavioJS for coding the whole thing. [Skotlex]
+2006/11/05
+	* Added maplags for PowerNPC quest. [KarLaeda]
+2006/10/31
+	* Modified the player_cloak_check_type and monster_cloak_check_type
+	  settings. 1 makes it check for walls, 2 makes cloaking NOT end on normal
+	  attacks, and 4 makes cloaking NOT end when using skills. The default
+	  setting for players is still 1, but for mobs the default has been changed
+	  to 4 (skill.conf). [Skotlex]
+2006/10/25
+	* Added exp-bonus settings exp_bonus_attacker and exp_bonus_max_attacker
+	  (exp.conf, default to 25 and 12) [Skotlex]
+	* Changed the way the party_even_share_bonus setting works. It now uses a
+	  simple linear bonus increase (party.conf) [Skotlex]
+2006/10/24
+	* Changed the way the skill_steal_max_tries work. Now it actually MEANS the
+	  max number of steal tries, use 0 to disable (unlimited tries). [Skotlex]
+	* Changed the default of skill_steal_max_tries to 0 as there's no proof
+	  anywhere that there should be such a limit. [Skotlex]
+2006/10/20
+	* Added config setting "summon_flora_setting" (skill.conf), with it you can
+	  decide now two things: a. Whether or not players can harm your floras
+	  outside versus grounds, and b. Whether or not you can summon out and mix
+	  different types of plants at the same time. [Skotlex]
+2006/10/19
+	* Commented out the monster_noteleport mapflag from the guild castles as
+	  this is the Aegis behaviour [Skotlex]
+2006/10/18
+	* Added monster_noteleport mapflag to the guild castle maps to prevent
+	  "avoiding MVPs" by forcing them to teleport from rude-attacks. [Skotlex]
+2006/10/16
+	* Added &16 to the default of the emergency_call setting (skill.conf)
+	  [Skotlex]
+2006/10/12
+	* Added Homunculus atcommands [Playtester]
+2006/10/11
+	* Removed useless inter_athena settings (they were doing absolutely
+	  nothing): read_gm_interval, gm_db, gm_db_level, gm_db_account_id,
+	  use_new_sql_db [Skotlex]
+2006/10/06
+	* status_cast_cancel is now a type 4 (object bitmasks) setting
+	  (status.conf). [Skotlex]
+2006/10/06
+	* Removed gm_all_skill_add_abra which was doing nothing anyway. [Skotlex]
+2006/10/03
+	* Renamed setting delay_dependon_dex to delay_dependon_agi, the delay of
+	  skills is reduced now (when enabled) by AGI instead of DEX, which makes a
+	  lot more sense than DEX. [Skotlex]
+2006/09/25
+	* Removed config setting allow_atcommand_when_mute as it's no longer used
+	  (see manner_system in misc.conf for it's replacement) [Skotlex]
+2006/09/19
+	* Removed setting ban_spoof_namer (as now invalid chat packets just cause
+	  the sending character to be disconnected). [Skotlex]
+2006/09/18
+	* The new socket update code includes support for two new config settings
+	  (packet_athena.txt): frame_size, which can be used to alter the logic
+	  packet-size allowed by the code, and mode_neg, which when set to yes, sets
+	  TCP_NODELAY on all connections (defaults to yes). [Skotlex]
+	* Due to a recent update of how cards/equipment status change defense
+	  works, the max sc resistance settings (battle/status.conf) no longer apply
+	  to them. [Skotlex]
+2006/09/16
+	* Added monster_ai&256. When set, a monster will pick a random starting
+	  position to begin checking versus it's skills, otherwise, it will always
+	  begin checking from the beginning. [Skotlex]
+2006/09/15
+	* Added atcommand.conf entries for @adjgmlvl and @adjcmdlvl [Skotlex]
+2006/09/14
+	* Adjusted gvg long damage rate to 80%, magic damage rate to 60%
+	  (battle/guild.conf) [Skotlex]
+2006/09/12
+	* Changed back the default of case-sensitive to ON since it shouldn't be
+	  such a bad performance hog now. [Skotlex]
+	* case_sensitive is now off by default due to performance issues
+	  (login_athena.conf). [Skotlex]
+2006/09/11
+	* Corrected name of config settings pc_luk_status_def, mob_luk_status_def
+	  (status.conf) [Skotlex]
+	* Changed the default of enable_baseatk to 9 (player + homun) [Skotlex]
+	* Changed the default of enable_perfect_flee to 1 (players only) [Skotlex]
+2006/09/09
+	* Removed noteleport flags from Geffenia maps [Playtester]
+2006/09/08
+	* Removed sg_miracle_skill_duration, replaced it with
+	  sg_miracle_skill_min_duration and sg_miracle_skill_max_duration, to specify
+	  a range for the duration of the skill. [Skotlex]
+	* Skill duration for sg miracle is now 1h ~ 2.5h [Skotlex]
+2006/09/07
+	* Changed the default of sg_angel_skill_ratio to 10 based on recent
+	  information from Tharis. [Skotlex]
+	* Added sg_angel_skill_ratio to specify rate at which the Angel skill
+	  triggers. [Skotlex]
+	* Increased duration of Miracle of the Sun/Moon/Stars to one hour.
+	  [Skotlex]
+	* Changed gvg_short_attack_damage_rate to 80, as leaked X.2 [Vicious]
+2006/09/06
+	* Reverted back the default view/chase range of mobs to 100% since eA now
+	  uses square view areas, like Aegis. [Skotlex]
+2006/09/05
+	* Removed setting mob_show_hp, it's been replaced now by mob_show_info,
+	  which can be used to specify what kind of info should be displayed from a
+	  mob. Current options are two different formats for Hp display, and current
+	  level (monster.conf). [Skotlex]
+2006/08/31
+	* Added setting attack_walk_delay which specifies whether a character
+	  should (or not) be able to move inmediately after starting a normal attack
+	  (battle.conf). Defaults to 0 since that's what Aegis uses. [Skotlex]
+	* Corrected battle config name max_walk_rate, it should be named
+	  max_walk_speed. [Skotlex]
+2006/08/29
+	* monster_ai&1 now only signals whether mobs should update their target
+	  cell while chasing more frequently (rather than being state-driven like
+	  Aegis) [Skotlex]
+	* Changed the defaults of view_range_rate and chase_range_rate to 120 to
+	  aproximate better Aegis's view ranges (which are square areas and not
+	  circles), so eA's default of 100 leads to a circular area contained
+	  within a 21x21 square zone (what Aegis uses), by using 20%, the circular
+	  area increases range to 12, which better approximates Aegis's 21x21 area.
+	  [Skotlex]
+2006/08/24
+	* Changed the default of clear_skills_on_death to 0 [Skotlex]
+	* Added setting clear_skills_on_warp to specify when a character's
+	  land-based skills are deleted when the caster changes maps. Defaults to all
+	  types (skill.conf). [Skotlex]
+	* The previous setting now obsoletes traps_setting &2, which now can only
+	  be 0/1. [Skotlex]
+2006/08/21
+	* Removed config setting "muting_players", and expanded the manner_system
+	  config to specify how having negative manner (mute) affects a player (see
+	  battle/misc.conf). [Skotlex]
+	* Expanded the pk_mode setting from no/yes to 0/1/2. 1 is normal pk_mode,
+	  if 2 is used, it makes killing players give you a loss of 5 manner points.
+	  [Skotlex]
+2006/08/18
+	* Added monster_ai&128 to make aggressive mobs ignore that behaviour of
+	  always picking Homun targets above player targets regardless of who is
+	  closer. [Skotlex]
+	* Added guild_aura (skill.conf) setting so you can specify when it works
+	  and if it works on the guild-master itself. Defaults to working all the
+	  time on everyone except GM. [Skotlex]
+2006/08/14
+	* Removed support for negative autosave intervals, instead added a
+	  minsave_interval setting which specifies which is the minimum time between
+	  character saves. Default to 100ms (map_athena.conf). [Skotlex]
+	* Modified emergency_call setting to allow for more specific configuration
+	  (woe/non-woe, gvg-grounds/non-gvg-grounds, disable from nowarpto maps), see
+	  skill.conf for details. [Skotlex]
+2006/08/10
+	* Removed setting mob_ghostring_fix [Skotlex]
+	* Changed setting attack_attr_none to affect all neutral-element attacks.
+	  Basicly, this setting is now used to determine who can hit for full damage
+	  always when using neutral-attacks (defaults to non-players) [Skotlex]
+2006/08/09
+	* Change the default of attack_attr_none to all classes except players.
+	  This means that pet/mobs/homun will always do normal attacks with
+	  no-element modifiers (but elemental reduction cards still apply) [Skotlex]
+2006/08/08
+	* Removed config settings display_delay_skill_fail and
+	  display_snatcher_skill_fail, replaced them with display_skill_fail, which
+	  can be used to determine whether you hide ALL skill-failed messages, those
+	  from delay, those from Snatcher or those from Envenom (battle/skill.conf)
+	  [Skotlex]
+2006/08/07
+	* Added config force_random_spawn which overrides the spawn-files defined
+	  coordinates to make all mobs always spawn randomly on the map. [Skotlex]
+	* SC_SPEEDUP0 is no longer dispellable by SA_DISPEL [Skotlex]
+2006/08/04
+	* Removed settings enemy_critical_rate, homun_critical_rate. Added settings
+	  enable_critical (defaults to specify only players), mob_critical_rate and
+	  critical_rate. The last applies to all non-mobs and non-players
+	  (battle/battle.conf) [Skotlex]
+	* Removed settings mob_npc_warp, mob_warpportal. Replaced with setting
+	  mob_warp which specifies which types of warp can a mob step into
+	  (battle/monster.conf) [Skotlex]
+	* Changed name of the setting log_pick to log_filter since that's what it
+	  does now. [Skotlex]
+	* Modified enable_logs so that instead of a 0/1 setting, you can specify
+	  which kind of events to log (so you can use a combination), see log_athena
+	  for the bitmask configuration. [Skotlex]
+	* Cleaned a bit the contents of log_athena.conf
+2006/08/02
+	* Updated status_cast_cancel to also include silence (so the cast bar is
+	  cancelled if you are silenced during it) [Skotlex]
+2006/08/01
+	* merged in atcommands jailfor, jailtime, charjailtime. Thanks to Meruru
+	  and Coltaro for the code. [Skotlex]
+	* Expanded setting debuff_on_logout so that &1 removes negative buffs and
+	  &2 removes positive buffs. [Skotlex]
+	* Added battle config file status.conf, moved some settings from skill.conf
+	  and battle.conf to it since they are entirely Status-Change related.
+	  [Skotlex]
+2006/07/27
+	* Added config setting party_update_interval so you can specify how often
+	  the party-mate minidots should be updated (defaults to 1 sec). [Skotlex]
+	* Removed a bunch of broken comments in skill.c [Skotlex]
diff --git a/conf-tmpl/GM_account.txt b/conf-tmpl/GM_account.txt
index bffd60781..ea41ab682 100644
--- a/conf-tmpl/GM_account.txt
+++ b/conf-tmpl/GM_account.txt
@@ -1,12 +1,12 @@
-// eAthena's GM Accounts File

-// Edited by MC Cameri to enable account id ranges

-// Changing this file while login server is running 

-// Usage #1(Standard): <account id> <level>

-// Usage #2(Range): <beginning of range[-:~]end of range> <level>

-// Examples:

-// 2000002 99

-// 2000003-2000005 99

-// 2000003~2000005 99

-// 704585 30

-

-704554-704584 99

+// eAthena's GM Accounts File
+// Edited by MC Cameri to enable account id ranges
+// Changing this file while login server is running 
+// Usage #1(Standard): <account id> <level>
+// Usage #2(Range): <beginning of range[-:~]end of range> <level>
+// Examples:
+// 2000002 99
+// 2000003-2000005 99
+// 2000003~2000005 99
+// 704585 30
+
+704554-704584 99
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index 9371c2781..682ad42d9 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -1,798 +1,798 @@
-// Athena atcommand Configuration file.

-// Translated by Peter Kieser <pfak@telus.net>

-

-// Set here the symbol that you want to use for your commands

-// Only 1 character is get (default is character_savecharacter_save'@'). You can set any character,

-// except control-character (0x00-0x1f), '%' (party chat speaking) and '/' (standard ragnarok GM commands)

-// With default character, all commands begin by a '@': <example> @revive

-command_symbol: @

-

-

-// Sets the level of the users that can use the GM commands.

-// <command name>: level

-// When battle_athena.conf has atcommand_gm_only set to no,

-// normal players (gm level 0) can use GM commands if you set 0 to the command level.

-// Max GM level is 99. If you want forbid a command to all people, set it with level 100.

-

-// Default values are set to define different GM levels like follow:

-// 0: normal player

-//    -> no special advantage (only @time to know time and if at_command_gm_only is disabled)

-// 1: Super player

-//    -> some (very) little advantages: storage, petrename, etc...

-// 10: Super player+

-//    -> same of Super player with !go (very super player)

-// 20: Mediator

-//    -> it's a GM that only need to know people, and move to their to speak with them (they can access to any command about wisps)

-// 40: Sub-GM

-//    -> This GM can help a GM, and can not create item or zeny or modify a character (can have some information commands)

-// 50: Sub-GM+

-//    -> This GM can change some non-important things on a character

-// 60: GM

-//    -> can do almost anything (excep administration, and mass commands)

-//       GM is the first level where we can modify a character with important value, create items or create zenys

-// 80: GM Chief

-//    -> can do anything, except administration commands

-// 99: Administrator

-//    -> can do anything!

-// 100: Disabled

-//    -> Commands that aren't used. Note: You must use command level 100 to disable command. Commenting doesn't enough.

-

-

-//--------------------------

-// 0: normal player commands

-// None for security purposes.

-

-//-------------------------

-// 1: Super player commands

-

-//Displays a list of @ commands available to the player.

-commands: 1

-

-//Displays the server rates.

-rates: 1

-

-// Show server uptime

-uptime: 1

-

-//Shows/Hides the "there is a delay after a skill" message.

-showdelay: 1

-

-//Displays current levels and % progress.

-exp: 1

-

-// To change your (own) email (characters protection)

-// note: this command doesn't check email itself, but check structure of the email (xxx@xxx)

-//       if you want be sure of each e-mail disable this option (value: 100)

-email: 1

-

-// Show Monster info (rates, stats, drops, MVP stuff)

-mobinfo: 1

-monsterinfo: 1

-mi: 1

-

-// Show Item info (type, price, etc)

-iteminfo: 1

-ii: 1

-

-// Show who drops an item (mobs with highest drop rate)

-whodrops: 1

-

-// Syncs the position of the player on the client with the one stored in the server.

-refresh: 1

-

-// Give server time. (6 same commands)

-time: 1

-date: 1

-server_date: 1

-serverdate: 1

-server_time: 1

-servertime: 1

-

-// Displays SVN version of the server.

-version: 1

-

-// Suicide your character.

-die: 1

-

-// Enables you to rename your pet.

-petrename: 1

-

-party: 1

-

-// Brings up your personal storage wherever you are.

-storage: 1

-

-// Locate someone on a map, returns your coordinates if the person isn't on.

-where: 1

-

-// Duel organizing commands

-duel: 1

-invite: 1

-accept: 1

-reject: 1

-leave: 1

-

-// Away messsage

-away: 1

-aw: 1

-

-// Main chat

-main: 1

-

-// Autorejecting Deals/Invites

-noask: 1

-

-// Displays remaining jail time

-jailtime: 1

-

-//Homunculus commands for players

-homtalk: 1

-hominfo: 1

-

-//---------------------------

-// 10: Super player+ commands

-

-//Displays/Hides Experience gained

-showexp: 10

-

-//Displays/Hides Zeny gained

-showzeny: 10

-

-// Spawns you to set points in major cities.

-go: 10

-

-// Enables/disables autolooting from killed mobs.

-autoloot: 10

-

-// Allows you continue vending offline.

-autotrade: 10

-at: 10

-

-// Change Guild Master of your Guild

-changegm: 10

-

-// Change the leader of your party.

-changeleader: 10

-

-// Change the party item share rules.

-partyoption: 10

-

-// Command what the player's pet will say.

-pettalk: 10

-

-// Locates and displays the position of a certain mob on the current map.

-mobsearch: 10

-// Locates and displays the position of a certain mob on your mini-map

-showmobs: 10

-

-//----------------------

-// 20: Mediator commands

-

-// Displays helpfile in Athena base directory (2 same commands).

-help: 20

-h: 20

-help2: 20

-h2: 20

-

-// Warp yourself to a person (3 same commands + /shift).

-jumpto: 20

-goto: 20

-warpto: 20

-

-// Warp yourself to a person by PID (similar to above, cept you us the PID)

-jumptoid: 20

-jumptoid2: 20

-gotoid: 20

-gotoid2: 20

-warptoid: 20

-warptoid2: 20

-

-// Displays the motd file to all players

-gmotd: 20

-

-// follow a player (including warping to them)

-follow: 20

-

-// Sends a request to all connected GMs (via the gm whisper system)

-request: 20

-

-// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").

-kick: 20

-

-// Disconnects a user from the server using their PID.

-kickid: 20

-kickid2: 20

-

-// Changes your apperance.

-model: 20

-

-// To get a peco to (un)ride

-mountpeco: 20

-

-// Returns list of logged in characters with their position (2 same commands).

-who: 20

-whois: 20

-

-// Returns list of logged in characters with their job.

-who2: 20

-

-// Returns list of logged in characters with their party/guild.

-who3: 20

-

-// Returns list of logged in characters with their position in a specifical map.

-whomap: 20

-

-// Returns list of logged in characters with their job in a specifical map.

-whomap2: 20

-

-// Returns list of logged in characters with their party/guild in a specifical map.

-whomap3: 20

-

-// Like @who+@who2+who3, but only for GM.

-whogm: 20

-

-// Change your appearence to other players to a mob.

-disguise: 20

-

-//Restore your normal appearance.

-undisguise: 20

-

-// Display ignore list of a player (people from which the player ignore wisps)

-charignorelist: 20

-

-// Displays the text as a normal message with the format "*name message*" 

-// instead of "name : message" (Like the /me command in IRC)

-me: 20

-

-// Changes your name to your choice temporarly.

-fakename: 20

-

-// Changes your size.

-size: 20

-

-// Can command what other npcs (by name) can say.

-npctalk: 20

-

-//--------------------

-// 40: Sub-GM commands

-

-// Broadcast to the whole server. Using (1 command + /nb, /b).

-broadcast: 40

-

-// Broadcast to the map you are on (1 command + /lb, /nlb).

-localbroadcast: 40

-

-// Broadcast (with or without name).

-kami: 40

-kamib: 40

-

-// Enables you to go to a certain map, at (x,y) coordinates. (@mapmove + /mm or /mapmove)

-mapmove: 40

-

-// Enables GVG on a map (2 same commands).

-gvgon: 40

-gpvpon: 40

-

-// Turns GVG (Guild v. Guild) off on a map (2 same commands).

-gvgoff: 40

-gpvpoff: 40

-

-// Heals a person to full HP/SP.

-heal: 40

-

-// GM Hide (enables you to be invisible to characters, and most monsters) (1 command + /hide).

-hide: 40

-

-// Changes your job to one you specify (2 same commands).

-job: 40

-jobchange: 40

-

-// Enables you to to jump randomly on a map (that you are already on).

-jump: 40

-

-// Warps you to your last save point (2 same commands).

-return: 40

-load: 40

-

-// Enables lost skills.

-lostskill: 40

-

-// Saves a warp point.

-memo: 40

-

-// Set your character display options. (Visual effects of your character)

-option: 40

-

-// Sets the level of intemecy of your pet.

-petfriendly: 40

-

-// Sets hunger level of your pet.

-pethungry: 40

-

-// Turns PVP (Person v. Person) off on a map.

-pvpoff: 40

-

-// Enables PVP on a map.

-pvpon: 40

-

-// Enables platinum skills.

-questskill: 40

-

-// Sets the speed you can walk/attack at. Default is 150.

-speed: 40

-charspeed: 40

-

-// Enables spirit sphere balls.

-spiritball: 40

-

-// Warp yourself to a certain map, at (x,y) coordinates (2 same commands).

-rura: 40

-warp: 40

-

-// Changes GM clothes color (2 same commands)

-dye: 40

-ccolor: 40

-

-// Changes GM hair style (2 same commands)

-hairstyle: 40

-hstyle: 40

-

-// Changes GM hair color (2 same commands)

-haircolor: 40

-hcolor: 40

-

-// Deletes all your items.

-itemreset: 40

-

-// Displays distribution of players on the server per map (% on each map which has players)

-users: 40

-

-// Deletes floor items in your range of sight

-cleanmap: 40

-

-// Kill all monsters in map (without drops)

-killmonster2: 40

-

-// Sets your spawn point (aka save point).

-save: 40

-

-// Do some visual effect on your character

-effect: 40

-

-// Display all items of a player's cart

-charcartlist: 40

-

-// drop all your items

-dropall: 40

-

-// store all your items

-storeall: 40

-

-// allow other players to hit you out of pvp

-killable: 40

-

-// look up a skill by name

-skillid: 40

-

-// use a skill by id

-useskill: 40

-

-// What skills are required to get this skill

-skilltree: 40

-

-// Marriage skills

-marry: 40

-divorce: 40

-

-// make another player killable

-charkillable: 40

-

-// Same as above, cept uses PID.

-charkillableid: 40

-charkillableid2: 40

-

-// Play a Sound!

-sound: 40

-

-//---------------------

-// 50: Sub-GM+ commands

-

-guild: 50

-

-// Brings up your guild storage wherever you are.

-gstorage: 50

-

-// Spawns a monster, and a certain amount (3 same commands + /monster).

-spawn: 50

-monster: 50

-summon: 50

-

-// To get a peco to (un)ride for another player.

-charmountpeco: 50

-

-// Spawns a smaller sized version of a monster.

-monstersmall: 50

-

-// Spawns a larger sized version of a monster.

-monsterbig: 50

-

-// It will spawn a supportive clone of the given player.

-clone: 50

-

-// It will spawn a supportive clone of the given player that follows the creator around.

-slaveclone: 50

-

-// It will spawn an aggresive clone of the given player.

-evilclone: 50

-

-

-//----------------

-// 60: GM commands

-

-// Starts Guild Wars

-agitstart: 60

-

-// Ends Guild Wars

-agitend: 60

-

-// Resurects yourself.

-alive: 60

-

-// Levels your character to specified level (adds to your level) (3 same commands).

-lvup: 60

-baselvlup: 60

-blevel: 60

-

-// Raises your job level (3 same commands).

-joblvup: 60

-joblvlup: 60

-jlevel: 60

-

-// Changes the sex of yourself

-changesex: 60

-

-// Remove items from a character

-chardelitem: 60

-

-// Saves the respawn point of another character.

-charsave: 60

-

-// Levels your guild to specified level (2 same commands).

-guildlvup: 60

-guildlvlup: 60

-

-idsearch: 60

-

-// Creates an item of your choosing, either Item ID or Name (1 command + /item).

-item: 60

-

-// Creates a complet item (card, etc...) of your choosing, either Item ID or Name.

-item2: 60

-

-// Kill another character without hitting them.

-kill: 60

-

-// Same as above, cept uses PID.

-killid: 60

-killid2: 60

-

-// Kill all monsters in map (with drops)

-killmonster: 60

-

-// Creates yourself a pet egg, have to use Pet ID.

-makeegg: 60

-

-//Hatches an egg

-hatch: 60

-

-// Enable hitting a player even when not in pvp

-killer: 60

-

-// Creates weapon of desired element.

-produce: 60

-

-// Warps a character to you (1 command + /recall).

-recall: 60

-

-// Warps a character to you using their PID.

-recallid: 60

-recallid2: 60

-

-// Refines all weapons in your items list.

-refine: 60

-

-// Will repair all broken items in inventory.

-repairall: 60

-

-// Revives a character, and heals them.

-revive: 60

-

-// Same as above, cept uses PID.

-reviveid: 60

-reviveid2: 60

-

-// Warp another person to a certain map, at (x,y) coordinates (2 same commands).

-rura+: 60

-charwarp: 60

-shuffle: 60

-

-// Change Status of your character

-str: 60

-agi: 60

-vit: 60

-int: 60

-dex: 60

-luk: 60

-

-// Gets all skills (4 same commands)

-allskill: 60

-allskills: 60

-skillall: 60

-skillsall: 60

-

-// sets GM stats to maximum (4 same commands)

-statall: 60

-statsall: 60

-allstats: 60

-allstat: 60

-

-// Gives you job points.

-stpoint: 60

-

-// Gives you skill points of desired amount.

-skpoint: 60

-

-// Warps all online character of a guild to you. (at least one member of that guild must be on.)

-guildrecall: 60

-

-// Warps all online character of a party to you. (at least one party member must be online.)

-partyrecall: 60

-

-// Allows you to spy on any Guilds Guild chat. (at least one member of that guild must be on.)

-// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)

-guildspy: 60

-

-//Allows you to spy on any party's party chat. (at least one party member must be online.)

-// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)

-partyspy: 60

-

-// Gives you money (zeny) of desired amount.

-zeny: 60

-

-// To block definitively a player (only administrator can unblock the account) (2 same commands)

-block: 60

-charblock: 60

-

-// To unblock a player (2 same commands)

-unblock: 60

-charunblock: 60

-

-// To ban a player for a limited time (only administrator can unban the account) (4 same commands)

-ban: 60

-banish: 60

-charban: 60

-charbanish: 60

-

-// To unban a player (4 same commands)

-unban: 60

-unbanish: 60

-charunban: 60

-charunbanish: 60

-

-// To send specified character in jails

-jail: 60

-

-// To discharge a prisoner (2 same commands)

-unjail: 60

-discharge: 60

-

-// Timed jailing

-jailfor: 60

-

-//Displays remaining jail time

-charjailtime: 60

-

-// To change disguise of another player/GM

-chardisguise: 60

-charundisguise: 60

-

-// Create a static warp portal that lasts until the next reboot

-addwarp: 60

-

-// drop a players possessions on the gruond

-chardropall: 60

-

-// put a players possessions in storage

-charstoreall: 60

-

-//Homunculus commands for gms

-homlvup: 60

-homevolution: 60

-makehomun: 60

-homfriendly: 60

-homhungry: 60

-

-//----------------------

-// 80: GM Chief commands

-

-// Set the map you are on to day.

-day: 80

-

-// Kills everyone on the server.

-doom: 80

-

-// Kills everyone on the map you are on.

-doommap: 80

-

-// Set the map you are currently on to night.

-night: 80

-

-// Recalls Everyone To Your Coordinates

-recallall: 80

-

-// Revives all players on the map.

-raisemap: 80

-

-// Revives all players on the server.

-raise: 80

-

-// Hides a NPC.

-hidenpc: 80

-

-// Unhides a NPC.

-shownpc: 80

-

-// Loads a Script

-loadnpc: 80

-

-// Unloads a NPC

-unloadnpc: 80

-

-// Move a NPC

-npcmove: 80

-

-// turn skills on for a map

-skillon: 80

-

-// turn skills off for a map

-skilloff: 80

-

-// Unmute a player

-unmute: 80

-

-//---------------------------

-// 99: Administrator commands

-

-// Disconnect all users from the server

-kickall: 99

-

-// Closes Map-Server

-mapexit: 99

-

-// Give information about terrain/area (debug function)

-gat: 99

-

-// Enables debugging

-packet: 99

-

-// Allows viewing/changing the map's water level (debug function)

-// NOTE: Requires access to the .grf files since the map height properties are not stored in the map cache.

-waterlevel: 99

-

-// Shows information about the map

-mapinfo: 99

-

-// Set Map Flags (WIP)

-mapflag: 99

-

-// Re-load item database (admin command)

-reloaditemdb: 99

-

-// Re-load monsters database (admin command)

-reloadmobdb: 99

-

-// Re-load skills database (admin command)

-reloadskilldb: 99

-

-// Re-load scripts (admin command)

-reloadscript: 99

-

-// Re-load GM level (admin command)

-reloadgmdb: 99

-

-// change a battle_config flag without rebooting server

-setbattleflag: 99

-

-// Refresh only status of players - SQL Only

-refreshonline: 99

-

-// Re-load gm command config (admin command)

-reloadatcommand: 99

-

-// Re-load battle config (admin command)

-reloadbattleconf: 99

-

-// Re-load status database (admin command)

-reloadstatusdb: 99

-

-// Re-load player info database (admin command)

-reloadpcdb: 99

-

-// Re-load the Message of the Day (admin command)

-reloadmotd: 99

-

-// Changes the GM level of another character

-// (lasts until reboot, or gm list reload)

-adjgmlvl: 99

-

-// Changes the required GM level of an @ command

-// (effect lasts until restart or command reload)

-adjcmdlvl: 99

-

-// [Un]Disguise All Players (admin command)

-disguiseall: 99

-undisguiseall: 99

-

-// Mute player (admin command)

-mute: 99

-mutearea: 99

-stfu: 99

-

-// Makes you inmune to attacks (monsters/players/skills cannot target/hit you, admin command)

-monsterignore: 99

-battleignore: 99

-

-//---------------------------------------------------------------

-// 99: Weather effects

-

-snow: 99

-

-clouds: 99

-

-clouds2: 99

-

-fog: 99

-

-fireworks: 99

-

-sakura: 99

-

-leaves:99

-

-// Stop all weather effects

-clearweather: 99

-

-//---------------------------------------------------------------

-// 0: Mail System - SQL Only commands - Must be enabled

-

-// Check # of messages.

-checkmail: 1

-

-// List all messages.

-listmail: 1

-

-// List only new mail.

-listnewmail: 1

-

-// Read a message.

-readmail: 1

-

-// Send mail.

-sendmail: 1

-

-// Send priority mail (tagged with Priority and cannot be deleted until read)

-sendprioritymail: 80

-

-// Delete a message.

-deletemail: 1

-

-//---------------------------------------------------------------

-// 100: Disabled commands

-gm: 100

-nuke: 100

-

-

-//---------------------

-// OTHER: not a command

-

-import: conf/import/atcommand_conf.txt

+// Athena atcommand Configuration file.
+// Translated by Peter Kieser <pfak@telus.net>
+
+// Set here the symbol that you want to use for your commands
+// Only 1 character is get (default is character_savecharacter_save'@'). You can set any character,
+// except control-character (0x00-0x1f), '%' (party chat speaking) and '/' (standard ragnarok GM commands)
+// With default character, all commands begin by a '@': <example> @revive
+command_symbol: @
+
+
+// Sets the level of the users that can use the GM commands.
+// <command name>: level
+// When battle_athena.conf has atcommand_gm_only set to no,
+// normal players (gm level 0) can use GM commands if you set 0 to the command level.
+// Max GM level is 99. If you want forbid a command to all people, set it with level 100.
+
+// Default values are set to define different GM levels like follow:
+// 0: normal player
+//    -> no special advantage (only @time to know time and if at_command_gm_only is disabled)
+// 1: Super player
+//    -> some (very) little advantages: storage, petrename, etc...
+// 10: Super player+
+//    -> same of Super player with !go (very super player)
+// 20: Mediator
+//    -> it's a GM that only need to know people, and move to their to speak with them (they can access to any command about wisps)
+// 40: Sub-GM
+//    -> This GM can help a GM, and can not create item or zeny or modify a character (can have some information commands)
+// 50: Sub-GM+
+//    -> This GM can change some non-important things on a character
+// 60: GM
+//    -> can do almost anything (excep administration, and mass commands)
+//       GM is the first level where we can modify a character with important value, create items or create zenys
+// 80: GM Chief
+//    -> can do anything, except administration commands
+// 99: Administrator
+//    -> can do anything!
+// 100: Disabled
+//    -> Commands that aren't used. Note: You must use command level 100 to disable command. Commenting doesn't enough.
+
+
+//--------------------------
+// 0: normal player commands
+// None for security purposes.
+
+//-------------------------
+// 1: Super player commands
+
+//Displays a list of @ commands available to the player.
+commands: 1
+
+//Displays the server rates.
+rates: 1
+
+// Show server uptime
+uptime: 1
+
+//Shows/Hides the "there is a delay after a skill" message.
+showdelay: 1
+
+//Displays current levels and % progress.
+exp: 1
+
+// To change your (own) email (characters protection)
+// note: this command doesn't check email itself, but check structure of the email (xxx@xxx)
+//       if you want be sure of each e-mail disable this option (value: 100)
+email: 1
+
+// Show Monster info (rates, stats, drops, MVP stuff)
+mobinfo: 1
+monsterinfo: 1
+mi: 1
+
+// Show Item info (type, price, etc)
+iteminfo: 1
+ii: 1
+
+// Show who drops an item (mobs with highest drop rate)
+whodrops: 1
+
+// Syncs the position of the player on the client with the one stored in the server.
+refresh: 1
+
+// Give server time. (6 same commands)
+time: 1
+date: 1
+server_date: 1
+serverdate: 1
+server_time: 1
+servertime: 1
+
+// Displays SVN version of the server.
+version: 1
+
+// Suicide your character.
+die: 1
+
+// Enables you to rename your pet.
+petrename: 1
+
+party: 1
+
+// Brings up your personal storage wherever you are.
+storage: 1
+
+// Locate someone on a map, returns your coordinates if the person isn't on.
+where: 1
+
+// Duel organizing commands
+duel: 1
+invite: 1
+accept: 1
+reject: 1
+leave: 1
+
+// Away messsage
+away: 1
+aw: 1
+
+// Main chat
+main: 1
+
+// Autorejecting Deals/Invites
+noask: 1
+
+// Displays remaining jail time
+jailtime: 1
+
+//Homunculus commands for players
+homtalk: 1
+hominfo: 1
+
+//---------------------------
+// 10: Super player+ commands
+
+//Displays/Hides Experience gained
+showexp: 10
+
+//Displays/Hides Zeny gained
+showzeny: 10
+
+// Spawns you to set points in major cities.
+go: 10
+
+// Enables/disables autolooting from killed mobs.
+autoloot: 10
+
+// Allows you continue vending offline.
+autotrade: 10
+at: 10
+
+// Change Guild Master of your Guild
+changegm: 10
+
+// Change the leader of your party.
+changeleader: 10
+
+// Change the party item share rules.
+partyoption: 10
+
+// Command what the player's pet will say.
+pettalk: 10
+
+// Locates and displays the position of a certain mob on the current map.
+mobsearch: 10
+// Locates and displays the position of a certain mob on your mini-map
+showmobs: 10
+
+//----------------------
+// 20: Mediator commands
+
+// Displays helpfile in Athena base directory (2 same commands).
+help: 20
+h: 20
+help2: 20
+h2: 20
+
+// Warp yourself to a person (3 same commands + /shift).
+jumpto: 20
+goto: 20
+warpto: 20
+
+// Warp yourself to a person by PID (similar to above, cept you us the PID)
+jumptoid: 20
+jumptoid2: 20
+gotoid: 20
+gotoid2: 20
+warptoid: 20
+warptoid2: 20
+
+// Displays the motd file to all players
+gmotd: 20
+
+// follow a player (including warping to them)
+follow: 20
+
+// Sends a request to all connected GMs (via the gm whisper system)
+request: 20
+
+// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
+kick: 20
+
+// Disconnects a user from the server using their PID.
+kickid: 20
+kickid2: 20
+
+// Changes your apperance.
+model: 20
+
+// To get a peco to (un)ride
+mountpeco: 20
+
+// Returns list of logged in characters with their position (2 same commands).
+who: 20
+whois: 20
+
+// Returns list of logged in characters with their job.
+who2: 20
+
+// Returns list of logged in characters with their party/guild.
+who3: 20
+
+// Returns list of logged in characters with their position in a specifical map.
+whomap: 20
+
+// Returns list of logged in characters with their job in a specifical map.
+whomap2: 20
+
+// Returns list of logged in characters with their party/guild in a specifical map.
+whomap3: 20
+
+// Like @who+@who2+who3, but only for GM.
+whogm: 20
+
+// Change your appearence to other players to a mob.
+disguise: 20
+
+//Restore your normal appearance.
+undisguise: 20
+
+// Display ignore list of a player (people from which the player ignore wisps)
+charignorelist: 20
+
+// Displays the text as a normal message with the format "*name message*" 
+// instead of "name : message" (Like the /me command in IRC)
+me: 20
+
+// Changes your name to your choice temporarly.
+fakename: 20
+
+// Changes your size.
+size: 20
+
+// Can command what other npcs (by name) can say.
+npctalk: 20
+
+//--------------------
+// 40: Sub-GM commands
+
+// Broadcast to the whole server. Using (1 command + /nb, /b).
+broadcast: 40
+
+// Broadcast to the map you are on (1 command + /lb, /nlb).
+localbroadcast: 40
+
+// Broadcast (with or without name).
+kami: 40
+kamib: 40
+
+// Enables you to go to a certain map, at (x,y) coordinates. (@mapmove + /mm or /mapmove)
+mapmove: 40
+
+// Enables GVG on a map (2 same commands).
+gvgon: 40
+gpvpon: 40
+
+// Turns GVG (Guild v. Guild) off on a map (2 same commands).
+gvgoff: 40
+gpvpoff: 40
+
+// Heals a person to full HP/SP.
+heal: 40
+
+// GM Hide (enables you to be invisible to characters, and most monsters) (1 command + /hide).
+hide: 40
+
+// Changes your job to one you specify (2 same commands).
+job: 40
+jobchange: 40
+
+// Enables you to to jump randomly on a map (that you are already on).
+jump: 40
+
+// Warps you to your last save point (2 same commands).
+return: 40
+load: 40
+
+// Enables lost skills.
+lostskill: 40
+
+// Saves a warp point.
+memo: 40
+
+// Set your character display options. (Visual effects of your character)
+option: 40
+
+// Sets the level of intemecy of your pet.
+petfriendly: 40
+
+// Sets hunger level of your pet.
+pethungry: 40
+
+// Turns PVP (Person v. Person) off on a map.
+pvpoff: 40
+
+// Enables PVP on a map.
+pvpon: 40
+
+// Enables platinum skills.
+questskill: 40
+
+// Sets the speed you can walk/attack at. Default is 150.
+speed: 40
+charspeed: 40
+
+// Enables spirit sphere balls.
+spiritball: 40
+
+// Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
+rura: 40
+warp: 40
+
+// Changes GM clothes color (2 same commands)
+dye: 40
+ccolor: 40
+
+// Changes GM hair style (2 same commands)
+hairstyle: 40
+hstyle: 40
+
+// Changes GM hair color (2 same commands)
+haircolor: 40
+hcolor: 40
+
+// Deletes all your items.
+itemreset: 40
+
+// Displays distribution of players on the server per map (% on each map which has players)
+users: 40
+
+// Deletes floor items in your range of sight
+cleanmap: 40
+
+// Kill all monsters in map (without drops)
+killmonster2: 40
+
+// Sets your spawn point (aka save point).
+save: 40
+
+// Do some visual effect on your character
+effect: 40
+
+// Display all items of a player's cart
+charcartlist: 40
+
+// drop all your items
+dropall: 40
+
+// store all your items
+storeall: 40
+
+// allow other players to hit you out of pvp
+killable: 40
+
+// look up a skill by name
+skillid: 40
+
+// use a skill by id
+useskill: 40
+
+// What skills are required to get this skill
+skilltree: 40
+
+// Marriage skills
+marry: 40
+divorce: 40
+
+// make another player killable
+charkillable: 40
+
+// Same as above, cept uses PID.
+charkillableid: 40
+charkillableid2: 40
+
+// Play a Sound!
+sound: 40
+
+//---------------------
+// 50: Sub-GM+ commands
+
+guild: 50
+
+// Brings up your guild storage wherever you are.
+gstorage: 50
+
+// Spawns a monster, and a certain amount (3 same commands + /monster).
+spawn: 50
+monster: 50
+summon: 50
+
+// To get a peco to (un)ride for another player.
+charmountpeco: 50
+
+// Spawns a smaller sized version of a monster.
+monstersmall: 50
+
+// Spawns a larger sized version of a monster.
+monsterbig: 50
+
+// It will spawn a supportive clone of the given player.
+clone: 50
+
+// It will spawn a supportive clone of the given player that follows the creator around.
+slaveclone: 50
+
+// It will spawn an aggresive clone of the given player.
+evilclone: 50
+
+
+//----------------
+// 60: GM commands
+
+// Starts Guild Wars
+agitstart: 60
+
+// Ends Guild Wars
+agitend: 60
+
+// Resurects yourself.
+alive: 60
+
+// Levels your character to specified level (adds to your level) (3 same commands).
+lvup: 60
+baselvlup: 60
+blevel: 60
+
+// Raises your job level (3 same commands).
+joblvup: 60
+joblvlup: 60
+jlevel: 60
+
+// Changes the sex of yourself
+changesex: 60
+
+// Remove items from a character
+chardelitem: 60
+
+// Saves the respawn point of another character.
+charsave: 60
+
+// Levels your guild to specified level (2 same commands).
+guildlvup: 60
+guildlvlup: 60
+
+idsearch: 60
+
+// Creates an item of your choosing, either Item ID or Name (1 command + /item).
+item: 60
+
+// Creates a complet item (card, etc...) of your choosing, either Item ID or Name.
+item2: 60
+
+// Kill another character without hitting them.
+kill: 60
+
+// Same as above, cept uses PID.
+killid: 60
+killid2: 60
+
+// Kill all monsters in map (with drops)
+killmonster: 60
+
+// Creates yourself a pet egg, have to use Pet ID.
+makeegg: 60
+
+//Hatches an egg
+hatch: 60
+
+// Enable hitting a player even when not in pvp
+killer: 60
+
+// Creates weapon of desired element.
+produce: 60
+
+// Warps a character to you (1 command + /recall).
+recall: 60
+
+// Warps a character to you using their PID.
+recallid: 60
+recallid2: 60
+
+// Refines all weapons in your items list.
+refine: 60
+
+// Will repair all broken items in inventory.
+repairall: 60
+
+// Revives a character, and heals them.
+revive: 60
+
+// Same as above, cept uses PID.
+reviveid: 60
+reviveid2: 60
+
+// Warp another person to a certain map, at (x,y) coordinates (2 same commands).
+rura+: 60
+charwarp: 60
+shuffle: 60
+
+// Change Status of your character
+str: 60
+agi: 60
+vit: 60
+int: 60
+dex: 60
+luk: 60
+
+// Gets all skills (4 same commands)
+allskill: 60
+allskills: 60
+skillall: 60
+skillsall: 60
+
+// sets GM stats to maximum (4 same commands)
+statall: 60
+statsall: 60
+allstats: 60
+allstat: 60
+
+// Gives you job points.
+stpoint: 60
+
+// Gives you skill points of desired amount.
+skpoint: 60
+
+// Warps all online character of a guild to you. (at least one member of that guild must be on.)
+guildrecall: 60
+
+// Warps all online character of a party to you. (at least one party member must be online.)
+partyrecall: 60
+
+// Allows you to spy on any Guilds Guild chat. (at least one member of that guild must be on.)
+// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)
+guildspy: 60
+
+//Allows you to spy on any party's party chat. (at least one party member must be online.)
+// NOTE: map server needs to be configured to enable spying to use this command (enable_spy: yes)
+partyspy: 60
+
+// Gives you money (zeny) of desired amount.
+zeny: 60
+
+// To block definitively a player (only administrator can unblock the account) (2 same commands)
+block: 60
+charblock: 60
+
+// To unblock a player (2 same commands)
+unblock: 60
+charunblock: 60
+
+// To ban a player for a limited time (only administrator can unban the account) (4 same commands)
+ban: 60
+banish: 60
+charban: 60
+charbanish: 60
+
+// To unban a player (4 same commands)
+unban: 60
+unbanish: 60
+charunban: 60
+charunbanish: 60
+
+// To send specified character in jails
+jail: 60
+
+// To discharge a prisoner (2 same commands)
+unjail: 60
+discharge: 60
+
+// Timed jailing
+jailfor: 60
+
+//Displays remaining jail time
+charjailtime: 60
+
+// To change disguise of another player/GM
+chardisguise: 60
+charundisguise: 60
+
+// Create a static warp portal that lasts until the next reboot
+addwarp: 60
+
+// drop a players possessions on the gruond
+chardropall: 60
+
+// put a players possessions in storage
+charstoreall: 60
+
+//Homunculus commands for gms
+homlvup: 60
+homevolution: 60
+makehomun: 60
+homfriendly: 60
+homhungry: 60
+
+//----------------------
+// 80: GM Chief commands
+
+// Set the map you are on to day.
+day: 80
+
+// Kills everyone on the server.
+doom: 80
+
+// Kills everyone on the map you are on.
+doommap: 80
+
+// Set the map you are currently on to night.
+night: 80
+
+// Recalls Everyone To Your Coordinates
+recallall: 80
+
+// Revives all players on the map.
+raisemap: 80
+
+// Revives all players on the server.
+raise: 80
+
+// Hides a NPC.
+hidenpc: 80
+
+// Unhides a NPC.
+shownpc: 80
+
+// Loads a Script
+loadnpc: 80
+
+// Unloads a NPC
+unloadnpc: 80
+
+// Move a NPC
+npcmove: 80
+
+// turn skills on for a map
+skillon: 80
+
+// turn skills off for a map
+skilloff: 80
+
+// Unmute a player
+unmute: 80
+
+//---------------------------
+// 99: Administrator commands
+
+// Disconnect all users from the server
+kickall: 99
+
+// Closes Map-Server
+mapexit: 99
+
+// Give information about terrain/area (debug function)
+gat: 99
+
+// Enables debugging
+packet: 99
+
+// Allows viewing/changing the map's water level (debug function)
+// NOTE: Requires access to the .grf files since the map height properties are not stored in the map cache.
+waterlevel: 99
+
+// Shows information about the map
+mapinfo: 99
+
+// Set Map Flags (WIP)
+mapflag: 99
+
+// Re-load item database (admin command)
+reloaditemdb: 99
+
+// Re-load monsters database (admin command)
+reloadmobdb: 99
+
+// Re-load skills database (admin command)
+reloadskilldb: 99
+
+// Re-load scripts (admin command)
+reloadscript: 99
+
+// Re-load GM level (admin command)
+reloadgmdb: 99
+
+// change a battle_config flag without rebooting server
+setbattleflag: 99
+
+// Refresh only status of players - SQL Only
+refreshonline: 99
+
+// Re-load gm command config (admin command)
+reloadatcommand: 99
+
+// Re-load battle config (admin command)
+reloadbattleconf: 99
+
+// Re-load status database (admin command)
+reloadstatusdb: 99
+
+// Re-load player info database (admin command)
+reloadpcdb: 99
+
+// Re-load the Message of the Day (admin command)
+reloadmotd: 99
+
+// Changes the GM level of another character
+// (lasts until reboot, or gm list reload)
+adjgmlvl: 99
+
+// Changes the required GM level of an @ command
+// (effect lasts until restart or command reload)
+adjcmdlvl: 99
+
+// [Un]Disguise All Players (admin command)
+disguiseall: 99
+undisguiseall: 99
+
+// Mute player (admin command)
+mute: 99
+mutearea: 99
+stfu: 99
+
+// Makes you inmune to attacks (monsters/players/skills cannot target/hit you, admin command)
+monsterignore: 99
+battleignore: 99
+
+//---------------------------------------------------------------
+// 99: Weather effects
+
+snow: 99
+
+clouds: 99
+
+clouds2: 99
+
+fog: 99
+
+fireworks: 99
+
+sakura: 99
+
+leaves:99
+
+// Stop all weather effects
+clearweather: 99
+
+//---------------------------------------------------------------
+// 0: Mail System - SQL Only commands - Must be enabled
+
+// Check # of messages.
+checkmail: 1
+
+// List all messages.
+listmail: 1
+
+// List only new mail.
+listnewmail: 1
+
+// Read a message.
+readmail: 1
+
+// Send mail.
+sendmail: 1
+
+// Send priority mail (tagged with Priority and cannot be deleted until read)
+sendprioritymail: 80
+
+// Delete a message.
+deletemail: 1
+
+//---------------------------------------------------------------
+// 100: Disabled commands
+gm: 100
+nuke: 100
+
+
+//---------------------
+// OTHER: not a command
+
+import: conf/import/atcommand_conf.txt
diff --git a/conf-tmpl/battle/battle.conf b/conf-tmpl/battle/battle.conf
index f7516836f..58daf1e4f 100644
--- a/conf-tmpl/battle/battle.conf
+++ b/conf-tmpl/battle/battle.conf
@@ -1,168 +1,168 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-//Note 4: Use bitmask values to specify who is affected 

-//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-

-// Who should have a baseatk value (makes str affect damage)? (Note 4)

-enable_baseatk: 9

-

-// Who can have perfect flee? (Note 4)

-enable_perfect_flee: 1

-

-// Who can have critical attacks? (Note 4)

-// (Note that there are some skills that always do critical hit regardless of this)

-enable_critical: 1

-

-// Critical adjustment rate for non-players (Note 2)

-mob_critical_rate: 100

-critical_rate: 100

-

-// Should normal attacks give you a walk delay?

-// If no, characters can move as soon as they start an attack (attack animation

-// or walk animation may be omitted client-side, causing cropped attacks or

-// monsters that teleport to you)

-// If set, total walk delay is set to your attack animation duration divided by

-// this value (eg: 1 -> 100%, 2 -> 50%, 4->25%...)

-attack_walk_delay: 0

-

-// Move-delay adjustment after being hit. (Note 2)

-// The 'can't walk' delay after being hit is calculated as a percentage of the damage animation duration.

-// NOTE: Only affects the normal delay from a single attack, not the delay added by the multihit_delay option below.

-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 

-// 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)

-multihit_delay: 80

-

-// Damaged delay rate for players (Note 2)

-// (Setting to no/0  will be like always endure)

-player_damage_delay_rate: 100

-

-// Undead type differeniate.

-// 0 = element undead

-// 1 = race undead

-// 2 = both

-undead_detect_type: 0

-

-// Does HP recover if hit by an attribute that's same as your own? (Note 1)

-attribute_recover: yes

-

-// What is the minimum and maximum hitrate of normal attacks? 

-min_hitrate: 5

-max_hitrate: 100

-

-// Type of penalty that is applied to FLEE when more than agi_penalty_count monsters are targetting player

-// 0 = no penalty is applied

-// 1 = agi_penalty_num is reduced from FLEE as a %

-// 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)

-// By default, only players get the penalty.

-agi_penalty_target: 1

-

-// Amount of enemies required to be targetting player before FLEE begins to be penalized

-agi_penalty_count: 3

-

-// Amount of FLEE penalized per each attacking monster more than agi_penalty_count

-agi_penalty_num: 10

-

-// Type of penalty that is applied to VIT defense when more than vit_penalty_count monsters are targetting player

-// 0 = no penalty is applied

-// 1 = vit_penalty_num is reduced from FLEE as a %

-// 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)

-// By default, only players get the penalty.

-vit_penalty_target: 1

-

-// Amount of enemies required to be targetting player before defense begins to be penalized

-vit_penalty_count: 3

-

-// Amount of VIT defense penalized per each attacking monster more than vit_penalty_count

-vit_penalty_num: 5

-

-// Use alternate method of DEF calculation for physical attacks.

-// With 0, disabled (use normal def% reduction with further def2 reduction)

-// At 1 or more defense is substraction of (DEF* value).

-// eg: 10 + 50 def becomes 0 + (10*type + 50)

-weapon_defense_type: 0

-

-//MDEFＴame as above....(MDEF*value)

-magic_defense_type: 0

-

-// How to count the number of the enemies who do an agi penalty...

-// 1 or less: It is a count altogether.

-// 2: Full evasion exclusion

-// 3: Full evasion and evasion exclusion 

-// 4 or more: Except all.

-agi_penalty_count_lv: 2

-

-// How to count the number of the enemies who do a vit penalty

-// 1 or less: It is a count altogether.

-// 2: Full evasion exclusion

-// 3: Full evasion and evasion exclusion

-// Four or more: Except all.

-vit_penalty_count_lv: 3

-

-// Change attacker's direction to face opponent on every attack? (Note 4)

-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)

-// 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

-

-// Rate at which equipment can break (base rate before it's modified by any skills)

-// 1 = 0.01% chance. Default for official servers: 0

-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 

-// (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

-

-// Overall rate at which you can break target's equipment. (Note 2)

-// This affects the behaviour of skills like acid terror and meltdown

-equip_skill_break_rate: 100

-

-// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)

-// NOTE: The official setting is yes, even thought it degrades performance a bit.

-delay_battle_damage: yes

-

-// Are arrows are consumed when used on a bow? (Note 1)

-arrow_decrement: yes

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+//Note 4: Use bitmask values to specify who is affected 
+//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+
+// Who should have a baseatk value (makes str affect damage)? (Note 4)
+enable_baseatk: 9
+
+// Who can have perfect flee? (Note 4)
+enable_perfect_flee: 1
+
+// Who can have critical attacks? (Note 4)
+// (Note that there are some skills that always do critical hit regardless of this)
+enable_critical: 1
+
+// Critical adjustment rate for non-players (Note 2)
+mob_critical_rate: 100
+critical_rate: 100
+
+// Should normal attacks give you a walk delay?
+// If no, characters can move as soon as they start an attack (attack animation
+// or walk animation may be omitted client-side, causing cropped attacks or
+// monsters that teleport to you)
+// If set, total walk delay is set to your attack animation duration divided by
+// this value (eg: 1 -> 100%, 2 -> 50%, 4->25%...)
+attack_walk_delay: 0
+
+// Move-delay adjustment after being hit. (Note 2)
+// The 'can't walk' delay after being hit is calculated as a percentage of the damage animation duration.
+// NOTE: Only affects the normal delay from a single attack, not the delay added by the multihit_delay option below.
+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 
+// 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)
+multihit_delay: 80
+
+// Damaged delay rate for players (Note 2)
+// (Setting to no/0  will be like always endure)
+player_damage_delay_rate: 100
+
+// Undead type differeniate.
+// 0 = element undead
+// 1 = race undead
+// 2 = both
+undead_detect_type: 0
+
+// Does HP recover if hit by an attribute that's same as your own? (Note 1)
+attribute_recover: yes
+
+// What is the minimum and maximum hitrate of normal attacks? 
+min_hitrate: 5
+max_hitrate: 100
+
+// Type of penalty that is applied to FLEE when more than agi_penalty_count monsters are targetting player
+// 0 = no penalty is applied
+// 1 = agi_penalty_num is reduced from FLEE as a %
+// 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)
+// By default, only players get the penalty.
+agi_penalty_target: 1
+
+// Amount of enemies required to be targetting player before FLEE begins to be penalized
+agi_penalty_count: 3
+
+// Amount of FLEE penalized per each attacking monster more than agi_penalty_count
+agi_penalty_num: 10
+
+// Type of penalty that is applied to VIT defense when more than vit_penalty_count monsters are targetting player
+// 0 = no penalty is applied
+// 1 = vit_penalty_num is reduced from FLEE as a %
+// 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)
+// By default, only players get the penalty.
+vit_penalty_target: 1
+
+// Amount of enemies required to be targetting player before defense begins to be penalized
+vit_penalty_count: 3
+
+// Amount of VIT defense penalized per each attacking monster more than vit_penalty_count
+vit_penalty_num: 5
+
+// Use alternate method of DEF calculation for physical attacks.
+// With 0, disabled (use normal def% reduction with further def2 reduction)
+// At 1 or more defense is substraction of (DEF* value).
+// eg: 10 + 50 def becomes 0 + (10*type + 50)
+weapon_defense_type: 0
+
+//MDEFＴame as above....(MDEF*value)
+magic_defense_type: 0
+
+// How to count the number of the enemies who do an agi penalty...
+// 1 or less: It is a count altogether.
+// 2: Full evasion exclusion
+// 3: Full evasion and evasion exclusion 
+// 4 or more: Except all.
+agi_penalty_count_lv: 2
+
+// How to count the number of the enemies who do a vit penalty
+// 1 or less: It is a count altogether.
+// 2: Full evasion exclusion
+// 3: Full evasion and evasion exclusion
+// Four or more: Except all.
+vit_penalty_count_lv: 3
+
+// Change attacker's direction to face opponent on every attack? (Note 4)
+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)
+// 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
+
+// Rate at which equipment can break (base rate before it's modified by any skills)
+// 1 = 0.01% chance. Default for official servers: 0
+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 
+// (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
+
+// Overall rate at which you can break target's equipment. (Note 2)
+// This affects the behaviour of skills like acid terror and meltdown
+equip_skill_break_rate: 100
+
+// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
+// NOTE: The official setting is yes, even thought it degrades performance a bit.
+delay_battle_damage: yes
+
+// Are arrows are consumed when used on a bow? (Note 1)
+arrow_decrement: yes
diff --git a/conf-tmpl/battle/client.conf b/conf-tmpl/battle/client.conf
index 0168af923..66b5f1349 100644
--- a/conf-tmpl/battle/client.conf
+++ b/conf-tmpl/battle/client.conf
@@ -1,114 +1,114 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// 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

-//    1: Clients 2004-09-06aSakray and older (packet versions 4-9)

-//    2: 2004-09-06aSakexe (version 10)

-//    4: 2004-09-21aSakray (version 11)

-//    8: 2004-10-11aSakexe (version 12)

-//   16: 2004-10-25aSakexe (version 13)

-//   32: 2004-11-01aSakexe (version 14)

-//   64: 2004-12-06aSakexe (version 15)

-//  128: 2005-01-10aSakexe (version 16)

-//  256: 2005-05-09aSakexe (version 17)

-//  512: 2005-06-28aSakexe (version 18)

-// 1024: 2006-04-03aSakexe (version 19)

-// default value: 2047 (all clients)

-packet_ver_flag: 2047

-

-// Minimum delay between whisper/global/party/guild messages (in ms)

-// Messages that break this threshold are silently omitted. 

-min_chat_delay: 0

-

-// valid range of dye's and styles on the client

-min_hair_style: 0

-max_hair_style: 23

-min_hair_color: 0

-max_hair_color: 8

-min_cloth_color: 0 

-max_cloth_color: 4

-

-//When set to yes, the damage field in packets sent from woe maps will be set

-//to -1, making it impossible for GMs, Bots and Hexed clients to know the

-//actual damage caused by attacks. (Note 1)

-hide_woe_damage: no

-

-//"hair style" number that identifies pet.

-//NOTE: The client uses the "hair style" field in the mob packet to tell them apart from mobs.

-//This value is always higher than the max hair-style available in said client.

-//Known values to work (all 2005 clients):

-//older sakexes: 20

-//sakexe 0614: 24

-//sakexe 0628 (and later): 100

-pet_hair_style: 100

-

-// Visible area size (how many squares away from a player can they see)

-area_size: 14

-

-// Maximum user LV to send to client

-//   (Default is 99..  Never go above 127)

-//

-// this is only useful if you have adjusted your client

-// to expect levels higher then 99

-max_lv: 99

-

-// Level required to display an aura.

-// NOTE: This assumes that sending max_lv to the client will display the aura. aura_lv must not be less than max_lv.

-// Example: If max_lv is 99, and aura_lv is 150, characters with level 99~149 will be sent as being all level 98,

-// and only characters with level 150 or more will be reported as having level 99.

-aura_lv: 99

-

-// Will tuxedo and wedding dresses be shown when worn? (Note 1)

-wedding_modifydisplay: no

-

-// Save Clothes color. (This will degrade performance) (Note 1)

-save_clothcolor: yes

-

-// Do not display cloth colors for the wedding class?

-// 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?

-// Set this to yes if your cloth palettes pack doesn't has Xmas palettes (or has less than the other jobs)

-xmas_ignorepalette: no

-

-// Set this to 1 if your clients have langtype problems and can't display motd properly

-motd_type: 0

-

-// Show eAthena version to users when the login?

-display_version: yes

-

-// 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.

-display_hallucination: yes

-

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// 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
+//    1: Clients 2004-09-06aSakray and older (packet versions 4-9)
+//    2: 2004-09-06aSakexe (version 10)
+//    4: 2004-09-21aSakray (version 11)
+//    8: 2004-10-11aSakexe (version 12)
+//   16: 2004-10-25aSakexe (version 13)
+//   32: 2004-11-01aSakexe (version 14)
+//   64: 2004-12-06aSakexe (version 15)
+//  128: 2005-01-10aSakexe (version 16)
+//  256: 2005-05-09aSakexe (version 17)
+//  512: 2005-06-28aSakexe (version 18)
+// 1024: 2006-04-03aSakexe (version 19)
+// default value: 2047 (all clients)
+packet_ver_flag: 2047
+
+// Minimum delay between whisper/global/party/guild messages (in ms)
+// Messages that break this threshold are silently omitted. 
+min_chat_delay: 0
+
+// valid range of dye's and styles on the client
+min_hair_style: 0
+max_hair_style: 23
+min_hair_color: 0
+max_hair_color: 8
+min_cloth_color: 0 
+max_cloth_color: 4
+
+//When set to yes, the damage field in packets sent from woe maps will be set
+//to -1, making it impossible for GMs, Bots and Hexed clients to know the
+//actual damage caused by attacks. (Note 1)
+hide_woe_damage: no
+
+//"hair style" number that identifies pet.
+//NOTE: The client uses the "hair style" field in the mob packet to tell them apart from mobs.
+//This value is always higher than the max hair-style available in said client.
+//Known values to work (all 2005 clients):
+//older sakexes: 20
+//sakexe 0614: 24
+//sakexe 0628 (and later): 100
+pet_hair_style: 100
+
+// Visible area size (how many squares away from a player can they see)
+area_size: 14
+
+// Maximum user LV to send to client
+//   (Default is 99..  Never go above 127)
+//
+// this is only useful if you have adjusted your client
+// to expect levels higher then 99
+max_lv: 99
+
+// Level required to display an aura.
+// NOTE: This assumes that sending max_lv to the client will display the aura. aura_lv must not be less than max_lv.
+// Example: If max_lv is 99, and aura_lv is 150, characters with level 99~149 will be sent as being all level 98,
+// and only characters with level 150 or more will be reported as having level 99.
+aura_lv: 99
+
+// Will tuxedo and wedding dresses be shown when worn? (Note 1)
+wedding_modifydisplay: no
+
+// Save Clothes color. (This will degrade performance) (Note 1)
+save_clothcolor: yes
+
+// Do not display cloth colors for the wedding class?
+// 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?
+// Set this to yes if your cloth palettes pack doesn't has Xmas palettes (or has less than the other jobs)
+xmas_ignorepalette: no
+
+// Set this to 1 if your clients have langtype problems and can't display motd properly
+motd_type: 0
+
+// Show eAthena version to users when the login?
+display_version: yes
+
+// 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.
+display_hallucination: yes
+
diff --git a/conf-tmpl/battle/drops.conf b/conf-tmpl/battle/drops.conf
index 83d58af47..4399fc706 100644
--- a/conf-tmpl/battle/drops.conf
+++ b/conf-tmpl/battle/drops.conf
@@ -1,156 +1,156 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// 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) 

-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)

-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)

-// (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)

-// (Takes effect after the item_second_get_time elapses)

-item_third_get_time: 1000

-

-// Grace time during which only the person who did the most damage to a MVP can get the item? (in milliseconds) (Note 3)

-mvp_item_first_get_time: 10000

-

-// Grace time during which only the first and second person who did the most damage to a MVP can get the item? (in milliseconds) (Note 3)

-// (Takes effect after mvp_item_first_get_time elapses)

-mvp_item_second_get_time: 10000

-

-// Grace time during which only the first, second and third person who did the most damage to a MVP can get the item  (Note 3)

-// (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)

-

-// The rate the common items are dropped (Items that are in the ETC tab, besides card)

-item_rate_common: 100

-item_rate_common_boss: 100

-item_drop_common_min: 1

-item_drop_common_max: 10000

-

-// The rate healing items are dropped (items that restore HP or SP)

-item_rate_heal: 100

-item_rate_heal_boss: 100

-item_drop_heal_min: 1

-item_drop_heal_max: 10000

-

-// The rate at which usable items (in the item tab) other then healing items are dropped.

-item_rate_use: 100

-item_rate_use_boss: 100

-item_drop_use_min: 1

-item_drop_use_max: 10000

-

-// The rate at which equipment is dropped.

-item_rate_equip: 100

-item_rate_equip_boss: 100

-item_drop_equip_min: 1

-item_drop_equip_max: 10000

-

-// The rate at which cards are dropped

-item_rate_card: 100

-item_rate_card_boss: 100

-item_drop_card_min: 1

-item_drop_card_max: 10000

-

-// The rate adjustment for the MVP items that the MVP gets directly in their inventory

-item_rate_mvp: 100

-item_drop_mvp_min: 1

-item_drop_mvp_max: 10000

-

-// The rate adjustment for card-granted item drops.

-item_rate_adddrop: 100

-item_drop_add_min: 1

-item_drop_add_max: 10000

-

-// Rate adjustment for Treasure Box drops (these override all other modifiers)

-item_rate_treasure: 100

-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 

-// 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:

-// Y: Original Drop Rate

-// X: Rate drop modifier (eg: item_rate_equip)

-//  X\Y | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00

-// -----+---------------------------------------------------------------

-//   50 | 0.01 0.01  0.03  0.06  0.11  0.30  0.62  1.30  3.49  7.42 15.92

-//  100 | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00

-//  200 | 0.02 0.04  0.09  0.18  0.35  0.84  1.61  3.07  7.16 13.48 25.13

-//  500 | 0.05 0.09  0.22  0.40  0.74  1.65  3.00  5.40 11.51 20.00 33.98

-// 1000 | 0.10 0.18  0.40  0.73  1.30  2.76  4.82  8.28 16.47 26.96 42.69

-// 2000 | 0.20 0.36  0.76  1.32  2.28  4.62  7.73 12.70 23.58 36.33 53.64

-// 5000 | 0.50 0.86  1.73  2.91  4.81  9.11 14.45 22.34 37.90 53.91 72.53

-//10000 | 1.00 1.67  3.25  5.28  8.44 15.24 23.19 34.26 54.57 72.67 91.13

-//20000 | 2.00 3.26  6.09  9.59 14.83 25.49 37.21 52.55 77.70 97.95  100%

-//50000 | 5.00 7.87 13.98 21.12 31.23 50.31 69.56 92.48  100%  100%  100%

-item_logarithmic_drops: no

-

-// Can the monster's drop rate become 0? (Note 1)

-// Defualt: no (as in official servers).

-drop_rate0item: no

-

-// drop_by_luk: Leave at 0 to use normal drop system.  Anything higher than 0 will allow luk to affect drop rates. Note that both methods can be combined (the old method is applied first).

-

-//Old System. Your luk affects drop rates on an absolute basis. Setting to 100 means each luk adds 0.01% chance to find items (regardless of item's base drop rate).

-drops_by_luk: 0

-

-//Alternate System: Your luk affects the drop rates on a relative basis.

-//Setting to 100 means each luk adds 1% chance to find items

-//(So at 100 luk, everything will have double chance of dropping).

-drops_by_luk2: 0

-

-// The rate of monsters dropping ores by the skill Ore Discovery (Default is 100)

-finding_ore_rate: 100

-

-// Whether or not Marine Spheres and Floras summoned by Alchemist will drop items (they never give exp)? (Note 1)

-// This setting has three available values:

-// - 0/no: Nothing drops.

-// - 1/yes: Only marine spheres drop items.

-// - 2: All alchemist summons drop items.

-alchemist_summon_reward: 1

-

-// Make broadcast ** Player1 won Pupa's Pupa Card (chance 0.01%) ***

-// Note: It also announces STEAL skill usage with rare items

-// 0 = don't show announces at all

-// 1 = show announces for 0.01% drop chance items

-// 333 = show announces for 3.33% or lower drop chance items

-// 10000 = show announces for all items

-rare_drop_announce: 0

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// 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) 
+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)
+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)
+// (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)
+// (Takes effect after the item_second_get_time elapses)
+item_third_get_time: 1000
+
+// Grace time during which only the person who did the most damage to a MVP can get the item? (in milliseconds) (Note 3)
+mvp_item_first_get_time: 10000
+
+// Grace time during which only the first and second person who did the most damage to a MVP can get the item? (in milliseconds) (Note 3)
+// (Takes effect after mvp_item_first_get_time elapses)
+mvp_item_second_get_time: 10000
+
+// Grace time during which only the first, second and third person who did the most damage to a MVP can get the item  (Note 3)
+// (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)
+
+// The rate the common items are dropped (Items that are in the ETC tab, besides card)
+item_rate_common: 100
+item_rate_common_boss: 100
+item_drop_common_min: 1
+item_drop_common_max: 10000
+
+// The rate healing items are dropped (items that restore HP or SP)
+item_rate_heal: 100
+item_rate_heal_boss: 100
+item_drop_heal_min: 1
+item_drop_heal_max: 10000
+
+// The rate at which usable items (in the item tab) other then healing items are dropped.
+item_rate_use: 100
+item_rate_use_boss: 100
+item_drop_use_min: 1
+item_drop_use_max: 10000
+
+// The rate at which equipment is dropped.
+item_rate_equip: 100
+item_rate_equip_boss: 100
+item_drop_equip_min: 1
+item_drop_equip_max: 10000
+
+// The rate at which cards are dropped
+item_rate_card: 100
+item_rate_card_boss: 100
+item_drop_card_min: 1
+item_drop_card_max: 10000
+
+// The rate adjustment for the MVP items that the MVP gets directly in their inventory
+item_rate_mvp: 100
+item_drop_mvp_min: 1
+item_drop_mvp_max: 10000
+
+// The rate adjustment for card-granted item drops.
+item_rate_adddrop: 100
+item_drop_add_min: 1
+item_drop_add_max: 10000
+
+// Rate adjustment for Treasure Box drops (these override all other modifiers)
+item_rate_treasure: 100
+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 
+// 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:
+// Y: Original Drop Rate
+// X: Rate drop modifier (eg: item_rate_equip)
+//  X\Y | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00
+// -----+---------------------------------------------------------------
+//   50 | 0.01 0.01  0.03  0.06  0.11  0.30  0.62  1.30  3.49  7.42 15.92
+//  100 | 0.01 0.02  0.05  0.10  0.20  0.50  1.00  2.00  5.00 10.00 20.00
+//  200 | 0.02 0.04  0.09  0.18  0.35  0.84  1.61  3.07  7.16 13.48 25.13
+//  500 | 0.05 0.09  0.22  0.40  0.74  1.65  3.00  5.40 11.51 20.00 33.98
+// 1000 | 0.10 0.18  0.40  0.73  1.30  2.76  4.82  8.28 16.47 26.96 42.69
+// 2000 | 0.20 0.36  0.76  1.32  2.28  4.62  7.73 12.70 23.58 36.33 53.64
+// 5000 | 0.50 0.86  1.73  2.91  4.81  9.11 14.45 22.34 37.90 53.91 72.53
+//10000 | 1.00 1.67  3.25  5.28  8.44 15.24 23.19 34.26 54.57 72.67 91.13
+//20000 | 2.00 3.26  6.09  9.59 14.83 25.49 37.21 52.55 77.70 97.95  100%
+//50000 | 5.00 7.87 13.98 21.12 31.23 50.31 69.56 92.48  100%  100%  100%
+item_logarithmic_drops: no
+
+// Can the monster's drop rate become 0? (Note 1)
+// Defualt: no (as in official servers).
+drop_rate0item: no
+
+// drop_by_luk: Leave at 0 to use normal drop system.  Anything higher than 0 will allow luk to affect drop rates. Note that both methods can be combined (the old method is applied first).
+
+//Old System. Your luk affects drop rates on an absolute basis. Setting to 100 means each luk adds 0.01% chance to find items (regardless of item's base drop rate).
+drops_by_luk: 0
+
+//Alternate System: Your luk affects the drop rates on a relative basis.
+//Setting to 100 means each luk adds 1% chance to find items
+//(So at 100 luk, everything will have double chance of dropping).
+drops_by_luk2: 0
+
+// The rate of monsters dropping ores by the skill Ore Discovery (Default is 100)
+finding_ore_rate: 100
+
+// Whether or not Marine Spheres and Floras summoned by Alchemist will drop items (they never give exp)? (Note 1)
+// This setting has three available values:
+// - 0/no: Nothing drops.
+// - 1/yes: Only marine spheres drop items.
+// - 2: All alchemist summons drop items.
+alchemist_summon_reward: 1
+
+// Make broadcast ** Player1 won Pupa's Pupa Card (chance 0.01%) ***
+// Note: It also announces STEAL skill usage with rare items
+// 0 = don't show announces at all
+// 1 = show announces for 0.01% drop chance items
+// 333 = show announces for 3.33% or lower drop chance items
+// 10000 = show announces for all items
+rare_drop_announce: 0
diff --git a/conf-tmpl/battle/exp.conf b/conf-tmpl/battle/exp.conf
index cdbebe3ec..01d68ab4c 100644
--- a/conf-tmpl/battle/exp.conf
+++ b/conf-tmpl/battle/exp.conf
@@ -1,108 +1,108 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//Note 4: The max level of classes is specified in the exp table.

-// See files db/exp.txt and db/exp2.txt to change them.

-//--------------------------------------------------------------

-

-// Rate at which exp. is given. (Note 2) (Note 3)

-base_exp_rate: 100

-

-// Rate at which job exp. is given. (Note 2) (Note 3)

-job_exp_rate: 100

-

-// Turn this on to allow a player to level up more than once from a kill. (Note 1)

-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, 

-// 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 - jAthena's (uses damage given / total damage as damage ratio)

-//1 - eAthena's (uses damage given / max_hp as damage ratio)

-//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

-

-//Experience increase per attacker. That is, every additional attacker to the

-// monster makes it give this much more experience

-// (eg: 5 people attack with 25 here, +25*4% -> +100% exp)

-exp_bonus_attacker: 25

-

-//Max number of attackers at which exp bonus is capped

-// (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_exp_rate: 100

-

-// The rate of job exp. from using Heal skill (100 is the same as the heal amount, 200 is double.

-// The balance of the exp. rate is best used with 5 to 10)

-heal_exp: 0

-

-// The rate of exp. that is gained by the process of resurrection, a unit is 0.01%.

-// Experience calculations for the experience value * level difference of the person revived / 100 * resurrection_exp/10000 which the revived player has can be got.

-resurrection_exp: 0

-

-// The rate of job exp. when using discount and overcharge on an NPC

-// (in 0.01% increments - 100 is 1%, 10000 is normal, 20000 is double.)

-// The way it is calculated is (money recieved * skill lv) * shop_exp / 10000.

-shop_exp: 0

-

-// PVP exp.  Do players get exp in PvP maps

-// (Note: NOT exp from players, but from normal leveling)

-pvp_exp: yes

-

-// When a player dies, how should we penalize them?

-// 0 = No penalty.

-// 1 = Lose % of current level when killed.

-// 2 = Lose % of total experience when killed.

-death_penalty_type: 1

-

-// Base exp. penalty rate (Each 100 is 1% of their exp)

-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)

-// NOTE: It is a percentage of their zeny, so 100 = 1%

-zeny_penalty: 0

-

-// Will display experience gained from killing a monster. (Note 1)

-disp_experience: no

-

-// Will display zeny earned (from mobs, trades, etc) (Note 1)

-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 

-// through external means (ie: stat point buyers/sellers)

-use_statpoint_table: yes

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//Note 4: The max level of classes is specified in the exp table.
+// See files db/exp.txt and db/exp2.txt to change them.
+//--------------------------------------------------------------
+
+// Rate at which exp. is given. (Note 2) (Note 3)
+base_exp_rate: 100
+
+// Rate at which job exp. is given. (Note 2) (Note 3)
+job_exp_rate: 100
+
+// Turn this on to allow a player to level up more than once from a kill. (Note 1)
+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, 
+// 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 - jAthena's (uses damage given / total damage as damage ratio)
+//1 - eAthena's (uses damage given / max_hp as damage ratio)
+//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
+
+//Experience increase per attacker. That is, every additional attacker to the
+// monster makes it give this much more experience
+// (eg: 5 people attack with 25 here, +25*4% -> +100% exp)
+exp_bonus_attacker: 25
+
+//Max number of attackers at which exp bonus is capped
+// (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_exp_rate: 100
+
+// The rate of job exp. from using Heal skill (100 is the same as the heal amount, 200 is double.
+// The balance of the exp. rate is best used with 5 to 10)
+heal_exp: 0
+
+// The rate of exp. that is gained by the process of resurrection, a unit is 0.01%.
+// Experience calculations for the experience value * level difference of the person revived / 100 * resurrection_exp/10000 which the revived player has can be got.
+resurrection_exp: 0
+
+// The rate of job exp. when using discount and overcharge on an NPC
+// (in 0.01% increments - 100 is 1%, 10000 is normal, 20000 is double.)
+// The way it is calculated is (money recieved * skill lv) * shop_exp / 10000.
+shop_exp: 0
+
+// PVP exp.  Do players get exp in PvP maps
+// (Note: NOT exp from players, but from normal leveling)
+pvp_exp: yes
+
+// When a player dies, how should we penalize them?
+// 0 = No penalty.
+// 1 = Lose % of current level when killed.
+// 2 = Lose % of total experience when killed.
+death_penalty_type: 1
+
+// Base exp. penalty rate (Each 100 is 1% of their exp)
+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)
+// NOTE: It is a percentage of their zeny, so 100 = 1%
+zeny_penalty: 0
+
+// Will display experience gained from killing a monster. (Note 1)
+disp_experience: no
+
+// Will display zeny earned (from mobs, trades, etc) (Note 1)
+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 
+// through external means (ie: stat point buyers/sellers)
+use_statpoint_table: yes
diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index 6cc8a3d93..03040032a 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -1,107 +1,107 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// The maximum quantity of monsters that can be summoned per GM command (0 denotes an unlimited quantity)

-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 

-// current map server.

-partial_name_scan: yes

-

-// [GM] Can use all skills? (No or mimimum GM level)

-gm_all_skill: no

-

-// [GM] Can equip anything? (No or minimum GM level, can cause client errors.)

-gm_all_equipment: no

-

-// [GM] Can use skills without meeting the required conditions (no 

-//   blue gems? no or minimum GM level to bypass requirements.

-gm_skill_unconditional: no

-

-// [GM] Can join a password protected chat? (No or mimimum GM level)

-gm_join_chat: no

-

-// [GM] Can't be kicked from a chat? (No or mimimum GM level)

-gm_kick_chat: no

-

-// (@) GM Commands available only to GM's? (Note 1)

-// set to 'No', Normal players (gm level 0) can use GM commands _IF_ you set the command level to 0.

-// set to 'Yes', Normal players (gm level 0) can never use a GM command even if you set the command level to 0.

-atcommand_gm_only: no

-

-// Is the character of a GM account set as the object of a display by @ command etc. or not?

-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

-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.

-// Values are from 0 to 100.

-// 100: disable information

-// 0: send to any people, including normal players

-// default: 60, according to GM definition in atcommand_athena.conf

-hack_info_GM_level: 60

-

-// Set here the minimum GM level to disable the nowarp (from) and nowarpto (to) flags.

-// This option is mainly used in AT_commands (@memo, @warp, @charwarp, @go, etc...). All GM commands used to move or set a new map check nowarp and nowarpto flags.

-// 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.

-// 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

-

-// Minimum GM level to see the hp of every player? (Default: 60)

-// no/0 can be used to disable it.

-disp_hpmeter: 0

-

-// At what GM level can users see Account/Character IDs in the @who command?

-who_display_aid: 40

-

-// Players Titles (check msg_athena.conf for title strings)

-// You may assign different titles for your Players and GMs

-title_lvl1: 1

-title_lvl2: 10

-title_lvl3: 20

-title_lvl4: 40

-title_lvl5: 50

-title_lvl6: 60

-title_lvl7: 80

-title_lvl8: 99

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// The maximum quantity of monsters that can be summoned per GM command (0 denotes an unlimited quantity)
+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 
+// current map server.
+partial_name_scan: yes
+
+// [GM] Can use all skills? (No or mimimum GM level)
+gm_all_skill: no
+
+// [GM] Can equip anything? (No or minimum GM level, can cause client errors.)
+gm_all_equipment: no
+
+// [GM] Can use skills without meeting the required conditions (no 
+//   blue gems? no or minimum GM level to bypass requirements.
+gm_skill_unconditional: no
+
+// [GM] Can join a password protected chat? (No or mimimum GM level)
+gm_join_chat: no
+
+// [GM] Can't be kicked from a chat? (No or mimimum GM level)
+gm_kick_chat: no
+
+// (@) GM Commands available only to GM's? (Note 1)
+// set to 'No', Normal players (gm level 0) can use GM commands _IF_ you set the command level to 0.
+// set to 'Yes', Normal players (gm level 0) can never use a GM command even if you set the command level to 0.
+atcommand_gm_only: no
+
+// Is the character of a GM account set as the object of a display by @ command etc. or not?
+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
+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.
+// Values are from 0 to 100.
+// 100: disable information
+// 0: send to any people, including normal players
+// default: 60, according to GM definition in atcommand_athena.conf
+hack_info_GM_level: 60
+
+// Set here the minimum GM level to disable the nowarp (from) and nowarpto (to) flags.
+// This option is mainly used in AT_commands (@memo, @warp, @charwarp, @go, etc...). All GM commands used to move or set a new map check nowarp and nowarpto flags.
+// 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.
+// 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
+
+// Minimum GM level to see the hp of every player? (Default: 60)
+// no/0 can be used to disable it.
+disp_hpmeter: 0
+
+// At what GM level can users see Account/Character IDs in the @who command?
+who_display_aid: 40
+
+// Players Titles (check msg_athena.conf for title strings)
+// You may assign different titles for your Players and GMs
+title_lvl1: 1
+title_lvl2: 10
+title_lvl3: 20
+title_lvl4: 40
+title_lvl5: 50
+title_lvl6: 60
+title_lvl7: 80
+title_lvl8: 99
diff --git a/conf-tmpl/battle/guild.conf b/conf-tmpl/battle/guild.conf
index 0d2e5d079..405df0cd7 100644
--- a/conf-tmpl/battle/guild.conf
+++ b/conf-tmpl/battle/guild.conf
@@ -1,70 +1,70 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// When making a guild, an Emperium is consumed? (Note 1)

-guild_emperium_check: yes

-

-// Maximum tax limit on a guild member.

-guild_exp_limit: 50

-

-// Maximum castles one guild can own (0 - unlimited)

-guild_max_castles: 0

-

-// 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

-

-// When the emperium is broken with WoE mode on, How Long Before The 

-// Declaration Of Castle Owner and Removal of Monsters/Players from 

-// Castle. (in milliseconds) (Note 3)

-gvg_eliminate_time: 7000

-

-// Can the 'Glory of Guild' skill be learnt in the Guild window,

-// and does changing emblems require it? (Note 1)

-// P.S: This new guild skill only appears for 2004-10-25aSakexe or newer

-// P.S 2: This skill is not implemented on official servers, so its only optional

-require_glory_guild: no

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// When making a guild, an Emperium is consumed? (Note 1)
+guild_emperium_check: yes
+
+// Maximum tax limit on a guild member.
+guild_exp_limit: 50
+
+// Maximum castles one guild can own (0 - unlimited)
+guild_max_castles: 0
+
+// 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
+
+// When the emperium is broken with WoE mode on, How Long Before The 
+// Declaration Of Castle Owner and Removal of Monsters/Players from 
+// Castle. (in milliseconds) (Note 3)
+gvg_eliminate_time: 7000
+
+// Can the 'Glory of Guild' skill be learnt in the Guild window,
+// and does changing emblems require it? (Note 1)
+// P.S: This new guild skill only appears for 2004-10-25aSakexe or newer
+// P.S 2: This skill is not implemented on official servers, so its only optional
+require_glory_guild: no
diff --git a/conf-tmpl/battle/homunc.conf b/conf-tmpl/battle/homunc.conf
index c44fbc7bc..773d37471 100644
--- a/conf-tmpl/battle/homunc.conf
+++ b/conf-tmpl/battle/homunc.conf
@@ -1,37 +1,37 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// The rate a homunculus will get friendly by feeding it. (Note 2)

-homunculus_friendly_rate: 100

-

-// Intimacy needed to use Evolved Vanilmirth's Bio Explosion

-hvan_explosion_intimate: 45000

-

-// Show stat growth to the owner when an Homunculus levels up

-homunculus_show_growth: 0

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// The rate a homunculus will get friendly by feeding it. (Note 2)
+homunculus_friendly_rate: 100
+
+// Intimacy needed to use Evolved Vanilmirth's Bio Explosion
+hvan_explosion_intimate: 45000
+
+// Show stat growth to the owner when an Homunculus levels up
+homunculus_show_growth: 0
diff --git a/conf-tmpl/battle/items.conf b/conf-tmpl/battle/items.conf
index 533cac81d..98f1a7034 100644
--- a/conf-tmpl/battle/items.conf
+++ b/conf-tmpl/battle/items.conf
@@ -1,87 +1,87 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// The highest value at which an item can be sold via the merchant vend skill. (in zeny) (Note 3)

-vending_max_value: 1000000000

-

-// Show the buyer's name when successfully vended an item

-buyer_name: yes

-

-// Forging success rate. (Note 2)

-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 1)

-produce_item_name_input: yes

-

-// Do produced potions have the maker's name on them? (Note 1)

-produce_potion_name_input: yes

-

-// Do crafted arrows have the maker's name on them? (Note 1)

-making_arrow_name_input: no

-

-// Do created holy waters have the maker's name on it? (Note 1)

-holywater_name_input: no

-

-// Do created poison bottles have the maker's name on it? (Note 1)

-cdp_name_input: no

-

-// Is a monster summoned via dead branch aggressive? (Note 1)

-dead_branch_active: yes

-

-// Are summoned monsters level greater then your base level? (dead branches) (Note 1)

-random_monster_checklv: yes

-

-// Can any player equip any item regardless of the gender restrictions

-//	NOTE: Wedding Rings and Whips/Musical Instruments will check gender regardless of setting.

-ignore_items_gender: yes

-

-// Item check? (Note 1)

-// 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 

-// specify it as unavailable in db/item_avail.txt

-item_check: no

-

-// How much time must pass between item uses?

-// Only affects the delay between using items, prevents healing item abuse. Recommended ~500 ms

-// On officials this is 0, but it's set to 100ms as a measure against bots/macros.

-item_use_interval: 100

-

-//Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).

-//For example, if left at 50. An item can give bNoMagicDamage,40;

-// which reduces magic damage by 40%, but does not blocks status changes.

-gtb_sc_immunity: 50

-

-// Enable autospell card effects to stack?

-// NOTE: Different cards that grant the same skill will both 

-// always work independently of each other regardless of setting.

-autospell_stacking: no

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// The highest value at which an item can be sold via the merchant vend skill. (in zeny) (Note 3)
+vending_max_value: 1000000000
+
+// Show the buyer's name when successfully vended an item
+buyer_name: yes
+
+// Forging success rate. (Note 2)
+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 1)
+produce_item_name_input: yes
+
+// Do produced potions have the maker's name on them? (Note 1)
+produce_potion_name_input: yes
+
+// Do crafted arrows have the maker's name on them? (Note 1)
+making_arrow_name_input: no
+
+// Do created holy waters have the maker's name on it? (Note 1)
+holywater_name_input: no
+
+// Do created poison bottles have the maker's name on it? (Note 1)
+cdp_name_input: no
+
+// Is a monster summoned via dead branch aggressive? (Note 1)
+dead_branch_active: yes
+
+// Are summoned monsters level greater then your base level? (dead branches) (Note 1)
+random_monster_checklv: yes
+
+// Can any player equip any item regardless of the gender restrictions
+//	NOTE: Wedding Rings and Whips/Musical Instruments will check gender regardless of setting.
+ignore_items_gender: yes
+
+// Item check? (Note 1)
+// 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 
+// specify it as unavailable in db/item_avail.txt
+item_check: no
+
+// How much time must pass between item uses?
+// Only affects the delay between using items, prevents healing item abuse. Recommended ~500 ms
+// On officials this is 0, but it's set to 100ms as a measure against bots/macros.
+item_use_interval: 100
+
+//Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).
+//For example, if left at 50. An item can give bNoMagicDamage,40;
+// which reduces magic damage by 40%, but does not blocks status changes.
+gtb_sc_immunity: 50
+
+// Enable autospell card effects to stack?
+// 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-tmpl/battle/misc.conf b/conf-tmpl/battle/misc.conf
index 53d800f1c..cddeb0d8b 100644
--- a/conf-tmpl/battle/misc.conf
+++ b/conf-tmpl/battle/misc.conf
@@ -1,142 +1,142 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-//Note 4: Use bitmask values to specify who is affected 

-//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// 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

-

-//Manner/karma system configuration. Specifies how does negative manner

-//(red no chat bubble) affects players (add as needed):

-// 0: No penalties.

-// 1: Disables chatting (includes whispers, party/guild msgs, etc)

-// 2: Disables skill usage

-// 4: Disables commands usage

-// 8: Disables item usage/picking/dropping

-//16: Disables room creation (chatrooms and vending shops)

-manner_system: 15

-

-// For PK Server Mode. Change this to define the minimum level players can start PK-ing

-pk_min_level: 55

-

-// For PK Server Mode. It specifies the maximum level difference between

-// 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/errors in console? (for debug only) (default: off) (Note 4)

-skill_log: 0

-

-// Display battle log? (for debug only) (default: off) (Note 1)

-battle_log: off

-

-// Display save log? (for debug only) (default: off) (Note 1)

-save_log: off

-

-// Display errors? (for debug only) (default: off) (Note 1)

-error_log: on

-

-// Display other stuff? (for debug only) (default: off) (Note 1)

-etc_log: off

-

-// You can turn the following 5 settings off if you don't need them,

-// or if you're experiencing problems with GRF loading

-//

-// Override item names from GRF file? (Note 1)

-item_name_override_grffile: no

-//

-// Override item equip positions from GRF file? (Note 1)

-item_equip_override_grffile: no

-//

-// Override item slots from GRF file? (Note 1)

-item_slots_override_grffile: no

-//

-// Override 'indoors' mapflags from GRF file? (Note 1)

-indoors_override_grffile: no

-//

-// Override SP used per level from GRF file? (Note 1)

-// Turn this off if you have a customised skill_require_db.txt

-skill_sp_override_grffile: no

-//

-// Read card illustrations from GRF file? (Note 1)

-cardillust_read_grffile: yes

-

-// 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 

-// top of on-touch npcs (which can lead to infinite loopback warping situations)

-warp_point_debug: no

-

-// Choose if server begin with night (yes) or day (no)

-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)

-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)

-night_duration: 0

-

-// Using duel on pvp-maps

-duel_allow_pvp: no

-

-// Using duel on gvg-maps

-duel_allow_gvg: no

-

-// Allow using teleport/warp when dueling

-duel_allow_teleport: no

-

-// Autoleave duel when die

-duel_autoleave_when_die: yes

-

-// Delay between using @duel in minutes

-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.

-// NOTE: For this setting to make effect you have to use a server compiled with 

-// Cell Stack Limit support (see src/map/map.h)

-cell_stack_limit: 1

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+//Note 4: Use bitmask values to specify who is affected 
+//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// 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
+
+//Manner/karma system configuration. Specifies how does negative manner
+//(red no chat bubble) affects players (add as needed):
+// 0: No penalties.
+// 1: Disables chatting (includes whispers, party/guild msgs, etc)
+// 2: Disables skill usage
+// 4: Disables commands usage
+// 8: Disables item usage/picking/dropping
+//16: Disables room creation (chatrooms and vending shops)
+manner_system: 15
+
+// For PK Server Mode. Change this to define the minimum level players can start PK-ing
+pk_min_level: 55
+
+// For PK Server Mode. It specifies the maximum level difference between
+// 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/errors in console? (for debug only) (default: off) (Note 4)
+skill_log: 0
+
+// Display battle log? (for debug only) (default: off) (Note 1)
+battle_log: off
+
+// Display save log? (for debug only) (default: off) (Note 1)
+save_log: off
+
+// Display errors? (for debug only) (default: off) (Note 1)
+error_log: on
+
+// Display other stuff? (for debug only) (default: off) (Note 1)
+etc_log: off
+
+// You can turn the following 5 settings off if you don't need them,
+// or if you're experiencing problems with GRF loading
+//
+// Override item names from GRF file? (Note 1)
+item_name_override_grffile: no
+//
+// Override item equip positions from GRF file? (Note 1)
+item_equip_override_grffile: no
+//
+// Override item slots from GRF file? (Note 1)
+item_slots_override_grffile: no
+//
+// Override 'indoors' mapflags from GRF file? (Note 1)
+indoors_override_grffile: no
+//
+// Override SP used per level from GRF file? (Note 1)
+// Turn this off if you have a customised skill_require_db.txt
+skill_sp_override_grffile: no
+//
+// Read card illustrations from GRF file? (Note 1)
+cardillust_read_grffile: yes
+
+// 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 
+// top of on-touch npcs (which can lead to infinite loopback warping situations)
+warp_point_debug: no
+
+// Choose if server begin with night (yes) or day (no)
+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)
+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)
+night_duration: 0
+
+// Using duel on pvp-maps
+duel_allow_pvp: no
+
+// Using duel on gvg-maps
+duel_allow_gvg: no
+
+// Allow using teleport/warp when dueling
+duel_allow_teleport: no
+
+// Autoleave duel when die
+duel_autoleave_when_die: yes
+
+// Delay between using @duel in minutes
+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.
+// NOTE: For this setting to make effect you have to use a server compiled with 
+// Cell Stack Limit support (see src/map/map.h)
+cell_stack_limit: 1
diff --git a/conf-tmpl/battle/monster.conf b/conf-tmpl/battle/monster.conf
index 7549ea3e8..1ea2c822e 100644
--- a/conf-tmpl/battle/monster.conf
+++ b/conf-tmpl/battle/monster.conf
@@ -1,209 +1,209 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// [MVP] Summoned monsters HP rate, that is, monsters summoned by an MVP will have this much HP. (Note 2)

-mvp_hp_rate: 100

-

-// The HP rate of normal monsters (that is monsters that are not MVP's) (Note 2)

-monster_hp_rate: 100

-

-// The maximum attack speed of a monster

-monster_max_aspd: 199

-

-// Defines various mob AI related settings. The mask bits are 

-// (add to include multiple settings):

-// 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)

-// 0x002: Makes mob use their "rude attack" skill (usually warping away) if they

-//        are attacked and they can't attack back regardless of how they were

-//        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 

-//        ranged attackers. This flag also overrides the 'provoke' target.

-// 0x008: If set, when a mob loses track of their target, they stop walking

-//        inmediately. Otherwise, they continue to their last target tile. When

-//        set mobs also 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 

-//        have players on them, instead of only for mobs who are in the vecinity

-//        of players.

-// 0x040: When set, when the mob's target changes map, the mob will walk towards

-//        any npc-warps in it's sight of view (use with mob_npc_warp below)

-// 0x080: When set, aggressive mobs will give the same priority to Homuns and

-//        players and will go after the closest target instead of always picking

-//        the homunculus

-// 0x100: When set, a mob will pick a random skill from it's list and start from

-//        that instead of checking skills in orders (when unset, if a mob has too

-//        many skills, the ones near the end will rarely get selected)

-// 0x200: When set, a mob's skill re-use delay will be applied to all entries of

-//        the same skill, instead of only that particular entry (eg: Mob has heal

-//        on six lines for different conditions, when set, whenever one of the six 

-//        trigger, all of them will share the delay)

-// Example: 0x140 -> Chase players through warps + use skills in random order.

-monster_ai: 0

-

-// Should mobs be able to be warped (add as needed)?

-// 0: Disable.

-// 1: Enable mob-warping when standing on NPC-warps

-// 2: Enable mob-warping when standing on Priest Warp Portals

-// 4: Disable warping when the target map is a 'nobranch' map.

-mob_warp: 0

-

-// Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)

-view_range_rate: 100

-

-// Chase Range is the base minimum-chase that a mob gives before giving up

-// (as long as the target is outside their field of view). This is the range3

-// column in the mob_db. (Note 2)

-chase_range_rate: 100

-

-// Allow monsters to be aggresive and attack first? (Note 1)

-monster_active_enable: yes

-

-// Should the mob_db names override the mob names specified in the spawn files?

-// 0: No

-// 1: always use the mob_db Name column (english mob name)

-// 2: always use the mob_db JName column (original Kro mob name)

-override_mob_names: 0

-

-// Monster damage delay rate (Note 1)

-// Setting to no/0 is like they always have endure.

-monster_damage_delay_rate: 100

-

-// Looting monster actions.

-// 0 = Monster will consume the item.

-// 1 = Monster will not consume the item.

-monster_loot_type: 0

-

-// Chance of mob casting a skill (Note 2)

-// Higher rates lead to 100% mob skill usage with no/few normal attacks.

-// Set to 0 to disable mob skills.

-mob_skill_rate: 100

-

-// Mob skill delay adjust (Note 2)

-// After a mob has casted a skill, there is a delay before being able to

-// re-cast it. Note that skills with a delay of 0 can't be affected by this

-// setting.

-mob_skill_delay: 100

-

-// Rate of monsters on a map, 200 would be twice as many as normal. (Note 2)

-mob_count_rate: 100

-

-// Respawn rate of monsters on a map. 50 would make mobs respawn twice as fast (half delay time) (Note 2)

-//Note: This does not affects mobs with inmediate respawn (most normal mobs)

-mob_spawn_delay: 100

-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 

-// 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.

-// NOTE: This has no effect on mobs that always spawn on the very same cell

-// (like ant eggs) except if you set it to the max.

-no_spawn_on_player: 0

-

-// Should spawn coordinates in the mob-spawn files be ignored? (Note 1)

-// If set to yes, all monsters will have a random respawn spot across the whole

-// map regardless of what the mob-spawn file says.

-force_random_spawn: no

-

-// Do summon slaves inherit the passive/aggressive traits of their master?

-// 0: No, retain original mode.

-// 1: Slaves are always aggressive.

-// 2: Slaves are always passive.

-// 3: Same as master's aggressive/passive state.

-slaves_inherit_mode: 2

-

-// Do summon slaves have the same walking speed as their master?

-// NOTE: The default is 3 for official servers.

-// 0: Never.

-// 1: If the master can walk

-// 2: If the master can't walk (even motionless mobs have a speed

-//    entry in their mob_db)

-// 3: Always

-slaves_inherit_speed: 3

-

-// Will summoned monsters (alchemists, or @summon'ed monsters) attack cause a

-// chance of triggering the master's autospell cards? (Note 1)

-summons_trigger_autospells: yes

-

-// When a mob is attacked by another monster, will the mob retaliate against the master of said mob instead of the mob itself?

-// NOTE: Summoned mobs are both those acquired via @summon and summoned by Alchemists

-retaliate_to_master: yes

-

-// Whether mobs should change target temporarily when a skill triggers a counter mob skill (Note 1)

-// eg: Mob attacks player B, and player A casts a skill C. If set to yes and the

-// mob has a skill that is triggered by skill C, then A will be the target of

-// the skill, otherwise B will be targetted by the reaction skill.

-mob_changetarget_byskill: no

-

-// If monster's class is changed will it fully recover HP and SP and Ailments? (Note 1)

-monster_class_change_full_recover: no

-

-// Display some mob info next to their name? (add as needed)

-// (does not works on guardian or emperium)

-// 1: Display mob HP (Hp/MaxHp format)

-// 2: Display mob HP (Percent of full life format)

-// 4: Display mob's level

-show_mob_info: 0

-

-// Zeny from mobs

-zeny_from_mobs: no

-

-// Monsters level up (monster will level up each time a player is killed and they will grow stronger)

-// Exp rate is calculated ((monster level-original monster level)*(exp*(mobs_level_up_exp rate/100)))

-// NOTE: Does not apply to WoE Guardians.

-mobs_level_up: no

-mobs_level_up_exp_rate: 1

-

-// Dynamic Mobs Options

-// Use dynamic mobs? (recommended for small-medium sized servers)

-dynamic_mobs: yes

-

-// Remove Mobs even if they are hurt

-mob_remove_damaged: yes

-

-// Delay before removing mobs from empty maps (default 5 min = 300 secs)

-mob_remove_delay: 300000

-

-// Can add a delay before sending monster death packet (time is in milliseconds and default 0 is off)

-// Increasing this can fix the problem with monster sprites still appearing after it died.  Recommended value: 10.

-mob_clear_delay: 0

-

-// 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. 

-mob_npc_event_type: 1

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// [MVP] Summoned monsters HP rate, that is, monsters summoned by an MVP will have this much HP. (Note 2)
+mvp_hp_rate: 100
+
+// The HP rate of normal monsters (that is monsters that are not MVP's) (Note 2)
+monster_hp_rate: 100
+
+// The maximum attack speed of a monster
+monster_max_aspd: 199
+
+// Defines various mob AI related settings. The mask bits are 
+// (add to include multiple settings):
+// 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)
+// 0x002: Makes mob use their "rude attack" skill (usually warping away) if they
+//        are attacked and they can't attack back regardless of how they were
+//        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 
+//        ranged attackers. This flag also overrides the 'provoke' target.
+// 0x008: If set, when a mob loses track of their target, they stop walking
+//        inmediately. Otherwise, they continue to their last target tile. When
+//        set mobs also 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 
+//        have players on them, instead of only for mobs who are in the vecinity
+//        of players.
+// 0x040: When set, when the mob's target changes map, the mob will walk towards
+//        any npc-warps in it's sight of view (use with mob_npc_warp below)
+// 0x080: When set, aggressive mobs will give the same priority to Homuns and
+//        players and will go after the closest target instead of always picking
+//        the homunculus
+// 0x100: When set, a mob will pick a random skill from it's list and start from
+//        that instead of checking skills in orders (when unset, if a mob has too
+//        many skills, the ones near the end will rarely get selected)
+// 0x200: When set, a mob's skill re-use delay will be applied to all entries of
+//        the same skill, instead of only that particular entry (eg: Mob has heal
+//        on six lines for different conditions, when set, whenever one of the six 
+//        trigger, all of them will share the delay)
+// Example: 0x140 -> Chase players through warps + use skills in random order.
+monster_ai: 0
+
+// Should mobs be able to be warped (add as needed)?
+// 0: Disable.
+// 1: Enable mob-warping when standing on NPC-warps
+// 2: Enable mob-warping when standing on Priest Warp Portals
+// 4: Disable warping when the target map is a 'nobranch' map.
+mob_warp: 0
+
+// Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)
+view_range_rate: 100
+
+// Chase Range is the base minimum-chase that a mob gives before giving up
+// (as long as the target is outside their field of view). This is the range3
+// column in the mob_db. (Note 2)
+chase_range_rate: 100
+
+// Allow monsters to be aggresive and attack first? (Note 1)
+monster_active_enable: yes
+
+// Should the mob_db names override the mob names specified in the spawn files?
+// 0: No
+// 1: always use the mob_db Name column (english mob name)
+// 2: always use the mob_db JName column (original Kro mob name)
+override_mob_names: 0
+
+// Monster damage delay rate (Note 1)
+// Setting to no/0 is like they always have endure.
+monster_damage_delay_rate: 100
+
+// Looting monster actions.
+// 0 = Monster will consume the item.
+// 1 = Monster will not consume the item.
+monster_loot_type: 0
+
+// Chance of mob casting a skill (Note 2)
+// Higher rates lead to 100% mob skill usage with no/few normal attacks.
+// Set to 0 to disable mob skills.
+mob_skill_rate: 100
+
+// Mob skill delay adjust (Note 2)
+// After a mob has casted a skill, there is a delay before being able to
+// re-cast it. Note that skills with a delay of 0 can't be affected by this
+// setting.
+mob_skill_delay: 100
+
+// Rate of monsters on a map, 200 would be twice as many as normal. (Note 2)
+mob_count_rate: 100
+
+// Respawn rate of monsters on a map. 50 would make mobs respawn twice as fast (half delay time) (Note 2)
+//Note: This does not affects mobs with inmediate respawn (most normal mobs)
+mob_spawn_delay: 100
+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 
+// 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.
+// NOTE: This has no effect on mobs that always spawn on the very same cell
+// (like ant eggs) except if you set it to the max.
+no_spawn_on_player: 0
+
+// Should spawn coordinates in the mob-spawn files be ignored? (Note 1)
+// If set to yes, all monsters will have a random respawn spot across the whole
+// map regardless of what the mob-spawn file says.
+force_random_spawn: no
+
+// Do summon slaves inherit the passive/aggressive traits of their master?
+// 0: No, retain original mode.
+// 1: Slaves are always aggressive.
+// 2: Slaves are always passive.
+// 3: Same as master's aggressive/passive state.
+slaves_inherit_mode: 2
+
+// Do summon slaves have the same walking speed as their master?
+// NOTE: The default is 3 for official servers.
+// 0: Never.
+// 1: If the master can walk
+// 2: If the master can't walk (even motionless mobs have a speed
+//    entry in their mob_db)
+// 3: Always
+slaves_inherit_speed: 3
+
+// Will summoned monsters (alchemists, or @summon'ed monsters) attack cause a
+// chance of triggering the master's autospell cards? (Note 1)
+summons_trigger_autospells: yes
+
+// When a mob is attacked by another monster, will the mob retaliate against the master of said mob instead of the mob itself?
+// NOTE: Summoned mobs are both those acquired via @summon and summoned by Alchemists
+retaliate_to_master: yes
+
+// Whether mobs should change target temporarily when a skill triggers a counter mob skill (Note 1)
+// eg: Mob attacks player B, and player A casts a skill C. If set to yes and the
+// mob has a skill that is triggered by skill C, then A will be the target of
+// the skill, otherwise B will be targetted by the reaction skill.
+mob_changetarget_byskill: no
+
+// If monster's class is changed will it fully recover HP and SP and Ailments? (Note 1)
+monster_class_change_full_recover: no
+
+// Display some mob info next to their name? (add as needed)
+// (does not works on guardian or emperium)
+// 1: Display mob HP (Hp/MaxHp format)
+// 2: Display mob HP (Percent of full life format)
+// 4: Display mob's level
+show_mob_info: 0
+
+// Zeny from mobs
+zeny_from_mobs: no
+
+// Monsters level up (monster will level up each time a player is killed and they will grow stronger)
+// Exp rate is calculated ((monster level-original monster level)*(exp*(mobs_level_up_exp rate/100)))
+// NOTE: Does not apply to WoE Guardians.
+mobs_level_up: no
+mobs_level_up_exp_rate: 1
+
+// Dynamic Mobs Options
+// Use dynamic mobs? (recommended for small-medium sized servers)
+dynamic_mobs: yes
+
+// Remove Mobs even if they are hurt
+mob_remove_damaged: yes
+
+// Delay before removing mobs from empty maps (default 5 min = 300 secs)
+mob_remove_delay: 300000
+
+// Can add a delay before sending monster death packet (time is in milliseconds and default 0 is off)
+// Increasing this can fix the problem with monster sprites still appearing after it died.  Recommended value: 10.
+mob_clear_delay: 0
+
+// 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. 
+mob_npc_event_type: 1
diff --git a/conf-tmpl/battle/party.conf b/conf-tmpl/battle/party.conf
index 268f8b1d8..5e18867e2 100644
--- a/conf-tmpl/battle/party.conf
+++ b/conf-tmpl/battle/party.conf
@@ -1,65 +1,65 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// If someone loots, show name in party? (Note 1)

-show_steal_in_same_party: no

-

-// Interval before updating the party-member map mini-dots (milliseconds)

-party_update_interval: 1000

-

-// Method used to update party-mate hp-bars:

-// 0: Aegis - bar is updated every time HP changes (bandwidth intensive)

-// 1: eAthena - 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, 

-// tell the picker which party-member received the item? (Note 1)

-show_party_share_picker: no

-

-// 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)

-// 3: 1+2

-party_item_share_type: 0

-

-// Is exp 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.

-// A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.

-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

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// If someone loots, show name in party? (Note 1)
+show_steal_in_same_party: no
+
+// Interval before updating the party-member map mini-dots (milliseconds)
+party_update_interval: 1000
+
+// Method used to update party-mate hp-bars:
+// 0: Aegis - bar is updated every time HP changes (bandwidth intensive)
+// 1: eAthena - 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, 
+// tell the picker which party-member received the item? (Note 1)
+show_party_share_picker: no
+
+// 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)
+// 3: 1+2
+party_item_share_type: 0
+
+// Is exp 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.
+// A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
+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 9d02eb1f1..e201ed840 100644
--- a/conf-tmpl/battle/pet.conf
+++ b/conf-tmpl/battle/pet.conf
@@ -1,92 +1,92 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// Rate for catching pets (Note 2)

-pet_catch_rate: 100

-

-// Can you name a pet more then once? (Note 1)

-pet_rename: no

-

-// The rate a pet will get friendly by feeding it. (Note 2)

-pet_friendly_rate: 100

-

-// The rate at which a pet will become hungry. (Note 2)

-pet_hungry_delay_rate: 100

-

-// If your pet is hungry by how much will the friendlyness decrease by. (Default is 5)

-// Note: The friendlyness is 0-1000 total, at 0 the pet runs away.

-pet_hungry_friendly_decrease: 5

-

-// Does the pet need its equipment before it does its skill? (Note 1)

-pet_equip_required: yes

-

-// When the master attacks a monster, whether or not the pet will also attack. (Note 1)

-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 

-// (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

-

-// Whether or not the pet's will use skills. (Note 1)

-// 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

-

-// Rate at which a pet will support it's owner in battle. (Note 2)

-// Affects pet_attack_support & pet_damage_support.

-pet_support_rate: 100

-

-// Does the pets owner receive exp from the pets damage?

-pet_attack_exp_to_master: no

-

-// The rate exp. is gained from the pet attacking monsters

-pet_attack_exp_rate: 100

-

-// Pet leveling system. Use 0 to disable (default).

-// When enabled, a pet's level is a fixed % of the master's. (Note 2)

-// If 200%, pet has double level, if 50% pet has half your level, etc.

-pet_lv_rate: 0

-

-// When pet leveling is enabled, what is the max stats for pets?

-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 

-// enable pet_str, their max damage is then their base_atk + pet_max_atk2

-pet_max_atk1: 500

-pet_max_atk2: 1000

-

-// Are pets disabled during Guild Wars?

-// If set to yes, pets are automatically returned to egg when entering castles during WoE times

-// and hatching is forbidden within as well.

-pet_disable_in_gvg: no

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// Rate for catching pets (Note 2)
+pet_catch_rate: 100
+
+// Can you name a pet more then once? (Note 1)
+pet_rename: no
+
+// The rate a pet will get friendly by feeding it. (Note 2)
+pet_friendly_rate: 100
+
+// The rate at which a pet will become hungry. (Note 2)
+pet_hungry_delay_rate: 100
+
+// If your pet is hungry by how much will the friendlyness decrease by. (Default is 5)
+// Note: The friendlyness is 0-1000 total, at 0 the pet runs away.
+pet_hungry_friendly_decrease: 5
+
+// Does the pet need its equipment before it does its skill? (Note 1)
+pet_equip_required: yes
+
+// When the master attacks a monster, whether or not the pet will also attack. (Note 1)
+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 
+// (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
+
+// Whether or not the pet's will use skills. (Note 1)
+// 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
+
+// Rate at which a pet will support it's owner in battle. (Note 2)
+// Affects pet_attack_support & pet_damage_support.
+pet_support_rate: 100
+
+// Does the pets owner receive exp from the pets damage?
+pet_attack_exp_to_master: no
+
+// The rate exp. is gained from the pet attacking monsters
+pet_attack_exp_rate: 100
+
+// Pet leveling system. Use 0 to disable (default).
+// When enabled, a pet's level is a fixed % of the master's. (Note 2)
+// If 200%, pet has double level, if 50% pet has half your level, etc.
+pet_lv_rate: 0
+
+// When pet leveling is enabled, what is the max stats for pets?
+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 
+// enable pet_str, their max damage is then their base_atk + pet_max_atk2
+pet_max_atk1: 500
+pet_max_atk2: 1000
+
+// Are pets disabled during Guild Wars?
+// If set to yes, pets are automatically returned to egg when entering castles during WoE times
+// and hatching is forbidden within as well.
+pet_disable_in_gvg: no
diff --git a/conf-tmpl/battle/player.conf b/conf-tmpl/battle/player.conf
index 3e816a40b..fbec77f15 100644
--- a/conf-tmpl/battle/player.conf
+++ b/conf-tmpl/battle/player.conf
@@ -1,147 +1,147 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// Players' maximum HP rate? (Default is 100)

-hp_rate: 100

-

-// Players' maximum SP rate? (Default is 100)

-sp_rate: 100

-

-// Whether or not cards and attributes of the left hand are applied to the right hand attack (Note 1)

-// (It is 'yes' on official servers)

-left_cardfix_to_right: yes

-

-// The amount of HP a player will respawn with, 0 is default.

-// (Unit is in percentage of total HP, 100 is full heal of HP, 0 is respawn with 1HP total.)

-restart_hp_rate: 0

-

-// The amount of SP a player will respawn with, 0 is default.

-// (Unit is in percentage of total SP, 100 is full heal of SP, 0 is respawn with 1SP total.)

-restart_sp_rate: 0

-

-// Can a normal player by-pass the skill tree? (Note 1)

-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)

-// Setting this to yes can open an exploit on your server!

-quest_skill_learn: no

-

-// When skills are reset, quest skills are reset as well? (Note 1)

-// Setting this to yes can open an exploit on your server!

-// NOTE: If you have quest_skill_learn set to yes, quest skills are always reset.

-quest_skill_reset: no

-

-// You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1)

-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)

-player_invincible_time: 5000

-

-// The time interval for HP to restore naturally. (in milliseconds) (Note 3)

-natural_healhp_interval: 6000

-

-// The time interval for SP to restore naturally. (in milliseconds) (Note 3)

-natural_healsp_interval: 8000

-

-// Automatic healing skill's time interval. (in milliseconds) (Note 3)

-natural_heal_skill_interval: 10000

-

-// The maximum weight for a character to carry when the character stops healing naturally. (in %)

-natural_heal_weight_rate: 50

-

-// Maximum atk speed. (Default 190, Highest allowed 199)

-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)

-max_hp: 1000000

-

-// Maximum SP. (Default is 1000000) (Note 3)

-max_sp: 1000000

-

-// Max limit of char stats. (agi, str, etc.)

-max_parameter: 99

-

-// Same as max_parameter, but for baby classes.

-max_baby_parameter: 80

-

-// Max armor def/mdef 

-// 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.

-max_def: 99

-

-// Def to Def2 conversion bonus. If the armor def/mdef exceeds max_def,

-// the remaining is converted to vit def/int mdef using this multiplier

-// (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_cart_weight: 8000

-

-// Prevent logout of players after being hit for how long (in ms, 0 disables)?

-prevent_logout: 10000

-

-// Display the drained hp/sp values from normal attacks? (Ie: Hunter Fly card)

-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 

-// list, otherwise, only A appears in B's friend list.

-friend_auto_add: no

-

-// Are other requests accepted during [various things[party,guild]] a request or not?

-// It does not accept by no accepted by yes.

-invite_request_check: yes

-

-// Players' will drop a 'Skull' when killed?

-// 1 - Dropped only in PvP maps

-// 2 - Dropped in all situations

-// 0 - Disabled

-bone_drop: 0

-

-// Do mounted (on Peco) characters increase their size

-// 0 = no

-// 1 = only Normal Classes on Peco have Big Size

-// 2 = only Baby Classes on Peco have Medium Size

-// 3 = both Normal Classes on Peco have Big Size

-//	and Baby Classes on Peco have Medium Size

-character_size: 0

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// Players' maximum HP rate? (Default is 100)
+hp_rate: 100
+
+// Players' maximum SP rate? (Default is 100)
+sp_rate: 100
+
+// Whether or not cards and attributes of the left hand are applied to the right hand attack (Note 1)
+// (It is 'yes' on official servers)
+left_cardfix_to_right: yes
+
+// The amount of HP a player will respawn with, 0 is default.
+// (Unit is in percentage of total HP, 100 is full heal of HP, 0 is respawn with 1HP total.)
+restart_hp_rate: 0
+
+// The amount of SP a player will respawn with, 0 is default.
+// (Unit is in percentage of total SP, 100 is full heal of SP, 0 is respawn with 1SP total.)
+restart_sp_rate: 0
+
+// Can a normal player by-pass the skill tree? (Note 1)
+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)
+// Setting this to yes can open an exploit on your server!
+quest_skill_learn: no
+
+// When skills are reset, quest skills are reset as well? (Note 1)
+// Setting this to yes can open an exploit on your server!
+// NOTE: If you have quest_skill_learn set to yes, quest skills are always reset.
+quest_skill_reset: no
+
+// You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1)
+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)
+player_invincible_time: 5000
+
+// The time interval for HP to restore naturally. (in milliseconds) (Note 3)
+natural_healhp_interval: 6000
+
+// The time interval for SP to restore naturally. (in milliseconds) (Note 3)
+natural_healsp_interval: 8000
+
+// Automatic healing skill's time interval. (in milliseconds) (Note 3)
+natural_heal_skill_interval: 10000
+
+// The maximum weight for a character to carry when the character stops healing naturally. (in %)
+natural_heal_weight_rate: 50
+
+// Maximum atk speed. (Default 190, Highest allowed 199)
+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)
+max_hp: 1000000
+
+// Maximum SP. (Default is 1000000) (Note 3)
+max_sp: 1000000
+
+// Max limit of char stats. (agi, str, etc.)
+max_parameter: 99
+
+// Same as max_parameter, but for baby classes.
+max_baby_parameter: 80
+
+// Max armor def/mdef 
+// 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.
+max_def: 99
+
+// Def to Def2 conversion bonus. If the armor def/mdef exceeds max_def,
+// the remaining is converted to vit def/int mdef using this multiplier
+// (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_cart_weight: 8000
+
+// Prevent logout of players after being hit for how long (in ms, 0 disables)?
+prevent_logout: 10000
+
+// Display the drained hp/sp values from normal attacks? (Ie: Hunter Fly card)
+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 
+// list, otherwise, only A appears in B's friend list.
+friend_auto_add: no
+
+// Are other requests accepted during [various things[party,guild]] a request or not?
+// It does not accept by no accepted by yes.
+invite_request_check: yes
+
+// Players' will drop a 'Skull' when killed?
+// 1 - Dropped only in PvP maps
+// 2 - Dropped in all situations
+// 0 - Disabled
+bone_drop: 0
+
+// Do mounted (on Peco) characters increase their size
+// 0 = no
+// 1 = only Normal Classes on Peco have Big Size
+// 2 = only Baby Classes on Peco have Medium Size
+// 3 = both Normal Classes on Peco have Big Size
+//	and Baby Classes on Peco have Medium Size
+character_size: 0
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index f0c78c814..233069a85 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -1,278 +1,278 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-//Note 4: Use bitmask values to specify who is affected 

-//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// The rate of time it takes to cast a spell (Note 2, 0 = No casting time)

-casting_rate: 100

-

-// Delay time after casting (Note 2)

-delay_rate: 100

-

-// Is the delay time dependant on the caster's AGI? (Note 1)

-// Note: On Official servers no stat affects delay time

-delay_dependon_agi: no

-

-// Minimum allowed delay for ANY skills after casting (in miliseconds) (Note 1)

-// Note: Setting this to anything above 0 can stop speedhacks.

-min_skill_delay_limit: 100

-

-// Default skill delay for non-weapon based skills which have no delay specified.

-// This delay is also 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 

-// appear to "teleport" afterwards.

-default_skill_delay: 300

-

-//Completely disable skill delay of the following types (Note 4)

-//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

-//  min_skill_delay_limit.

-no_skill_delay: 2

-

-// At what dex does the cast time become zero (instacast)

-// If delay_dependon_agi is enabled, this is also the amount of agi required 

-// for zero delay on skills.

-castrate_dex_scale: 150

-

-// Will normal attacks be able to ignore the delay after skills? (Note 1)

-skill_delay_attack_enable: yes

-

-// Range added to skills after their cast time finishes.

-// Decides how far away the target can walk away after the skill began casting before the skill fails.

-// 0 disables this range checking (default)

-//skill_add_range: 15

-

-// 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)

-// 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 (eg: Double Strafe is always long-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)

-// NOTE: Skills affected by this option are those whose range in the skill_db are negative.

-skillrange_from_weapon: 14

-

-// 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 

-// 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]

-clear_skills_on_death: 0

-

-// Should ground placed skills be removed when the caster changes maps? [Note 4]

-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"

-//The two skills affected by default are Pneuma and Safety Wall (if set to yes, those two skills will not protect everyone, but only allies)

-//See db/skill_unit_db.txt for more info.

-defunit_not_enemy: no

-

-// Do skills do at least 'hits' damage when they don't miss/are blocked?

-//(for example, will firebolts always do "number of bolts" damage versus plants?)

-//Values (add as appropiate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.

-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)

-// 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)

-// 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)

-// 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)

-// Default on official servers: yes for player-traps

-gvg_traps_target_all: 1

-

-// Some traps settings (add as necessary):

-// 1: Traps are invisible to those who come into view of it. When unset, all traps are visible at all times.

-//    (Invisible traps can be revealed through Hunter's Detecting skill)

-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 

-//     one hydra out)

-summon_flora_setting: 3

-

-// Whether placed down skills will check walls (Note 1)

-// (Makes it so that Storm Gust/Lord of Vermillion/etc when casted 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). 

-//  Add the settings as required, being hit always uncloaks you.

-// 

-// 0 = doesn't check for walls

-// 1 = Check for walls

-// 2 = Cloaking is not cancelled when attacking.

-// 4 = Cloaking is not cancelled when using skills

-player_cloak_check_type: 1

-monster_cloak_check_type: 4

-

-// Can't place unlimited land skills at the same time (Note 4)

-land_skill_limit: 1

-

-//Determines which kind of skill-failed messages should be sent:

-// 1 - Disable all skill-failed messages.

-// 2 - Disable skill-failed messages due to can-act delays.

-// 4 - Disable failed message from Snatcher

-// 8 - Disable failed message from Envenom

-display_skill_fail: 0

-

-// Can a player in chat room (in-game), be warped by a warp portal? (Note 1)

-chat_warpportal: no

-

-// What should the wizard's "Sense" skill display on the defense fields?

-// 0: Do not show defense

-// 1: Base defense

-// 2: Vit/Int defense

-// 3: Both (the addition of both) [default]

-sense_type: 3

-

-// Which finger offensive style can be used?

-// 0 = Aegis style

-// 1 = Athena style

-finger_offensive_type: 0

-

-// Number of hits at a time that undead/fire elemental enemies receive from firewall.

-// NOTE: Officially, it is one hit at a time on a very fast rate, however eA's timer system 

-// doesn't triggers enough "hits" to exhaust the firewall before the mob walks through it.

-// A value of 5 would suffice for a vertical firewall to take full effect on undead.

-firewall_hits_on_undead: 5

-

-// Grandcross Settings (Dont mess with these)

-// If set to no, hit interval is increased based on the amount of mobs standing on the same cell

-// (means that when there's stacked mobs in the same cell, they won't receive all hits)

-gx_allhit: no

-

-// Grandcross display type (Default 1)

-// 0: Yellow character

-// 1: White character

-gx_disptype: 1

-

-// Max Level Difference for Devotion

-devotion_level_difference: 10

-

-// If no than you can use the ensemble skills alone. (Note 1)

-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

-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?

-skill_steal_type: yes

-

-// How many times you could try to steal from a mob.

-// Note: It helps to avoid stealing exploit on monsters with few rare items

-// Use 0 to disable (max allowed value is 255)

-skill_steal_max_tries: 0

-

-// Can Rogues plagiarize advanced job skills           

-// 0 = no restriction

-// 1 = only stalker may plagiarize advanced skills       

-// 2 = advanced skills cannot be plagiarized by anyone  

-// Official servers setting: 2

-copyskill_restrict: 2

-

-// Does Berserk/Frenzy cancel other self-buffs when used?

-berserk_cancels_buffs: no

-

-// Level and Strength of "MVP heal". When someone casts a heal of this level or

-// above, the heal formula is bypassed and this value is used instead.

-max_heal: 9999

-max_heal_lv: 11

-

-// Emergency Recall Guild Skill setting (add as appropiate).

-// 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.

-// 4: Skill is usable outside of GvG grounds

-// 8: Skill is usable on GvG grounds

-//16: Disable skill from "nowarpto" maps

-//    (it will work on GVG castles even if they are set to nowarpto, though)

-emergency_call: 31

-

-// Guild Aura Skills setting (add as appropiate).

-// (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)

-// 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.

-// 4: Skill works outside of GvG grounds

-// 8: Skill works on GvG grounds

-//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

-

-// Allow use of SG skills without proper day (Sun/Moon/Star) ?

-allow_skill_without_day: no

-

-// Allow use of ES-type magic on players?

-allow_es_magic_player: no

-

-//Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)

-sg_miracle_skill_ratio: 1

-

-//Miracle of the Sun, Moon and Stars skill duration in miliseconds

-sg_miracle_skill_min_duration: 3600000

-sg_miracle_skill_max_duration: 9000000

-

-//Angel of the Sun, Moon and Stars skill ratio (100% = 10000)

-sg_angel_skill_ratio: 10

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+//Note 4: Use bitmask values to specify who is affected 
+//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// The rate of time it takes to cast a spell (Note 2, 0 = No casting time)
+casting_rate: 100
+
+// Delay time after casting (Note 2)
+delay_rate: 100
+
+// Is the delay time dependant on the caster's AGI? (Note 1)
+// Note: On Official servers no stat affects delay time
+delay_dependon_agi: no
+
+// Minimum allowed delay for ANY skills after casting (in miliseconds) (Note 1)
+// Note: Setting this to anything above 0 can stop speedhacks.
+min_skill_delay_limit: 100
+
+// Default skill delay for non-weapon based skills which have no delay specified.
+// This delay is also 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 
+// appear to "teleport" afterwards.
+default_skill_delay: 300
+
+//Completely disable skill delay of the following types (Note 4)
+//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
+//  min_skill_delay_limit.
+no_skill_delay: 2
+
+// At what dex does the cast time become zero (instacast)
+// If delay_dependon_agi is enabled, this is also the amount of agi required 
+// for zero delay on skills.
+castrate_dex_scale: 150
+
+// Will normal attacks be able to ignore the delay after skills? (Note 1)
+skill_delay_attack_enable: yes
+
+// Range added to skills after their cast time finishes.
+// Decides how far away the target can walk away after the skill began casting before the skill fails.
+// 0 disables this range checking (default)
+//skill_add_range: 15
+
+// 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)
+// 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 (eg: Double Strafe is always long-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)
+// NOTE: Skills affected by this option are those whose range in the skill_db are negative.
+skillrange_from_weapon: 14
+
+// 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 
+// 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]
+clear_skills_on_death: 0
+
+// Should ground placed skills be removed when the caster changes maps? [Note 4]
+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"
+//The two skills affected by default are Pneuma and Safety Wall (if set to yes, those two skills will not protect everyone, but only allies)
+//See db/skill_unit_db.txt for more info.
+defunit_not_enemy: no
+
+// Do skills do at least 'hits' damage when they don't miss/are blocked?
+//(for example, will firebolts always do "number of bolts" damage versus plants?)
+//Values (add as appropiate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.
+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)
+// 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)
+// 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)
+// 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)
+// Default on official servers: yes for player-traps
+gvg_traps_target_all: 1
+
+// Some traps settings (add as necessary):
+// 1: Traps are invisible to those who come into view of it. When unset, all traps are visible at all times.
+//    (Invisible traps can be revealed through Hunter's Detecting skill)
+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 
+//     one hydra out)
+summon_flora_setting: 3
+
+// Whether placed down skills will check walls (Note 1)
+// (Makes it so that Storm Gust/Lord of Vermillion/etc when casted 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). 
+//  Add the settings as required, being hit always uncloaks you.
+// 
+// 0 = doesn't check for walls
+// 1 = Check for walls
+// 2 = Cloaking is not cancelled when attacking.
+// 4 = Cloaking is not cancelled when using skills
+player_cloak_check_type: 1
+monster_cloak_check_type: 4
+
+// Can't place unlimited land skills at the same time (Note 4)
+land_skill_limit: 1
+
+//Determines which kind of skill-failed messages should be sent:
+// 1 - Disable all skill-failed messages.
+// 2 - Disable skill-failed messages due to can-act delays.
+// 4 - Disable failed message from Snatcher
+// 8 - Disable failed message from Envenom
+display_skill_fail: 0
+
+// Can a player in chat room (in-game), be warped by a warp portal? (Note 1)
+chat_warpportal: no
+
+// What should the wizard's "Sense" skill display on the defense fields?
+// 0: Do not show defense
+// 1: Base defense
+// 2: Vit/Int defense
+// 3: Both (the addition of both) [default]
+sense_type: 3
+
+// Which finger offensive style can be used?
+// 0 = Aegis style
+// 1 = Athena style
+finger_offensive_type: 0
+
+// Number of hits at a time that undead/fire elemental enemies receive from firewall.
+// NOTE: Officially, it is one hit at a time on a very fast rate, however eA's timer system 
+// doesn't triggers enough "hits" to exhaust the firewall before the mob walks through it.
+// A value of 5 would suffice for a vertical firewall to take full effect on undead.
+firewall_hits_on_undead: 5
+
+// Grandcross Settings (Dont mess with these)
+// If set to no, hit interval is increased based on the amount of mobs standing on the same cell
+// (means that when there's stacked mobs in the same cell, they won't receive all hits)
+gx_allhit: no
+
+// Grandcross display type (Default 1)
+// 0: Yellow character
+// 1: White character
+gx_disptype: 1
+
+// Max Level Difference for Devotion
+devotion_level_difference: 10
+
+// If no than you can use the ensemble skills alone. (Note 1)
+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
+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?
+skill_steal_type: yes
+
+// How many times you could try to steal from a mob.
+// Note: It helps to avoid stealing exploit on monsters with few rare items
+// Use 0 to disable (max allowed value is 255)
+skill_steal_max_tries: 0
+
+// Can Rogues plagiarize advanced job skills           
+// 0 = no restriction
+// 1 = only stalker may plagiarize advanced skills       
+// 2 = advanced skills cannot be plagiarized by anyone  
+// Official servers setting: 2
+copyskill_restrict: 2
+
+// Does Berserk/Frenzy cancel other self-buffs when used?
+berserk_cancels_buffs: no
+
+// Level and Strength of "MVP heal". When someone casts a heal of this level or
+// above, the heal formula is bypassed and this value is used instead.
+max_heal: 9999
+max_heal_lv: 11
+
+// Emergency Recall Guild Skill setting (add as appropiate).
+// 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.
+// 4: Skill is usable outside of GvG grounds
+// 8: Skill is usable on GvG grounds
+//16: Disable skill from "nowarpto" maps
+//    (it will work on GVG castles even if they are set to nowarpto, though)
+emergency_call: 31
+
+// Guild Aura Skills setting (add as appropiate).
+// (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)
+// 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.
+// 4: Skill works outside of GvG grounds
+// 8: Skill works on GvG grounds
+//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
+
+// Allow use of SG skills without proper day (Sun/Moon/Star) ?
+allow_skill_without_day: no
+
+// Allow use of ES-type magic on players?
+allow_es_magic_player: no
+
+//Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
+sg_miracle_skill_ratio: 1
+
+//Miracle of the Sun, Moon and Stars skill duration in miliseconds
+sg_miracle_skill_min_duration: 3600000
+sg_miracle_skill_max_duration: 9000000
+
+//Angel of the Sun, Moon and Stars skill ratio (100% = 10000)
+sg_angel_skill_ratio: 10
diff --git a/conf-tmpl/battle/status.conf b/conf-tmpl/battle/status.conf
index 4c45e2015..f34ab1a54 100644
--- a/conf-tmpl/battle/status.conf
+++ b/conf-tmpl/battle/status.conf
@@ -1,61 +1,61 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-//--------------------------------------------------------------

-//Note 1: Directives can be set using on/off, yes/no or 1/0.

-//Note 2: All rates are in percents, 100 would mean 100%, 200

-//   would mean 200%, etc

-//Note 3: Value is not limited to 60K (see below)

-//Note 4: Use bitmask values to specify who is affected 

-//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)

-// Other Information:

-// All options are limited to a max of 60K (aprox) which is 600%

-// or 60secs as appropiate.

-// 1000 miliseconds is 1 second.

-// Unless otherwise specified, the minimum value is 0 for all

-// features.

-//--------------------------------------------------------------

-

-// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc (includes silence) [Note 4]?

-status_cast_cancel: 0

-

-// Will certain skill status-changes be removed on logout?

-// This mimics official servers, where Extremity Fist's no SP regen,

-// Strip Equipment, cooking effects are removed when you logout. Setting is:

-// 0 - remove nothing.

-// 1 - remove negative buffs (stripping, EF)

-// 2 - remove positive buffs (cooking)

-// 3 - remove all buffs that are not saved on official (default)

-debuff_on_logout: 3

-

-// Adjustment for the natural rate of resistance from status changes.

-// If 50, status defense is halved, and you need twice as much stats to block

-// them (eg: 200 vit to completely block stun)

-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 inmunity.

-// 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. (10000 = 100%)

-// NOTE: Cards and equipment can go over this limit, so it only applies to natural resist.

-pc_max_status_def: 10000

-mob_max_status_def: 10000

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+//Note 1: Directives can be set using on/off, yes/no or 1/0.
+//Note 2: All rates are in percents, 100 would mean 100%, 200
+//   would mean 200%, etc
+//Note 3: Value is not limited to 60K (see below)
+//Note 4: Use bitmask values to specify who is affected 
+//        (1: Pc, 2: Mob, 4: Pet, 8: Homonculus)
+// Other Information:
+// All options are limited to a max of 60K (aprox) which is 600%
+// or 60secs as appropiate.
+// 1000 miliseconds is 1 second.
+// Unless otherwise specified, the minimum value is 0 for all
+// features.
+//--------------------------------------------------------------
+
+// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc (includes silence) [Note 4]?
+status_cast_cancel: 0
+
+// Will certain skill status-changes be removed on logout?
+// This mimics official servers, where Extremity Fist's no SP regen,
+// Strip Equipment, cooking effects are removed when you logout. Setting is:
+// 0 - remove nothing.
+// 1 - remove negative buffs (stripping, EF)
+// 2 - remove positive buffs (cooking)
+// 3 - remove all buffs that are not saved on official (default)
+debuff_on_logout: 3
+
+// Adjustment for the natural rate of resistance from status changes.
+// If 50, status defense is halved, and you need twice as much stats to block
+// them (eg: 200 vit to completely block stun)
+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 inmunity.
+// 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. (10000 = 100%)
+// NOTE: Cards and equipment can go over this limit, so it only applies to natural resist.
+pc_max_status_def: 10000
+mob_max_status_def: 10000
diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index eb192f006..6098b0fa6 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -1,67 +1,67 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-// eAthena Battle Configuration File

-// Originally Translated by Peter Kieser <pfak@telus.net>

-// Made in to plainer English by Ancyker

-// Splitted up into multiple files by Skotlex.

-//--------------------------------------------------------------

-

-//General battle-related settings.

-import: conf/battle/battle.conf

-

-//Settings specific to the client.

-import: conf/battle/client.conf

-

-//General drop-related configs.

-import: conf/battle/drops.conf

-

-//Experience rates, exp penalties, stats and max level settings.

-import: conf/battle/exp.conf

-

-//GM levels, atcommands and hack-related configs.

-import: conf/battle/gm.conf

-

-//Guild and WoE settings

-import: conf/battle/guild.conf

-

-//Item/card-specific and crafting related options.

-import: conf/battle/items.conf

-

-//Mob related configuration

-import: conf/battle/monster.conf

-

-//Party related configuration

-import: conf/battle/party.conf

-

-//Pet related configuration

-import: conf/battle/pet.conf

-

-//Homunc related configuration

-import: conf/battle/homunc.conf

-

-//Player specific settings

-import: conf/battle/player.conf

-

-//Skill related settings

-import: conf/battle/skill.conf

-

-//Status change related settings

-import: conf/battle/status.conf

-

-// Anything else that didn't fit anywhere else.

-// Includes duel, day/night, mute/manner, log settings.

-import: conf/battle/misc.conf

-

-//Your custom config goes here.

-import: conf/import/battle_conf.txt

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+// eAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+// Splitted up into multiple files by Skotlex.
+//--------------------------------------------------------------
+
+//General battle-related settings.
+import: conf/battle/battle.conf
+
+//Settings specific to the client.
+import: conf/battle/client.conf
+
+//General drop-related configs.
+import: conf/battle/drops.conf
+
+//Experience rates, exp penalties, stats and max level settings.
+import: conf/battle/exp.conf
+
+//GM levels, atcommands and hack-related configs.
+import: conf/battle/gm.conf
+
+//Guild and WoE settings
+import: conf/battle/guild.conf
+
+//Item/card-specific and crafting related options.
+import: conf/battle/items.conf
+
+//Mob related configuration
+import: conf/battle/monster.conf
+
+//Party related configuration
+import: conf/battle/party.conf
+
+//Pet related configuration
+import: conf/battle/pet.conf
+
+//Homunc related configuration
+import: conf/battle/homunc.conf
+
+//Player specific settings
+import: conf/battle/player.conf
+
+//Skill related settings
+import: conf/battle/skill.conf
+
+//Status change related settings
+import: conf/battle/status.conf
+
+// Anything else that didn't fit anywhere else.
+// Includes duel, day/night, mute/manner, log settings.
+import: conf/battle/misc.conf
+
+//Your custom config goes here.
+import: conf/import/battle_conf.txt
diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf
index 840c40d2e..7e2d261d8 100644
--- a/conf-tmpl/char_athena.conf
+++ b/conf-tmpl/char_athena.conf
@@ -1,230 +1,230 @@
-// Athena Character configuration file.

-

-// Note: "Comments" are all text on the right side of a double slash "//"

-// Whatever text is commented will not be parsed by the servers, and serves

-// only as information/reference.

-

-// Server Communication username and password.

-userid: s1

-passwd: p1

-

-// Server name, use alternative character such as ASCII 160 for spaces.

-// NOTE: You should not use spaces in the server name, or guild emblems won't work client-side!

-server_name: eAthena

-

-// Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)

-wisp_server_name: Server

-

-// Login Server IP

-// The character server connects to the login server using this IP address.

-// NOTE: This is useful when you are running behind a firewall or are on

-// a machine with multiple interfaces.

-//login_ip: 127.0.0.1

-

-// The character server listens on the interface with this IP address.

-// NOTE: This allows you to run multiple servers on multiple interfaces

-// while using the same ports for each server.

-//bind_ip: 127.0.0.1

-

-// Login Server Port

-login_port: 6900

-

-// Character Server IP

-// The character server exports this IP address to the entire world.

-// NOTE: You should only need to set this if you are running behind a

-// firewall or are on a machine with multiple interfaces.

-// char_ip:127.0.0.1

-

-// Character Server Port

-char_port: 6121

-

-//Time-stamp format which will be printed before all messages.

-//Can at most be 20 characters long.

-//Common formats:

-// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)

-// %H:%M:%S (hour:minute:second, 24 hour format)

-// %d/%b/%Y (day/Month/year)

-//For full format information, consult the strftime() manual.

-//timestamp_format: [%d/%b %H:%M]

-

-//Defines if the ansi sequences should be parsed or skipped.

-//If set to yes the console output is in color. If the stream is redirected to

-//a file, the ansi sequences are printed out.

-//If set to no the console is colorless and, if redirected, will skip the ansi

-//sequences.

-//NOTE: this setting applyes for both stdout and stderr

-stdout_with_ansisequence: yes

-

-//Makes server output more silent by ommitting certain types of messages:

-//1: Hide Information messages

-//2: Hide Status messages

-//4: Hide Notice Messages

-//8: Hide Warning Messages

-//16: Hide Error and SQL Error messages.

-//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)

-console_silent: 0

-

-// Console Commands

-// Allow for console commands to be used on/off

-// This prevents usage of >& log.file

-console: off

-

-// Option to force a player to create an e-mail.

-// If a player have default e-mail, and if you activate this option, the player can only connect in the game (to arrive on a map) like follow:

-// - Create at least 1 character

-// - Select 1 character

-// - Select DEL to enter his/her e-mail. (if OK is choosen, client says to the player: 'invalid e-mail')

-// - If his/her e-mail is correct, the player enter in the game (an e-mail is saved definitively).

-// - If his/her e-mail is incorrect, he/she have 'incorrect e-mail' and must select again DEL.

-// - After entering in the game (when the player arrives on a map), DEL and SEL/OK button work normaly for all next connections.

-// Resume: If a player have "incorrect/invalid e-mail" when he/she click on 'OK' button,

-//         the player must click 'DEL' button and register his/her NEW e-mail to enter in the game

-// So, default is 0, because administrator must explain to their players before to activate this option.

-email_creation: 0

-

-// Is Character server in maintainence mode?

-char_maintenance: 0

-

-// Enable or disable creation of new characters.

-// Now it is actually supported [Kevin]

-char_new: 1

-

-// Display (New) in the server list.

-char_new_display: 0

-

-// Maximum users able to connect to the server. Set to 0 for unlimited.

-max_connect_user: 0

-

-// When set to yes, the char server will refuse connections from players already online.

-// When a login attempt is rejected, the account in question will be booted from all the connected map servers.

-// Note that this only works within the char-server and it's connected mapservers,

-// the charserver cannot know if the same account is logged on in other char servers.

-// it's safe to turn off if the char-server only has a single map-server connected to it.

-online_check: yes

-

-// Minimum GM level that is allowed to bypass the server limit of users.

-gm_allow_level: 99

-

-// It's to check IP of a player between char-server and other servers (part of anti-hacking system)

-// If player doesn't have same IP, connection is refused.

-// Set to 0/off/no to not check IP of player.

-// Set to 1/on/yes if you want to check (default)

-// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,

-//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.

-check_ip_flag: yes

-

-// How often should the server save all files? (In seconds)

-// Note: Applies to all data files on TXT servers.

-// On SQL servers, it applies to guilds (character save interval is defined on the map config)

-autosave_time: 60

-

-// Display information on the console whenever characters/guilds/parties/pets are loaded/saved? 

-save_log: yes

-

-// Character server flatfile database

-char_txt: save/athena.txt

-

-// Choose to create or not backup file (yes/no, 0/1, etc...)

-// default is 'no', because backup file take time for nothing. Actually, there is no problem on characters file creation and save.

-backup_txt_flag: no

-

-// Character server flatfile database (backup, TXT only)

-backup_txt: save/athena_backup.txt

-

-// Friends list flatfile database

-friends_txt: save/friends.txt

-

-// Start point, Map name followed by coordinates (x,y)

-start_point: new_zone01.gat,53,111

-

-// Starting weapon for new characters

-start_weapon: 1201

-

-// Starting armor for new characters

-start_armor: 2301

-

-// Starting zeny for new characters

-start_zeny: 0

-

-// Size for the fame-lists

-fame_list_alchemist: 10

-fame_list_blacksmith: 10

-fame_list_taekwon: 10

-

-// Guild earned exp modifier.

-// Adjusts taxed exp before adding it to the guild's exp. For example, if set 

-// to 200, the guild receives double the player's taxed exp.

-guild_exp_rate: 100

-

-// Name used for unknown characters

-unknown_char_name: Unknown

-

-// Log Filename

-char_log_filename: log/char.log

-

-// Allow or not identical name for characters but with a different case (upper/lower):

-// example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed

-name_ignoring_case: 0

-

-// Manage possible letters/symbol in the name of charater. Control character (0x00-0x1f) are never accepted. Possible values are:

-// NOTE: Applies to character, party and guild names.

-// 0: no restriction (default)

-// 1: only letters/symbols in 'char_name_letters' option.

-// 2: Letters/symbols in 'char_name_letters' option are forbidden. All others are possibles.

-char_name_option: 1

-

-// Set the letters/symbols that you want use with the 'char_name_option' option.

-// Note: Don't add spaces unless you mean to add 'space' to the list.

-char_name_letters: abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890

-

-// Filename of the file which receives the online players list in text

-online_txt_filename: online.txt

-

-// Filename of the file which receives the online players list, but in html version

-online_html_filename: online.html

-

-// Choose how to display online players.

-// (sorting operation with a lot of online players can take time on a slow computer)

-// 0: no sorting (default)

-// 1: by alphabetical order of their name

-// 2: by number of their zenys

-// 3: by their base level

-// 4: by their job (and job level inside the same job)

-// 5: by alphabetical order of their actual map location

-online_sorting_option: 0

-

-// Choose which columns that you want display in the online files. Do the addition of these values:

-// (if value is 0, no file is done)

-// 1: name (just the name, no function like 'GM')

-// 2: job

-// 4: levels

-// 8: map name

-// 16: mapname and coordonates

-// 32: zenys

-// 64: name (with 'GM' if the player is a GM)

-// default value: 1 (only name)

-online_display_option: 1

-

-// minimum GM level to display 'GM' when we want to display it (default: 1)

-online_gm_display_min_level: 20

-

-// refresh time (in sec) of the html file in the explorer (default 20)

-online_refresh_html: 20

-

-// To log the character server?

-log_char: 1

-

-// How many Characters are allowed per Account ? (0 = disabled) [SQL Only!]

-chars_per_account: 0

-

-// Restrict character deletion by BaseLevel

-// 0: no restriction (players can delete characters of may levels)

-// -X: you can't delete chars with BaseLevel <= X

-// Y: you can't delete chars with BaseLevel >= Y

-// e.g. char_del_level: 80 (players can't delete characters with 80+ BaseLevel)

-char_del_level: 0

-

-// What folder the DB files are in (item_db.txt, etc.)

-db_path: db

-

-import: conf/import/char_conf.txt

+// Athena Character configuration file.
+
+// Note: "Comments" are all text on the right side of a double slash "//"
+// Whatever text is commented will not be parsed by the servers, and serves
+// only as information/reference.
+
+// Server Communication username and password.
+userid: s1
+passwd: p1
+
+// Server name, use alternative character such as ASCII 160 for spaces.
+// NOTE: You should not use spaces in the server name, or guild emblems won't work client-side!
+server_name: eAthena
+
+// Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
+wisp_server_name: Server
+
+// Login Server IP
+// The character server connects to the login server using this IP address.
+// NOTE: This is useful when you are running behind a firewall or are on
+// a machine with multiple interfaces.
+//login_ip: 127.0.0.1
+
+// The character server listens on the interface with this IP address.
+// NOTE: This allows you to run multiple servers on multiple interfaces
+// while using the same ports for each server.
+//bind_ip: 127.0.0.1
+
+// Login Server Port
+login_port: 6900
+
+// Character Server IP
+// The character server exports this IP address to the entire world.
+// NOTE: You should only need to set this if you are running behind a
+// firewall or are on a machine with multiple interfaces.
+// char_ip:127.0.0.1
+
+// Character Server Port
+char_port: 6121
+
+//Time-stamp format which will be printed before all messages.
+//Can at most be 20 characters long.
+//Common formats:
+// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)
+// %H:%M:%S (hour:minute:second, 24 hour format)
+// %d/%b/%Y (day/Month/year)
+//For full format information, consult the strftime() manual.
+//timestamp_format: [%d/%b %H:%M]
+
+//Defines if the ansi sequences should be parsed or skipped.
+//If set to yes the console output is in color. If the stream is redirected to
+//a file, the ansi sequences are printed out.
+//If set to no the console is colorless and, if redirected, will skip the ansi
+//sequences.
+//NOTE: this setting applyes for both stdout and stderr
+stdout_with_ansisequence: yes
+
+//Makes server output more silent by ommitting certain types of messages:
+//1: Hide Information messages
+//2: Hide Status messages
+//4: Hide Notice Messages
+//8: Hide Warning Messages
+//16: Hide Error and SQL Error messages.
+//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
+console_silent: 0
+
+// Console Commands
+// Allow for console commands to be used on/off
+// This prevents usage of >& log.file
+console: off
+
+// Option to force a player to create an e-mail.
+// If a player have default e-mail, and if you activate this option, the player can only connect in the game (to arrive on a map) like follow:
+// - Create at least 1 character
+// - Select 1 character
+// - Select DEL to enter his/her e-mail. (if OK is choosen, client says to the player: 'invalid e-mail')
+// - If his/her e-mail is correct, the player enter in the game (an e-mail is saved definitively).
+// - If his/her e-mail is incorrect, he/she have 'incorrect e-mail' and must select again DEL.
+// - After entering in the game (when the player arrives on a map), DEL and SEL/OK button work normaly for all next connections.
+// Resume: If a player have "incorrect/invalid e-mail" when he/she click on 'OK' button,
+//         the player must click 'DEL' button and register his/her NEW e-mail to enter in the game
+// So, default is 0, because administrator must explain to their players before to activate this option.
+email_creation: 0
+
+// Is Character server in maintainence mode?
+char_maintenance: 0
+
+// Enable or disable creation of new characters.
+// Now it is actually supported [Kevin]
+char_new: 1
+
+// Display (New) in the server list.
+char_new_display: 0
+
+// Maximum users able to connect to the server. Set to 0 for unlimited.
+max_connect_user: 0
+
+// When set to yes, the char server will refuse connections from players already online.
+// When a login attempt is rejected, the account in question will be booted from all the connected map servers.
+// Note that this only works within the char-server and it's connected mapservers,
+// the charserver cannot know if the same account is logged on in other char servers.
+// it's safe to turn off if the char-server only has a single map-server connected to it.
+online_check: yes
+
+// Minimum GM level that is allowed to bypass the server limit of users.
+gm_allow_level: 99
+
+// It's to check IP of a player between char-server and other servers (part of anti-hacking system)
+// If player doesn't have same IP, connection is refused.
+// Set to 0/off/no to not check IP of player.
+// Set to 1/on/yes if you want to check (default)
+// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
+//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
+check_ip_flag: yes
+
+// How often should the server save all files? (In seconds)
+// Note: Applies to all data files on TXT servers.
+// On SQL servers, it applies to guilds (character save interval is defined on the map config)
+autosave_time: 60
+
+// Display information on the console whenever characters/guilds/parties/pets are loaded/saved? 
+save_log: yes
+
+// Character server flatfile database
+char_txt: save/athena.txt
+
+// Choose to create or not backup file (yes/no, 0/1, etc...)
+// default is 'no', because backup file take time for nothing. Actually, there is no problem on characters file creation and save.
+backup_txt_flag: no
+
+// Character server flatfile database (backup, TXT only)
+backup_txt: save/athena_backup.txt
+
+// Friends list flatfile database
+friends_txt: save/friends.txt
+
+// Start point, Map name followed by coordinates (x,y)
+start_point: new_zone01.gat,53,111
+
+// Starting weapon for new characters
+start_weapon: 1201
+
+// Starting armor for new characters
+start_armor: 2301
+
+// Starting zeny for new characters
+start_zeny: 0
+
+// Size for the fame-lists
+fame_list_alchemist: 10
+fame_list_blacksmith: 10
+fame_list_taekwon: 10
+
+// Guild earned exp modifier.
+// Adjusts taxed exp before adding it to the guild's exp. For example, if set 
+// to 200, the guild receives double the player's taxed exp.
+guild_exp_rate: 100
+
+// Name used for unknown characters
+unknown_char_name: Unknown
+
+// Log Filename
+char_log_filename: log/char.log
+
+// Allow or not identical name for characters but with a different case (upper/lower):
+// example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
+name_ignoring_case: 0
+
+// Manage possible letters/symbol in the name of charater. Control character (0x00-0x1f) are never accepted. Possible values are:
+// NOTE: Applies to character, party and guild names.
+// 0: no restriction (default)
+// 1: only letters/symbols in 'char_name_letters' option.
+// 2: Letters/symbols in 'char_name_letters' option are forbidden. All others are possibles.
+char_name_option: 1
+
+// Set the letters/symbols that you want use with the 'char_name_option' option.
+// Note: Don't add spaces unless you mean to add 'space' to the list.
+char_name_letters: abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890
+
+// Filename of the file which receives the online players list in text
+online_txt_filename: online.txt
+
+// Filename of the file which receives the online players list, but in html version
+online_html_filename: online.html
+
+// Choose how to display online players.
+// (sorting operation with a lot of online players can take time on a slow computer)
+// 0: no sorting (default)
+// 1: by alphabetical order of their name
+// 2: by number of their zenys
+// 3: by their base level
+// 4: by their job (and job level inside the same job)
+// 5: by alphabetical order of their actual map location
+online_sorting_option: 0
+
+// Choose which columns that you want display in the online files. Do the addition of these values:
+// (if value is 0, no file is done)
+// 1: name (just the name, no function like 'GM')
+// 2: job
+// 4: levels
+// 8: map name
+// 16: mapname and coordonates
+// 32: zenys
+// 64: name (with 'GM' if the player is a GM)
+// default value: 1 (only name)
+online_display_option: 1
+
+// minimum GM level to display 'GM' when we want to display it (default: 1)
+online_gm_display_min_level: 20
+
+// refresh time (in sec) of the html file in the explorer (default 20)
+online_refresh_html: 20
+
+// To log the character server?
+log_char: 1
+
+// How many Characters are allowed per Account ? (0 = disabled) [SQL Only!]
+chars_per_account: 0
+
+// Restrict character deletion by BaseLevel
+// 0: no restriction (players can delete characters of may levels)
+// -X: you can't delete chars with BaseLevel <= X
+// Y: you can't delete chars with BaseLevel >= Y
+// e.g. char_del_level: 80 (players can't delete characters with 80+ BaseLevel)
+char_del_level: 0
+
+// What folder the DB files are in (item_db.txt, etc.)
+db_path: db
+
+import: conf/import/char_conf.txt
diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index 40c4b5883..063cd3f30 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -1,98 +1,98 @@
-// Athena charcommand Configuration file.

-// Translated by Peter Kieser <pfak@telus.net>

-

-// Set here the symbol that you want to use for your commands

-// Only 1 character is get (default is '#'). You can set any character,

-// except control-character (0x00-0x1f), '%' (party chat speaking) and '/' (standard ragnarok GM commands)

-// and '@' (Standard GM Commands)

-// With default character, all commands begin by a '#', example: #save SomePlayer

-command_symbol: #

-

-//Give another character a fake name

-fakename: 20

-

-//List a chacter's stats

-stats: 40

-

-//Give another character all stats

-statsall: 40

-

-//List a chacter's items

-itemlist: 40

-

-//Apply an effect onto another character

-effect: 40

-

-//List a chacter's storage items

-storagelist: 40

-

-//Rename another character's pet

-petrename: 50

-

-//Make another character's pet friendly/not

-petfriendly: 50

-

-// Changes character's model

-model: 50

-

-//Apply a certain option to another character

-option: 60

-

-//Save another character

-save: 60

-

-//?

-reset: 60

-

-//Give another character spiritball effect

-spiritball: 60

-

-//Give another character an item

-item: 60

-

-//Change another character's job (2 same commands)

-job: 60

-jobchange: 60

-

-//Give another character zeny

-zeny: 60

-

-//Change another character's base level (3 same commands)

-baselvl: 60

-blvl: 60

-baselvlup: 60

-

-//Change another character's job level (3 same commands)

-joblvl: 60

-jlvl: 60

-joblvlup: 60

-

-//Give another character a platinum skill

-questskill: 60

-

-//Take away a character's platinum skill

-lostskill: 60

-

-// Resets another character's status, skills

-streset: 60

-skreset: 60

-

-

-// Gives another character status points

-stpoint: 60

-

-// Gives another character skill points

-skpoint: 60

-

-// Changes the sex of an online player (all characters on the account)

-changesex: 60

-

-// Warp a player somewhere else (3 same commands)

-warp: 60

-rura: 60

-rura+: 60

-

-//Resets another character's designated maps

-feelreset: 60

-

-import: conf/import/charcommand_conf.txt

+// Athena charcommand Configuration file.
+// Translated by Peter Kieser <pfak@telus.net>
+
+// Set here the symbol that you want to use for your commands
+// Only 1 character is get (default is '#'). You can set any character,
+// except control-character (0x00-0x1f), '%' (party chat speaking) and '/' (standard ragnarok GM commands)
+// and '@' (Standard GM Commands)
+// With default character, all commands begin by a '#', example: #save SomePlayer
+command_symbol: #
+
+//Give another character a fake name
+fakename: 20
+
+//List a chacter's stats
+stats: 40
+
+//Give another character all stats
+statsall: 40
+
+//List a chacter's items
+itemlist: 40
+
+//Apply an effect onto another character
+effect: 40
+
+//List a chacter's storage items
+storagelist: 40
+
+//Rename another character's pet
+petrename: 50
+
+//Make another character's pet friendly/not
+petfriendly: 50
+
+// Changes character's model
+model: 50
+
+//Apply a certain option to another character
+option: 60
+
+//Save another character
+save: 60
+
+//?
+reset: 60
+
+//Give another character spiritball effect
+spiritball: 60
+
+//Give another character an item
+item: 60
+
+//Change another character's job (2 same commands)
+job: 60
+jobchange: 60
+
+//Give another character zeny
+zeny: 60
+
+//Change another character's base level (3 same commands)
+baselvl: 60
+blvl: 60
+baselvlup: 60
+
+//Change another character's job level (3 same commands)
+joblvl: 60
+jlvl: 60
+joblvlup: 60
+
+//Give another character a platinum skill
+questskill: 60
+
+//Take away a character's platinum skill
+lostskill: 60
+
+// Resets another character's status, skills
+streset: 60
+skreset: 60
+
+
+// Gives another character status points
+stpoint: 60
+
+// Gives another character skill points
+skpoint: 60
+
+// Changes the sex of an online player (all characters on the account)
+changesex: 60
+
+// Warp a player somewhere else (3 same commands)
+warp: 60
+rura: 60
+rura+: 60
+
+//Resets another character's designated maps
+feelreset: 60
+
+import: conf/import/charcommand_conf.txt
diff --git a/conf-tmpl/charhelp.txt b/conf-tmpl/charhelp.txt
index 194815ced..92d6c5910 100644
--- a/conf-tmpl/charhelp.txt
+++ b/conf-tmpl/charhelp.txt
@@ -1,27 +1,27 @@
- 40:--- CHARACTER CMD ---

- 40:#statsall - Displays stats of all characters.

- 40:#itemlist <char name> - Displays all items of a player.

- 40:#storagelist <char name> - Displays all items of a player's storage.

- 40:#stats <char name> - Displays a characters stats.

- 60:#option <param1> <param2> <param3> <charname> - Like @option command but only to target character.

- 50:#mountpeco <charname> - Give/remove to a player a peco (Class is required, but not skill).

- 50:#petrename <charname> - Re-enable pet rename to a player.

- 60:#save <map> <x> <y> <charname> - Changes the target players respawn point.

- 60:#baselvl <#> <nickname> - Change a characters base level.

- 60:#jlvl <#> <nickname> - Change a characters job level.

- 60:#job/#jobchange <job ID> <char name> - Changes target characters job.

- 60:#zeny <amount> <name> - Give/take a players Zeny

- 60:#stpoint <amount> <name> - Give/take a players stat points

- 60:#skpoint <amount> <name> - give/take a players skill points

- 60:#skreset <charname> - Reset skills of a character.

- 60:#streset <charname> - Reset stats of a character.

- 60:#reset <charname> - Reset stats AND skills of a character.

- 60:#questskill <#> <charname> - Gives to a player the specified quest skill.

- 60:#lostskill <#> <charname> - Takes away the specified quest skill from the player.

- 60:#delitem <item_name_or_ID> <quantity> <player> - Remove items from a character

- 50:#model <hair type> <hair color> <clothes color> <name> - Changes a player's model

- 60:#disguise <monster_name_or_monster_ID> <char name> - Changes disguise of a player

- 60:#undisguise <char name> - Cancels disguise of a player

- 60:#changesex <name> - Changes sex of a player (all characters of the account)

- 60:#warp/#rura+ <mapname> <x> <y> <char name> - Warps character to location of choice

+ 40:--- CHARACTER CMD ---
+ 40:#statsall - Displays stats of all characters.
+ 40:#itemlist <char name> - Displays all items of a player.
+ 40:#storagelist <char name> - Displays all items of a player's storage.
+ 40:#stats <char name> - Displays a characters stats.
+ 60:#option <param1> <param2> <param3> <charname> - Like @option command but only to target character.
+ 50:#mountpeco <charname> - Give/remove to a player a peco (Class is required, but not skill).
+ 50:#petrename <charname> - Re-enable pet rename to a player.
+ 60:#save <map> <x> <y> <charname> - Changes the target players respawn point.
+ 60:#baselvl <#> <nickname> - Change a characters base level.
+ 60:#jlvl <#> <nickname> - Change a characters job level.
+ 60:#job/#jobchange <job ID> <char name> - Changes target characters job.
+ 60:#zeny <amount> <name> - Give/take a players Zeny
+ 60:#stpoint <amount> <name> - Give/take a players stat points
+ 60:#skpoint <amount> <name> - give/take a players skill points
+ 60:#skreset <charname> - Reset skills of a character.
+ 60:#streset <charname> - Reset stats of a character.
+ 60:#reset <charname> - Reset stats AND skills of a character.
+ 60:#questskill <#> <charname> - Gives to a player the specified quest skill.
+ 60:#lostskill <#> <charname> - Takes away the specified quest skill from the player.
+ 60:#delitem <item_name_or_ID> <quantity> <player> - Remove items from a character
+ 50:#model <hair type> <hair color> <clothes color> <name> - Changes a player's model
+ 60:#disguise <monster_name_or_monster_ID> <char name> - Changes disguise of a player
+ 60:#undisguise <char name> - Cancels disguise of a player
+ 60:#changesex <name> - Changes sex of a player (all characters of the account)
+ 60:#warp/#rura+ <mapname> <x> <y> <char name> - Warps character to location of choice
 1
\ No newline at end of file
diff --git a/conf-tmpl/grf-files.txt b/conf-tmpl/grf-files.txt
index eaf89d41b..ef2421925 100644
--- a/conf-tmpl/grf-files.txt
+++ b/conf-tmpl/grf-files.txt
@@ -1,15 +1,15 @@
-//-----------------------------------------

-// GRF List

-//-----------------------------------------

-

-grf: C:\Program Files\Gravity\RO\data.grf

-grf: C:\Program Files\Gravity\RO\sdata.grf

-

-// You may add more in this format

-// grf: <data file path>

-

-//------ Others ---------------------------

-

-//Path to directory that contains the data dir 

-//NOTE: Path must include trailing backslash, only one data_dir entry is supported.

-//data_dir: C:\Program Files\Gravity\RO\

+//-----------------------------------------
+// GRF List
+//-----------------------------------------
+
+grf: C:\Program Files\Gravity\RO\data.grf
+grf: C:\Program Files\Gravity\RO\sdata.grf
+
+// You may add more in this format
+// grf: <data file path>
+
+//------ Others ---------------------------
+
+//Path to directory that contains the data dir 
+//NOTE: Path must include trailing backslash, only one data_dir entry is supported.
+//data_dir: C:\Program Files\Gravity\RO\
diff --git a/conf-tmpl/help.txt b/conf-tmpl/help.txt
index 9bff3be74..a013e8d9d 100644
--- a/conf-tmpl/help.txt
+++ b/conf-tmpl/help.txt
@@ -1,176 +1,176 @@
-// put at first, the minimum level to display the line

-  1:To use one command, type it inside the message window where you usually type to chat.

- 20:@h/@help - display this help guide.

- 20:@h2/@help2 - displays the second help guide.

-  1: 

-  1:--- MESSAGE CMD ---

-  1:@main [on|off|message] - Turns on or off global chat (@main must be on to see global chat messages)

-  1:@noask - Auto rejects Deals/Invites

- 20:@gmotd - Broadcasts the Message of The Day file to all players.

- 20:@me <message> - Displays normal text as a message in this format: *name message* (like /me in mIRC)

- 20:@fakename [Name] - Changes your name to your choice temporarly.

- 20:@npctalk [NPC Name],[Message] - Forces a NPC to display a message in normal chat.

- 40:/b/@broadcast <message> - Broadcasts a GM message with name of the GM (in yellow)

- 40:/nb <message>/@kami <message> - Broadcasts a GM message without name of the GM (in yellow)

- 40:@kamib <message> - Broadcasts a GM message without name of the GM (in blue)

- 40:/lb/@localbroadcast <message> - Broadcasts a GM message with name of the GM (in yellow) ONLY on your map

- 40:/nlb <message> - Broadcasts a GM message without name of the GM (in yellow) ONLY on your map

-  1: 

-  1:--- INFORMATION CMD ---

-  1:@commands - Displays a list of commands that you can use.

-  1:@rates - Displays the server's current rates.

-  1:@uptime - Displays how long the server has been online.

-  1:@showdelay - Shows/Hides the "there is a delay after this skill" message.

-  1:@exp - Displays current levels and % progress

-  1:@mobinfo/@monsterinfo/@mi [Mob ID|Part of monster name] - Shows Monster Info (rates, stats, drops, MVP stuff)

-  1:@iteminfo/@ii [Item ID|Part of item name] - Shows Item info (type, price, etc)

-  1:@whodrops [Item ID|Part of item name] - Shows who drops an item (mobs with highest drop rates)

-  1:@version - Displays SVN version of the server

-  1:@email <actual@email> <new@email> - to change your e-mail (characters protection)

-  1:@where [char name] - Tells you the location of a character

-  1:@time/@date/@server_date/@serverdate/@server_time/@servertime - Display the date/time of the server

- 10:@showexp - Displays/Hides Experience gained.

- 10:@showzeny - Displays/Hides Zeny gained.

- 10:@mobsearch [Mob ID|Monster Name] - Shows the location of a certain mob on the current map.

- 20:@who/@whois/@w [match_text] - Display a listing of who is online and their party/guild.

- 20:@who2 [match_text] - Display a listing of who is online and their job.

- 20:@who3 [match_text] - Display a listing of who is online and where.

- 20:@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map.

- 20:@whogm [match_text] - Like @who+@who2+who3, but only for GM.

- 40:@charcartlist <char name> - Displays all items of a player's cart.

- 60: 

- 60:@guildspy <guild_name/id> - You will receive all messages of the guild channel (Chat logging must be enabled)

- 60:@partyspy <party_name/id> - You will receive all messages of the party channel (Chat logging must be enabled)

- 99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).

-  1: 

-  1:--- CHANGE GM STATE CMD ---

-  1:@die - Kills yourself

- 10:@go <number/city_name> - Warps you to a city.

- 10:  -3: (Memo point 2)  1: morocc   5: izlude         9: yuno     13: niflheim

- 10:  -2: (Memo point 1)  2: geffen   6: aldebaran     10: amatsu   14: louyang

- 10:  -1: (Memo point 0)  3: payon    7: xmas (lutie)  11: gonryun  15: start point

- 10:   0: prontera        4: alberta  8: comodo        12: umbala   16: prison/jail

- 10: 

- 20:/shift/@jumpto/@warpto/@goto <char name> - Warps you to selected character

- 20:@follow <char_name> - follow a player

- 20:@mountpeco - Give/remove you a peco (Class is required, but not skill)

- 20:@disguise <monster_name_or_monster_ID> - Change your appearence to other players to a mob.

- 20:@undisguise - Restore your normal appearance.

- 20:@model <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence.

- 20:@size <1-3> Changes your size (1-Smallest 2-Biggest 3-Normal)

- 40:/hide/@hide - Makes you character invisible (GM invisibility). Type /hide or@hide again become visible.

- 40:@save - Sets respawn point to current spot

- 40:@load/@return - Warps you to your save point

- 40:/mm//mapmove/@warp/@rura/@mapmove <mapname> <x> <y> - Warps you to the selected position

- 40:@jump [x [y]]- Randomly warps you like a flywing.

- 40:@job/@jobchange <job ID> - Changes your job

- 40:   0: Novice           18: Alchemist      4015: Paladin

- 40:   1: Swordman         19: Bard           4016: Champion

- 40:   2: Mage             20: Dancer         4017: Professor

- 40:   3: Archer           23: Super Novice   4018: Stalker

- 40:   4: Acolyte        4001: High Novice    4019: Creator

- 40:   5: Merchant       4002: High Swordman  4020: Clown

- 40:   6: Thief          4003: High Mage      4021: Gypsy

- 40:   7: Knight         4004: High Archer    4046: Taekwon

- 40:   8: Priest         4005: High Acolyte   4047: Star Gladiator

- 40:   9: Wizard         4006: High Merchant  4049: Soul Linker

- 40:  10: Blacksmith     4007: High Thief     24: Gunslinger

- 40:  11: Hunter         4008: Lord Knight    25: Ninja

- 40:  12: Assassin       4009: High Priest

- 40:  14: Crusader       4010: High Wizard

- 40:  15: Monk           4011: Whitesmith

- 40:  16: Sage           4012: Sniper

- 40:  17: Rogue          4013: Assassin Cross

- 40: ---- Baby Classes ----

- 40: 4023: Baby          4024: Baby Swordman   4025: Baby Mage

- 40: 4026: Baby Archer   4027: Baby Acolyte    4028: Baby Merchant

- 40: 4029: Baby Thief    4030: Baby Knight     4031: Baby Priest

- 40: 4032: Baby Wizard   4033: Baby Blacksmith 4034: Baby Hunter

- 40: 4035: Baby Assassin 4037: Baby Crusader   4038: Baby Monk

- 40: 4039: Baby Sage     4040: Baby Rogue      4041: Baby Alchemist

- 40: 4042: Baby Bard     4043: Baby Dancer     4045: Super Baby

- 40: 

- 40:	<param1>      <param2>      <p3>(stackable)   <param3>               <param3>

- 40:	1 Petrified   (stackable)   01 Sight           32 Peco Peco riding   2048 Orc Head

- 40:	2 Frozen      01 Poison     02 Hide            64 GM Perfect Hide    4096 Wedding Sprites

- 40:	3 Stunned     02 Cursed     04 Cloak          128 Level 2 Cart       8192 Ruwach

- 40:	4 Sleeping    04 Silenced   08 Level 1 Cart   256 Level 3 Cart

- 40:	6 darkness    08 ???        16 Falcon         512 Level 4 Cart

- 40:	              16 darkness                    1024 Level 5 Cart

- 40:

- 40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.

- 40:@option <param1> <param2> <param3> - Adds different visual effects on or around your character

- 40:@dye/@ccolor <clothes color: 0-4> - Changes your characters appearence (only clothes color).

- 40:@hairstyle/@hstyle <hair ID: 0-17> - Changes your characters appearence (only hair style).

- 40:@haircolor/@hcolor <hair color: 0-8> - Changes your characters appearence (only hair color).

- 40:@speed <1-1000> - Changes you walking speed. 1 being the fastest and 1000 the slowest. Default 150.

- 40:@effect <effect_id> [flag] - Give an efect to your character.

- 40:@dropall - throws all your possession on the ground

- 40:@storeall - puts all your possessions in storage

- 40:@killable - make your character killable

- 40:@memo [memo_position] - set/change a memo location (no position: display memo points).

- 40:@spiritball <number: 1-1000> - Gives you "spirit spheres" like from the skill "Call Spirits"

- 40:	(If the number you use is > 1000, your server may become instable or crash)

- 40:@questskill <#> - Gives you the specified quest skill

- 40:@lostskill <#> - Takes away the specified quest skill from you

- 40:@skillid <name> - look up a skill by name

- 40:@useskill <skillid> <skillv> <target> - use a skill on target

- 40:  Novice                 Swordsman                  Thief                Merchant

- 40:  142 = Emergency Care   144 = Moving HP Recovery   149 = Throw Sand     153 = Cart Revolution

- 40:  143 = Act dead         145 = Attack Weak Point    150 = Back Sliding   154 = Change Cart

- 40:  Archer                 146 = Auto Berserk         151 = Take Stone     155 = Crazy Uproar/Loud Voice

- 40:  147 = Arrow Creation   Acolyte                    152 = Stone Throw    Magician

- 40:  148 = Charge Arrows    156 = Holy Light                                157 = Energy Coat

- 40: @skilltree <

- 40: @marry <player1>,<player2> - marry two players

- 40: @divorce <player>  - divorces the two players (you need just one name of them)

- 60:@alive - Revives yourself from death

- 60:@lvup/@blevel/@baselvlup <number of levels> - Raises your base level the desired number of levels. The max is 255 (User Defined).

- 60:@joblvup/@jlevel/@joblvlup <number of levels> -Raises your job level the desired number of levels. The max is 50 For Basic Classes. For Super Novice and Advanced Classes it is 70.

- 60:@allskill/@allskills/@skillall/@skillsall - Give you all skills.

- 60:@stpoint <number of points> - Gives you the desired number of stat points.

- 60:@skpoint <number of points> - Gives you the desired number of skill points.

- 60:@zeny <amount> - Gives you desired amount of Zeny.

- 60:@str,@agi,@vit,@int,@dex,@luk <amount> - Adds desired amount to any stat. For example "@str 10" raises your str by 10

- 60:@statall/@statsall/@allstats/@allstat [value] - Adds value in all stats (maximum if no value).

- 60: @addwarp <map name> <x coord> <y coord>

- 40: 

- 40:--- MONSTERS CMD ---

- 40:@killmonster2 - kill all monsters of your map (without drops)

- 50:/monster <monster_name> - Spawns 1 of the desired monster.

- 50:@spawn/@monster/@summon <monster_name_or_monster_ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]

- 50:@monster2 <desired_monster_name> <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]

- 50:@spawn/@monster/@summon/@monster2 "desired monster name" <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]

- 50:@spawn/@monster/@summon/@monster2 <monster_name_or_monster_ID> "desired monster name" [<number to spawn> [<x coord> [<y coord>]]]

- 50:	Spawns the desired monster with any desired name.

- 50:@monstersmall [Mob ID|Mob Name] - Spawns a smaller version of a monster.

- 50:@monsterbig [Mob ID|Mob Name] - Spawns a larger version of a monster.

- 60:@killmonster [map] - kill all monsters of the map (they drop)

- 40: 

- 10:--- MISC CMD ---

- 10:@autoloot [on|off|#] - Makes items go straight into your inventory.

- 10:@autotrade/@at - Allows you to vend while you are offline.

- 10:@changegm [Player Name] - Changes the leader of your guild (You must be guild leader)

- 10:@changeleader [Player Name] - Changes the leader of your party (You must be party leader)

- 20:@request [Message] - Sends a message to all connected GMs (via the gm whisper system)

- 40:@sound [Path way to file in Data or GRF file] - Plays a sound from the data or grf file located on the client.

- 50:@clone [Player Name] - Spawns a supportive clone of the given player.

- 50:@slaveclone [Player Name] - Spawns a supportive clone of the given player that follows the creator around.

- 50:@evilclone [Player Name] - Spawns an agressive clone of the given player.

- 60:@changesex - Changes your gender.

- 10: 

-  1:--- DUEL CMD ---

-  1:@duel - Starts a duel.

-  1:@invite - Invites a player to a duel.

-  1:@accept - Accepts an invitation to a duel.

-  1:@reject - Rejects an invitation to a duel.

-  1:@leave - Leaves a duel.

-  1: 

-  1:--- MAIL SYSTEM --- (SQL Only) (Must be enabled)

-  1:@checkmail - Check # of messages.

-  1:@listmail - List all messages.

-  1:@listnewmail - List only new mail.

-  1:@readmail - Read a message.

-  1:@sendmail - Send mail.

-  1:deletemail - Deletes a message.

+// put at first, the minimum level to display the line
+  1:To use one command, type it inside the message window where you usually type to chat.
+ 20:@h/@help - display this help guide.
+ 20:@h2/@help2 - displays the second help guide.
+  1: 
+  1:--- MESSAGE CMD ---
+  1:@main [on|off|message] - Turns on or off global chat (@main must be on to see global chat messages)
+  1:@noask - Auto rejects Deals/Invites
+ 20:@gmotd - Broadcasts the Message of The Day file to all players.
+ 20:@me <message> - Displays normal text as a message in this format: *name message* (like /me in mIRC)
+ 20:@fakename [Name] - Changes your name to your choice temporarly.
+ 20:@npctalk [NPC Name],[Message] - Forces a NPC to display a message in normal chat.
+ 40:/b/@broadcast <message> - Broadcasts a GM message with name of the GM (in yellow)
+ 40:/nb <message>/@kami <message> - Broadcasts a GM message without name of the GM (in yellow)
+ 40:@kamib <message> - Broadcasts a GM message without name of the GM (in blue)
+ 40:/lb/@localbroadcast <message> - Broadcasts a GM message with name of the GM (in yellow) ONLY on your map
+ 40:/nlb <message> - Broadcasts a GM message without name of the GM (in yellow) ONLY on your map
+  1: 
+  1:--- INFORMATION CMD ---
+  1:@commands - Displays a list of commands that you can use.
+  1:@rates - Displays the server's current rates.
+  1:@uptime - Displays how long the server has been online.
+  1:@showdelay - Shows/Hides the "there is a delay after this skill" message.
+  1:@exp - Displays current levels and % progress
+  1:@mobinfo/@monsterinfo/@mi [Mob ID|Part of monster name] - Shows Monster Info (rates, stats, drops, MVP stuff)
+  1:@iteminfo/@ii [Item ID|Part of item name] - Shows Item info (type, price, etc)
+  1:@whodrops [Item ID|Part of item name] - Shows who drops an item (mobs with highest drop rates)
+  1:@version - Displays SVN version of the server
+  1:@email <actual@email> <new@email> - to change your e-mail (characters protection)
+  1:@where [char name] - Tells you the location of a character
+  1:@time/@date/@server_date/@serverdate/@server_time/@servertime - Display the date/time of the server
+ 10:@showexp - Displays/Hides Experience gained.
+ 10:@showzeny - Displays/Hides Zeny gained.
+ 10:@mobsearch [Mob ID|Monster Name] - Shows the location of a certain mob on the current map.
+ 20:@who/@whois/@w [match_text] - Display a listing of who is online and their party/guild.
+ 20:@who2 [match_text] - Display a listing of who is online and their job.
+ 20:@who3 [match_text] - Display a listing of who is online and where.
+ 20:@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map.
+ 20:@whogm [match_text] - Like @who+@who2+who3, but only for GM.
+ 40:@charcartlist <char name> - Displays all items of a player's cart.
+ 60: 
+ 60:@guildspy <guild_name/id> - You will receive all messages of the guild channel (Chat logging must be enabled)
+ 60:@partyspy <party_name/id> - You will receive all messages of the party channel (Chat logging must be enabled)
+ 99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).
+  1: 
+  1:--- CHANGE GM STATE CMD ---
+  1:@die - Kills yourself
+ 10:@go <number/city_name> - Warps you to a city.
+ 10:  -3: (Memo point 2)  1: morocc   5: izlude         9: yuno     13: niflheim
+ 10:  -2: (Memo point 1)  2: geffen   6: aldebaran     10: amatsu   14: louyang
+ 10:  -1: (Memo point 0)  3: payon    7: xmas (lutie)  11: gonryun  15: start point
+ 10:   0: prontera        4: alberta  8: comodo        12: umbala   16: prison/jail
+ 10: 
+ 20:/shift/@jumpto/@warpto/@goto <char name> - Warps you to selected character
+ 20:@follow <char_name> - follow a player
+ 20:@mountpeco - Give/remove you a peco (Class is required, but not skill)
+ 20:@disguise <monster_name_or_monster_ID> - Change your appearence to other players to a mob.
+ 20:@undisguise - Restore your normal appearance.
+ 20:@model <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence.
+ 20:@size <1-3> Changes your size (1-Smallest 2-Biggest 3-Normal)
+ 40:/hide/@hide - Makes you character invisible (GM invisibility). Type /hide or@hide again become visible.
+ 40:@save - Sets respawn point to current spot
+ 40:@load/@return - Warps you to your save point
+ 40:/mm//mapmove/@warp/@rura/@mapmove <mapname> <x> <y> - Warps you to the selected position
+ 40:@jump [x [y]]- Randomly warps you like a flywing.
+ 40:@job/@jobchange <job ID> - Changes your job
+ 40:   0: Novice           18: Alchemist      4015: Paladin
+ 40:   1: Swordman         19: Bard           4016: Champion
+ 40:   2: Mage             20: Dancer         4017: Professor
+ 40:   3: Archer           23: Super Novice   4018: Stalker
+ 40:   4: Acolyte        4001: High Novice    4019: Creator
+ 40:   5: Merchant       4002: High Swordman  4020: Clown
+ 40:   6: Thief          4003: High Mage      4021: Gypsy
+ 40:   7: Knight         4004: High Archer    4046: Taekwon
+ 40:   8: Priest         4005: High Acolyte   4047: Star Gladiator
+ 40:   9: Wizard         4006: High Merchant  4049: Soul Linker
+ 40:  10: Blacksmith     4007: High Thief     24: Gunslinger
+ 40:  11: Hunter         4008: Lord Knight    25: Ninja
+ 40:  12: Assassin       4009: High Priest
+ 40:  14: Crusader       4010: High Wizard
+ 40:  15: Monk           4011: Whitesmith
+ 40:  16: Sage           4012: Sniper
+ 40:  17: Rogue          4013: Assassin Cross
+ 40: ---- Baby Classes ----
+ 40: 4023: Baby          4024: Baby Swordman   4025: Baby Mage
+ 40: 4026: Baby Archer   4027: Baby Acolyte    4028: Baby Merchant
+ 40: 4029: Baby Thief    4030: Baby Knight     4031: Baby Priest
+ 40: 4032: Baby Wizard   4033: Baby Blacksmith 4034: Baby Hunter
+ 40: 4035: Baby Assassin 4037: Baby Crusader   4038: Baby Monk
+ 40: 4039: Baby Sage     4040: Baby Rogue      4041: Baby Alchemist
+ 40: 4042: Baby Bard     4043: Baby Dancer     4045: Super Baby
+ 40: 
+ 40:	<param1>      <param2>      <p3>(stackable)   <param3>               <param3>
+ 40:	1 Petrified   (stackable)   01 Sight           32 Peco Peco riding   2048 Orc Head
+ 40:	2 Frozen      01 Poison     02 Hide            64 GM Perfect Hide    4096 Wedding Sprites
+ 40:	3 Stunned     02 Cursed     04 Cloak          128 Level 2 Cart       8192 Ruwach
+ 40:	4 Sleeping    04 Silenced   08 Level 1 Cart   256 Level 3 Cart
+ 40:	6 darkness    08 ???        16 Falcon         512 Level 4 Cart
+ 40:	              16 darkness                    1024 Level 5 Cart
+ 40:
+ 40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.
+ 40:@option <param1> <param2> <param3> - Adds different visual effects on or around your character
+ 40:@dye/@ccolor <clothes color: 0-4> - Changes your characters appearence (only clothes color).
+ 40:@hairstyle/@hstyle <hair ID: 0-17> - Changes your characters appearence (only hair style).
+ 40:@haircolor/@hcolor <hair color: 0-8> - Changes your characters appearence (only hair color).
+ 40:@speed <1-1000> - Changes you walking speed. 1 being the fastest and 1000 the slowest. Default 150.
+ 40:@effect <effect_id> [flag] - Give an efect to your character.
+ 40:@dropall - throws all your possession on the ground
+ 40:@storeall - puts all your possessions in storage
+ 40:@killable - make your character killable
+ 40:@memo [memo_position] - set/change a memo location (no position: display memo points).
+ 40:@spiritball <number: 1-1000> - Gives you "spirit spheres" like from the skill "Call Spirits"
+ 40:	(If the number you use is > 1000, your server may become instable or crash)
+ 40:@questskill <#> - Gives you the specified quest skill
+ 40:@lostskill <#> - Takes away the specified quest skill from you
+ 40:@skillid <name> - look up a skill by name
+ 40:@useskill <skillid> <skillv> <target> - use a skill on target
+ 40:  Novice                 Swordsman                  Thief                Merchant
+ 40:  142 = Emergency Care   144 = Moving HP Recovery   149 = Throw Sand     153 = Cart Revolution
+ 40:  143 = Act dead         145 = Attack Weak Point    150 = Back Sliding   154 = Change Cart
+ 40:  Archer                 146 = Auto Berserk         151 = Take Stone     155 = Crazy Uproar/Loud Voice
+ 40:  147 = Arrow Creation   Acolyte                    152 = Stone Throw    Magician
+ 40:  148 = Charge Arrows    156 = Holy Light                                157 = Energy Coat
+ 40: @skilltree <
+ 40: @marry <player1>,<player2> - marry two players
+ 40: @divorce <player>  - divorces the two players (you need just one name of them)
+ 60:@alive - Revives yourself from death
+ 60:@lvup/@blevel/@baselvlup <number of levels> - Raises your base level the desired number of levels. The max is 255 (User Defined).
+ 60:@joblvup/@jlevel/@joblvlup <number of levels> -Raises your job level the desired number of levels. The max is 50 For Basic Classes. For Super Novice and Advanced Classes it is 70.
+ 60:@allskill/@allskills/@skillall/@skillsall - Give you all skills.
+ 60:@stpoint <number of points> - Gives you the desired number of stat points.
+ 60:@skpoint <number of points> - Gives you the desired number of skill points.
+ 60:@zeny <amount> - Gives you desired amount of Zeny.
+ 60:@str,@agi,@vit,@int,@dex,@luk <amount> - Adds desired amount to any stat. For example "@str 10" raises your str by 10
+ 60:@statall/@statsall/@allstats/@allstat [value] - Adds value in all stats (maximum if no value).
+ 60: @addwarp <map name> <x coord> <y coord>
+ 40: 
+ 40:--- MONSTERS CMD ---
+ 40:@killmonster2 - kill all monsters of your map (without drops)
+ 50:/monster <monster_name> - Spawns 1 of the desired monster.
+ 50:@spawn/@monster/@summon <monster_name_or_monster_ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]
+ 50:@monster2 <desired_monster_name> <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
+ 50:@spawn/@monster/@summon/@monster2 "desired monster name" <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
+ 50:@spawn/@monster/@summon/@monster2 <monster_name_or_monster_ID> "desired monster name" [<number to spawn> [<x coord> [<y coord>]]]
+ 50:	Spawns the desired monster with any desired name.
+ 50:@monstersmall [Mob ID|Mob Name] - Spawns a smaller version of a monster.
+ 50:@monsterbig [Mob ID|Mob Name] - Spawns a larger version of a monster.
+ 60:@killmonster [map] - kill all monsters of the map (they drop)
+ 40: 
+ 10:--- MISC CMD ---
+ 10:@autoloot [on|off|#] - Makes items go straight into your inventory.
+ 10:@autotrade/@at - Allows you to vend while you are offline.
+ 10:@changegm [Player Name] - Changes the leader of your guild (You must be guild leader)
+ 10:@changeleader [Player Name] - Changes the leader of your party (You must be party leader)
+ 20:@request [Message] - Sends a message to all connected GMs (via the gm whisper system)
+ 40:@sound [Path way to file in Data or GRF file] - Plays a sound from the data or grf file located on the client.
+ 50:@clone [Player Name] - Spawns a supportive clone of the given player.
+ 50:@slaveclone [Player Name] - Spawns a supportive clone of the given player that follows the creator around.
+ 50:@evilclone [Player Name] - Spawns an agressive clone of the given player.
+ 60:@changesex - Changes your gender.
+ 10: 
+  1:--- DUEL CMD ---
+  1:@duel - Starts a duel.
+  1:@invite - Invites a player to a duel.
+  1:@accept - Accepts an invitation to a duel.
+  1:@reject - Rejects an invitation to a duel.
+  1:@leave - Leaves a duel.
+  1: 
+  1:--- MAIL SYSTEM --- (SQL Only) (Must be enabled)
+  1:@checkmail - Check # of messages.
+  1:@listmail - List all messages.
+  1:@listnewmail - List only new mail.
+  1:@readmail - Read a message.
+  1:@sendmail - Send mail.
+  1:deletemail - Deletes a message.
  80:@sendprioritymail - Sends priority mail (cannot be deleted until read)
\ No newline at end of file
diff --git a/conf-tmpl/help2.txt b/conf-tmpl/help2.txt
index a79262aeb..ff5bebd9f 100644
--- a/conf-tmpl/help2.txt
+++ b/conf-tmpl/help2.txt
@@ -1,95 +1,95 @@
-  0:To use one command, type it inside the message window where you usually type to chat.

-  1:--- ITEMS CMD ---

-  1:@storage - Opens storage

- 40:@itemreset - Remove all your items.

- 50:@gstorage - Opens guild storage

- 60:@itemcheck - Check your items with authorised items.

- 60:@idsearch <part_of_item_name> - Search all items that name have part_of_item_name

- 60:@refine <equip position> <+/- amount>

- 60:@produce <equip name or equip ID> <element> <# of very's>

- 60:	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind

- 60:	You can add up to 3 Star Crumbs and 1 element

- 60:@repairall - Repair all items of your inventory

- 60:/item <item_name> - Gives you 1 of the desired item.

- 60:@item <item name or ID> <quantity> - Gives you the desired item.

- 60:@item2 <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4> - Gives you the desired item.

- 40: 

- 40:--- PVP CMD ---

- 40:@pvpon - Turns pvp on on the current map

- 40:@pvpoff - Turns pvp off on the current map

- 40:@gvgon/@gpvpon - Turns gvg on on the current map

- 40:@gvgoff/@gpvpoff - Turns gvg off on the current map

- 60:@agitstart - Starts War of Emperium

- 60:@agitend - End War of Emperium

-  1: 

-  1:--- GROUPS CMD ---

-  1:@party <party_name> - Create a party.

- 50:@guild <guild_name> - Create a guild.

- 60:@guildlvup/@guildlvlup <# of levels> - Raise Guild by desired number of levels

- 60:@guildrecall <guild_name/id> - Warps all online characters of a guild to you.

- 60:@partyrecall <party_name/id> - Warps all online characters of a party to you.

-  1: 

-  1:--- PETS CMD ---

-  1:@petrename - Re-enable pet rename

- 10:@pettalk [Message] - Makes your pet say a message.

- 40:@petfriendly <#> - Set pet friendly amount (0-1000) 1000 = Max

- 40:@pethungry <#> - Set pet hungry amount (0-100) 100 = Max

- 60:@hatch - Create a pet from your inventory eggs list.

- 60:@makeegg <pet_id> - Gives pet egg for monster number in pet DB

- 20: 

- 20:--- REMOTE CHAR CMD ---

- 20:@kick <char name> - Kicks specified character off the server

- 40:@charkillable <char name> - make another character killable

- 60:@unjail/@discharge <char name> - Discharges specified character/prisoner

- 60:@kill <char name> - Kills specified character.

- 60:@chardropall <char name> - throws all a chars possession on the ground

- 60:@charstoreall <char name> - puts all of anothers charactes possessions in storage

- 60:/recall/@recall <char name> - Warps target character to you.

- 60:@revive <char name> - Revives target character.

- 60:@charblock/@block <char name> - Blocks definitively a account

- 60:@charunblock/@unblock <char name> - Unblocks a account

- 60:@charban/@ban/@banish/@charbanish <time> <name> - Ban temporarily a account

- 60:	time usage: adjustement (+/- value) and element (y/a, m, d/j, h, mn, s)

- 60:	Example: @ban +1m-2mn1s-6y testplayer

- 60:@charunban/@unban/@unbanish/@charunbanish <name> - Unban a account

- 60:@jail <char name> - Sends specified character in jails

- 60:@trade <char name> - Open a trade window with a another player

- 80:@recallall - Warps every character online to you.

- 80:@doom - Kills all NON GM chars on the server.

- 80:@doommap - Kills all non GM characters on the map.

- 80:@raise - Resurrects all characters on the server.

- 80:@raisemap - Resurrects all characters on the map.

- 80: 

- 80:--- ENVIRONMENT CMD ---

- 80:@night - Uses @option 00 16 00 on all characters. All characters are in darkness.

- 80:@day - Uses @option 00 00 00 on all characters.

- 80:@skillon - turn skills on for a map

- 80:@skilloff - turn skills on for a map

- 99:@rain - Makes all maps to have the rain weather effect.

- 99:@snow - Makes all maps to have the snow weather effect.

- 99:@clouds - Makes all maps to have the cloudy weather effect.

- 99:@clouds2 - Makes all maps to have another cloudy weather effect.

- 99:@fog - Makes all maps to have the fog weather effect.

- 99:@fireworks - Makes all maps to have the fireworks weather effect.

- 99:@sakura - Makes all maps to have the sakura weather effect.

- 99:@leaves - Makes all maps to have the leaves weather effect.

- 80: 

- 80:--- ADMIN CMD ---

- 80:@shownpc <NPC name> - Enable a NPC

- 80:@hidenpc <NPC name> - Disable a NPC

- 80:@loadnpc <path to script> - Load script

- 80:@unloadnpc <NPC name> - Unload script

- 99:@adjgmlvl <level> <char name> - Do a temporary adjustment of the GM level of a player

- 99:@adjcmdlvl <level> <command> - Do a temporary adjustment of the GM level of a command

- 99:@kickall - Kick all characters off the server

- 99:@mapexit - Kick all players and shut down map-server.

- 99:@reloaditemdb - Reload item database.

- 99:@reloadmobdb - Reload monster database.

- 99:@reloadskilldb - Reload skills definition database.

- 99:@reloadscript - Reload all scripts.

- 99:@reloadgmdb - Reload GM levels.

- 99: 

- 99:@gat - For debugging (you inspect around gat)

- 99:@packet - For debugging (packet variety)

-100:@nuke <char name> -

+  0:To use one command, type it inside the message window where you usually type to chat.
+  1:--- ITEMS CMD ---
+  1:@storage - Opens storage
+ 40:@itemreset - Remove all your items.
+ 50:@gstorage - Opens guild storage
+ 60:@itemcheck - Check your items with authorised items.
+ 60:@idsearch <part_of_item_name> - Search all items that name have part_of_item_name
+ 60:@refine <equip position> <+/- amount>
+ 60:@produce <equip name or equip ID> <element> <# of very's>
+ 60:	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind
+ 60:	You can add up to 3 Star Crumbs and 1 element
+ 60:@repairall - Repair all items of your inventory
+ 60:/item <item_name> - Gives you 1 of the desired item.
+ 60:@item <item name or ID> <quantity> - Gives you the desired item.
+ 60:@item2 <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4> - Gives you the desired item.
+ 40: 
+ 40:--- PVP CMD ---
+ 40:@pvpon - Turns pvp on on the current map
+ 40:@pvpoff - Turns pvp off on the current map
+ 40:@gvgon/@gpvpon - Turns gvg on on the current map
+ 40:@gvgoff/@gpvpoff - Turns gvg off on the current map
+ 60:@agitstart - Starts War of Emperium
+ 60:@agitend - End War of Emperium
+  1: 
+  1:--- GROUPS CMD ---
+  1:@party <party_name> - Create a party.
+ 50:@guild <guild_name> - Create a guild.
+ 60:@guildlvup/@guildlvlup <# of levels> - Raise Guild by desired number of levels
+ 60:@guildrecall <guild_name/id> - Warps all online characters of a guild to you.
+ 60:@partyrecall <party_name/id> - Warps all online characters of a party to you.
+  1: 
+  1:--- PETS CMD ---
+  1:@petrename - Re-enable pet rename
+ 10:@pettalk [Message] - Makes your pet say a message.
+ 40:@petfriendly <#> - Set pet friendly amount (0-1000) 1000 = Max
+ 40:@pethungry <#> - Set pet hungry amount (0-100) 100 = Max
+ 60:@hatch - Create a pet from your inventory eggs list.
+ 60:@makeegg <pet_id> - Gives pet egg for monster number in pet DB
+ 20: 
+ 20:--- REMOTE CHAR CMD ---
+ 20:@kick <char name> - Kicks specified character off the server
+ 40:@charkillable <char name> - make another character killable
+ 60:@unjail/@discharge <char name> - Discharges specified character/prisoner
+ 60:@kill <char name> - Kills specified character.
+ 60:@chardropall <char name> - throws all a chars possession on the ground
+ 60:@charstoreall <char name> - puts all of anothers charactes possessions in storage
+ 60:/recall/@recall <char name> - Warps target character to you.
+ 60:@revive <char name> - Revives target character.
+ 60:@charblock/@block <char name> - Blocks definitively a account
+ 60:@charunblock/@unblock <char name> - Unblocks a account
+ 60:@charban/@ban/@banish/@charbanish <time> <name> - Ban temporarily a account
+ 60:	time usage: adjustement (+/- value) and element (y/a, m, d/j, h, mn, s)
+ 60:	Example: @ban +1m-2mn1s-6y testplayer
+ 60:@charunban/@unban/@unbanish/@charunbanish <name> - Unban a account
+ 60:@jail <char name> - Sends specified character in jails
+ 60:@trade <char name> - Open a trade window with a another player
+ 80:@recallall - Warps every character online to you.
+ 80:@doom - Kills all NON GM chars on the server.
+ 80:@doommap - Kills all non GM characters on the map.
+ 80:@raise - Resurrects all characters on the server.
+ 80:@raisemap - Resurrects all characters on the map.
+ 80: 
+ 80:--- ENVIRONMENT CMD ---
+ 80:@night - Uses @option 00 16 00 on all characters. All characters are in darkness.
+ 80:@day - Uses @option 00 00 00 on all characters.
+ 80:@skillon - turn skills on for a map
+ 80:@skilloff - turn skills on for a map
+ 99:@rain - Makes all maps to have the rain weather effect.
+ 99:@snow - Makes all maps to have the snow weather effect.
+ 99:@clouds - Makes all maps to have the cloudy weather effect.
+ 99:@clouds2 - Makes all maps to have another cloudy weather effect.
+ 99:@fog - Makes all maps to have the fog weather effect.
+ 99:@fireworks - Makes all maps to have the fireworks weather effect.
+ 99:@sakura - Makes all maps to have the sakura weather effect.
+ 99:@leaves - Makes all maps to have the leaves weather effect.
+ 80: 
+ 80:--- ADMIN CMD ---
+ 80:@shownpc <NPC name> - Enable a NPC
+ 80:@hidenpc <NPC name> - Disable a NPC
+ 80:@loadnpc <path to script> - Load script
+ 80:@unloadnpc <NPC name> - Unload script
+ 99:@adjgmlvl <level> <char name> - Do a temporary adjustment of the GM level of a player
+ 99:@adjcmdlvl <level> <command> - Do a temporary adjustment of the GM level of a command
+ 99:@kickall - Kick all characters off the server
+ 99:@mapexit - Kick all players and shut down map-server.
+ 99:@reloaditemdb - Reload item database.
+ 99:@reloadmobdb - Reload monster database.
+ 99:@reloadskilldb - Reload skills definition database.
+ 99:@reloadscript - Reload all scripts.
+ 99:@reloadgmdb - Reload GM levels.
+ 99: 
+ 99:@gat - For debugging (you inspect around gat)
+ 99:@packet - For debugging (packet variety)
+100:@nuke <char name> -
 100:@GM <password> - it becomes GM! (password is set in login_athena.conf)
\ No newline at end of file
diff --git a/conf-tmpl/inter_athena.conf b/conf-tmpl/inter_athena.conf
index 7b6948c68..6b4db55b1 100644
--- a/conf-tmpl/inter_athena.conf
+++ b/conf-tmpl/inter_athena.conf
@@ -1,171 +1,171 @@
-// Athena InterServer configuration.

-

-// TXT version options only

-

-// Storage flatfile database, used for Karfa storage.

-storage_txt: save/storage.txt

-

-// Party flatfile database, for party names, members and other party info.

-party_txt: save/party.txt

-

-// Guild flatfile database, for guild names, members, and other guild info.

-guild_txt: save/guild.txt

-

-// Pet flatfile database, for pet names, and other pet info.

-pet_txt: save/pet.txt

-

-// Homunculus flatfile database, for homunculus information.

-homun_txt: save/homun.txt

-

-// Castle flatfile database, for emperium war castles, etc.

-castle_txt: save/castle.txt

-

-// Status change flatfile database, for status changes that are saved between sessions.

-scdata_txt: save/scdata.txt

-

-// Options for both versions

-

-// Log Inter Connections, etc.?

-log_inter: 1

-

-// Inter Log Filename

-inter_log_filename: log/inter.log

-

-// Level range for sharing within a party

-party_share_level: 10

-

-// SQL version options only

-

-// Char-Save method

-// 0 = saves over the charserver [default]

-// 1 = map server saves character data (reduces strain on the charserver)

-// NOTE: Feature still somewhat experimental, needs more testing.

-// WARNING: Don't use it in multi char/map or customized table names config.

-charsave_method: 0

-

-// GM Reading Method

-// 1 to have Char read GMs, 0 to have Login-controlled GMs

-gm_read_method: 0

-

-// The level at which a player with access is considered a GM. 

-// An account with an access level lower than this is not effected

-// by gm_can_drop_lv (battle_athena.conf). 

-lowest_gm_level: 1

-

-// You can specify the codepage to use in your mySQL tables here.

-// (Note that this feature requires MySQL 4.1+)

-//default_codepage: 

-

-// Interval (in hours) at which servers do a ping on all sql-connections

-// to keep them alive (the default mysql settings makes a connection time-out

-// after 8 hours of inactivity).

-// 0 disables (default). Enable it only if you are getting

-// "MySQL server has gone Away" errors due to lack of activity on your server

-connection_ping_interval: 7

-

-// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1 

-// Under windows, you want to use 127.0.0.1.  If you see a message like

-// "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"

-// and you have localhost, switch it to 127.0.0.1

-

-// MySQL Login SQL Server

-login_server_ip: 127.0.0.1

-login_server_port: 3306

-login_server_id: ragnarok

-login_server_pw: ragnarok

-login_server_db: ragnarok

-

-// MySQL Character SQL server

-char_server_ip: 127.0.0.1

-char_server_port: 3306

-char_server_id: ragnarok

-char_server_pw: ragnarok

-char_server_db: ragnarok

-

-// MySQL Map SQL Server

-map_server_ip: 127.0.0.1

-map_server_port: 3306

-map_server_id: ragnarok

-map_server_pw: ragnarok

-map_server_db: ragnarok

-

-// MySQL Log SQL Database

-log_db_ip: 127.0.0.1

-log_db_port: 3306

-log_db_id: ragnarok

-log_db_pw: ragnarok

-log_db: log

-

-// MySQL Mail SQL Server

-mail_server_ip: 127.0.0.1

-mail_server_port: 3306

-mail_server_id: ragnarok

-mail_server_pw: ragnarok

-mail_server_db: ragnarok

-

-// for TXT -> SQL convertors

-db_server_ip: 127.0.0.1

-db_server_port: 3306

-db_server_id: ragnarok

-db_server_pw: ragnarok

-db_server_logindb: ragnarok

-

-// DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL

-// this is meant for people who KNOW their stuff, and for some reason want to change their

-// database layout. [CLOWNISIUS]

-

-//Column names for the login table.

-login_db_account_id: account_id

-login_db_userid: userid

-login_db_user_pass: user_pass

-login_db_level: level

-

-// ALL MySQL Database Table names

-

-// Login Database Tables

-login_db: login

-loginlog_db: loginlog

-

-// Character Database Tables

-char_db: char

-scdata_db: sc_data

-cart_db: cart_inventory

-inventory_db: inventory

-charlog_db: charlog

-storage_db: storage

-reg_db: global_reg_value

-skill_db: skill

-interlog_db: interlog

-memo_db: memo

-guild_db: guild

-guild_alliance_db: guild_alliance

-guild_castle_db: guild_castle

-guild_expulsion_db: guild_expulsion

-guild_member_db: guild_member

-guild_skill_db: guild_skill

-guild_position_db: guild_position

-guild_storage_db: guild_storage

-party_db: party

-pet_db: pet

-friend_db: friends

-

-// Map Database Tables

-item_db_db: item_db

-item_db2_db: item_db2

-mob_db_db: mob_db

-mob_db2_db: mob_db2

-

-// Mail Database Table

-mail_db: mail

-

-//Use SQL item_db and mob_db for the map server

-use_sql_db: no

-

-// Use SQL Mail Server

-mail_server_enable: no

-

-// Nick for sending mainchat 

-// messages like whisper

-main_chat_nick: Main

-

-import: conf/import/inter_conf.txt

+// Athena InterServer configuration.
+
+// TXT version options only
+
+// Storage flatfile database, used for Karfa storage.
+storage_txt: save/storage.txt
+
+// Party flatfile database, for party names, members and other party info.
+party_txt: save/party.txt
+
+// Guild flatfile database, for guild names, members, and other guild info.
+guild_txt: save/guild.txt
+
+// Pet flatfile database, for pet names, and other pet info.
+pet_txt: save/pet.txt
+
+// Homunculus flatfile database, for homunculus information.
+homun_txt: save/homun.txt
+
+// Castle flatfile database, for emperium war castles, etc.
+castle_txt: save/castle.txt
+
+// Status change flatfile database, for status changes that are saved between sessions.
+scdata_txt: save/scdata.txt
+
+// Options for both versions
+
+// Log Inter Connections, etc.?
+log_inter: 1
+
+// Inter Log Filename
+inter_log_filename: log/inter.log
+
+// Level range for sharing within a party
+party_share_level: 10
+
+// SQL version options only
+
+// Char-Save method
+// 0 = saves over the charserver [default]
+// 1 = map server saves character data (reduces strain on the charserver)
+// NOTE: Feature still somewhat experimental, needs more testing.
+// WARNING: Don't use it in multi char/map or customized table names config.
+charsave_method: 0
+
+// GM Reading Method
+// 1 to have Char read GMs, 0 to have Login-controlled GMs
+gm_read_method: 0
+
+// The level at which a player with access is considered a GM. 
+// An account with an access level lower than this is not effected
+// by gm_can_drop_lv (battle_athena.conf). 
+lowest_gm_level: 1
+
+// You can specify the codepage to use in your mySQL tables here.
+// (Note that this feature requires MySQL 4.1+)
+//default_codepage: 
+
+// Interval (in hours) at which servers do a ping on all sql-connections
+// to keep them alive (the default mysql settings makes a connection time-out
+// after 8 hours of inactivity).
+// 0 disables (default). Enable it only if you are getting
+// "MySQL server has gone Away" errors due to lack of activity on your server
+connection_ping_interval: 7
+
+// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1 
+// Under windows, you want to use 127.0.0.1.  If you see a message like
+// "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"
+// and you have localhost, switch it to 127.0.0.1
+
+// MySQL Login SQL Server
+login_server_ip: 127.0.0.1
+login_server_port: 3306
+login_server_id: ragnarok
+login_server_pw: ragnarok
+login_server_db: ragnarok
+
+// MySQL Character SQL server
+char_server_ip: 127.0.0.1
+char_server_port: 3306
+char_server_id: ragnarok
+char_server_pw: ragnarok
+char_server_db: ragnarok
+
+// MySQL Map SQL Server
+map_server_ip: 127.0.0.1
+map_server_port: 3306
+map_server_id: ragnarok
+map_server_pw: ragnarok
+map_server_db: ragnarok
+
+// MySQL Log SQL Database
+log_db_ip: 127.0.0.1
+log_db_port: 3306
+log_db_id: ragnarok
+log_db_pw: ragnarok
+log_db: log
+
+// MySQL Mail SQL Server
+mail_server_ip: 127.0.0.1
+mail_server_port: 3306
+mail_server_id: ragnarok
+mail_server_pw: ragnarok
+mail_server_db: ragnarok
+
+// for TXT -> SQL convertors
+db_server_ip: 127.0.0.1
+db_server_port: 3306
+db_server_id: ragnarok
+db_server_pw: ragnarok
+db_server_logindb: ragnarok
+
+// DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL
+// this is meant for people who KNOW their stuff, and for some reason want to change their
+// database layout. [CLOWNISIUS]
+
+//Column names for the login table.
+login_db_account_id: account_id
+login_db_userid: userid
+login_db_user_pass: user_pass
+login_db_level: level
+
+// ALL MySQL Database Table names
+
+// Login Database Tables
+login_db: login
+loginlog_db: loginlog
+
+// Character Database Tables
+char_db: char
+scdata_db: sc_data
+cart_db: cart_inventory
+inventory_db: inventory
+charlog_db: charlog
+storage_db: storage
+reg_db: global_reg_value
+skill_db: skill
+interlog_db: interlog
+memo_db: memo
+guild_db: guild
+guild_alliance_db: guild_alliance
+guild_castle_db: guild_castle
+guild_expulsion_db: guild_expulsion
+guild_member_db: guild_member
+guild_skill_db: guild_skill
+guild_position_db: guild_position
+guild_storage_db: guild_storage
+party_db: party
+pet_db: pet
+friend_db: friends
+
+// Map Database Tables
+item_db_db: item_db
+item_db2_db: item_db2
+mob_db_db: mob_db
+mob_db2_db: mob_db2
+
+// Mail Database Table
+mail_db: mail
+
+//Use SQL item_db and mob_db for the map server
+use_sql_db: no
+
+// Use SQL Mail Server
+mail_server_enable: no
+
+// Nick for sending mainchat 
+// messages like whisper
+main_chat_nick: Main
+
+import: conf/import/inter_conf.txt
diff --git a/conf-tmpl/irc_athena.conf b/conf-tmpl/irc_athena.conf
index 2929966d9..c55b9c2c0 100644
--- a/conf-tmpl/irc_athena.conf
+++ b/conf-tmpl/irc_athena.conf
@@ -1,42 +1,42 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------

-// eAthena IRC Bot Configuration File

-//--------------------------------------------------------

-

-//Turn the IRC Bot 'on' or 'off'

-use_irc: off

-

-//IRC Server Address

-irc_server: irc.deltaanime.net

-

-//IRC Server Port

-irc_port: 6667

-

-//Autojoin channel when kicked (on=1,off=0)

-irc_autojoin: 0

-

-//IRC Channel

-irc_channel: #

-

-//IRC Channel password (set if required)

-//irc_channel_pass: 

-

-//IRC Trade Channel

-irc_trade_channel: #

-

-//IRC Nickname

-irc_nick: 

-

-//IRC Password ("0" for no pass)

-irc_pass: 0

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------
+// eAthena IRC Bot Configuration File
+//--------------------------------------------------------
+
+//Turn the IRC Bot 'on' or 'off'
+use_irc: off
+
+//IRC Server Address
+irc_server: irc.deltaanime.net
+
+//IRC Server Port
+irc_port: 6667
+
+//Autojoin channel when kicked (on=1,off=0)
+irc_autojoin: 0
+
+//IRC Channel
+irc_channel: #
+
+//IRC Channel password (set if required)
+//irc_channel_pass: 
+
+//IRC Trade Channel
+irc_trade_channel: #
+
+//IRC Nickname
+irc_nick: 
+
+//IRC Password ("0" for no pass)
+irc_pass: 0
diff --git a/conf-tmpl/ladmin_athena.conf b/conf-tmpl/ladmin_athena.conf
index ba9f11c0a..dafd72388 100644
--- a/conf-tmpl/ladmin_athena.conf
+++ b/conf-tmpl/ladmin_athena.conf
@@ -1,33 +1,33 @@
-// Athena Ladmin configuration file.

- 

-// Login Server IP

-login_ip:127.0.0.1

-// Login Server Port

-login_port: 6900

-

-// Administrative password, used to connect remotely to server.

-// NOTICE: If you enable remote administration, you should change its value for security

-admin_pass: admin

-

-// Encoding type of the password

-// 0: not encoded

-// 1: key+password

-// 2: password+key

-passenc: 2

-

-// Language of ladmin

-// F: Fran軋is

-// E: English (default)

-defaultlanguage: E

-

-// Log Filename. All operations done by the software are logged in this file.

-ladmin_log_filename: log/ladmin.log

-

-// Indicate how to display date in logs, to players, etc.

-// 0: 31-12-2004 23:59:59

-// 1: 12-31-2004 23:59:59

-// 2: 2004-31-12 23:59:59

-// 3: 2004-12-31 23:59:59 (default)

-date_format: 3

-

-import: conf/import/ladmin_conf.txt

+// Athena Ladmin configuration file.
+ 
+// Login Server IP
+login_ip:127.0.0.1
+// Login Server Port
+login_port: 6900
+
+// Administrative password, used to connect remotely to server.
+// NOTICE: If you enable remote administration, you should change its value for security
+admin_pass: admin
+
+// Encoding type of the password
+// 0: not encoded
+// 1: key+password
+// 2: password+key
+passenc: 2
+
+// Language of ladmin
+// F: Fran軋is
+// E: English (default)
+defaultlanguage: E
+
+// Log Filename. All operations done by the software are logged in this file.
+ladmin_log_filename: log/ladmin.log
+
+// Indicate how to display date in logs, to players, etc.
+// 0: 31-12-2004 23:59:59
+// 1: 12-31-2004 23:59:59
+// 2: 2004-31-12 23:59:59
+// 3: 2004-12-31 23:59:59 (default)
+date_format: 3
+
+import: conf/import/ladmin_conf.txt
diff --git a/conf-tmpl/log_athena.conf b/conf-tmpl/log_athena.conf
index 1b9242cb9..f55394cc5 100644
--- a/conf-tmpl/log_athena.conf
+++ b/conf-tmpl/log_athena.conf
@@ -1,143 +1,143 @@
-// eAthena - Log Configuration File

-

-// Enable Logs?

-// 1 - Log all events.

-// Or, determine what to log by adding up the different events:

-// 0002 - Log trades

-// 0004 - Log vending transactions

-// 0008 - Log items drop/picked by players

-// 0016 - Log items drop/looted by monsters

-// 0032 - Log NPC transactions (buy/sell)

-// 0064 - Log Script generated transactions (items deleted/acquired through quests)

-// 0128 - Log items stolen from mobs (Steal/Gank)

-// 0256 - Log player-used items.

-// 0512 - Log MVP prize items

-// 1024 - Log player created/deleted items (through @/# commands)

-// Example: Log trades+vending+script items+created items: 2+4+64+1024:

-// enable_logs: 1094

-enable_logs: 1

-

-// Use MySQL Logs? (SQL Version Only)

-sql_logs: 0

-

-// LOGGING FILTERS [Lupus]

-//=============================================================

-//if any condition is true then the item will be logged

-//0 = Don't log at all

-//1 = Log any item

-//Advanced Filter Bits by item type: ||

-//0002 - Healing items (0)

-//0004 - Etc Items(3) + Arrows (10)

-//0008 - Usable Items(2) + Lures,Scrolls(11)

-//0016 - Weapon(4)

-//0032 - Shields,Armor,Headgears,Accessories,etc(5)

-//0064 - Cards(6)

-//0128 - Pet Accessories(8) + Eggs(7) (well, monsters don't drop 'em but we'll use the same system for ALL logs)

-//0256 - Log expensive items ( >= price_items_log)

-//0512 - Log big amount of items ( >= amount_items_log)

-//1024 - Log refined items (if their refine >= refine_items_log )

-//2048 - Log rare items (if their drop chance <= rare_items_log )

-

-//Examples: (log filters)

-//log_filter: 1	= logs ANY items

-//log_filter: 2	= logs only HEALING items

-//log_filter: 4	= logs only Etc Items and Arrows

-//log_filter: 64	= logs only Cards

-//log_filter: 322	= logs only Healing items, Cards and those items which price is >= price_items_log

-//log_filter: 4080 = logs all items (including all rare, big amount) exept healing, etc, arrows and useble ones

-//etc

-log_filter: 1

-

-// Log Items which Refine >= refine_items_log

-refine_items_log: 5

-// Log Items whith min drop rate <= rare_items_log

-//1 = 0.01%, 100 = 1% drop chance, etc

-rare_items_log: 100

-//don't log it if the current item price < price_items_log

-price_items_log: 1000

-//don't log it if the current item amount < amount_items_log

-amount_items_log: 100

-//=============================================================

-

-// Log Dead Branch Usage

-log_branch: 0

-

-// Track Zeny Changes

-// Filter settings

-// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolut logging zeny value

-log_zeny: 0

-

-// Log MVP Monster Drops

-//Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs

-log_mvpdrop: 0

-

-// Log GM Commands (set to minimum level of Logged Commands)

-log_gm: 40

-

-// Log NPC 'logmes' commands

-log_npc: 0

-

-// Log CHAT (currently only: Party, Guild, Whisper)

-// LOGGING FILTERS [Lupus]

-//=============================================================

-//0 = Don't log at all

-//1 = Log any chat messages

-//Advanced Filter Bits: ||

-//2 - Log Whisper messages

-//3 - Log Party messages

-//4 - Log Guild messages

-//5 - Log Common messages (not implemented)

-//6 - Don't log when WOE is on

-//Example:

-//log_chat: 1	= logs ANY messages

-//log_chat: 6	= logs both Whisper & Party messages

-//log_chat: 8	= logs only Guild messages

-//log_chat: 18	= logs only Whisper, when WOE is off

-

-log_chat: 0

-

-// Dead Branch Log Table

-log_branch_db: branchlog

-

-// Drops & Pickups  Table

-log_pick_db: picklog

-

-// Zeny Table

-log_zeny_db: zenylog

-

-// MVP Drop Table

-log_mvpdrop_db: mvplog

-

-// GM Log Table

-log_gm_db: atcommandlog

-

-// NPC Log Table

-log_npc_db: npclog

-

-// CHAT Log Table

-log_chat_db: chatlog

-

-

-// Dead Branch Log File

-log_branch_file: log/branchlog.log

-

-// Drops & Pickups  Log File

-log_pick_file: log/picklog.log

-

-// Zeny Log File

-log_zeny_file: log/zenylog.log

-

-// MVP Drop File

-log_mvpdrop_file: log/mvplog.log

-

-// GM Log File

-log_gm_file: log/atcommandlog.log

-

-// NPC Log File

-log_npc_file: log/npclog.log

-

-// CHAT Log File

-log_chat_file: log/chatlog.log

-

-

-import: conf/import/log_conf.txt

+// eAthena - Log Configuration File
+
+// Enable Logs?
+// 1 - Log all events.
+// Or, determine what to log by adding up the different events:
+// 0002 - Log trades
+// 0004 - Log vending transactions
+// 0008 - Log items drop/picked by players
+// 0016 - Log items drop/looted by monsters
+// 0032 - Log NPC transactions (buy/sell)
+// 0064 - Log Script generated transactions (items deleted/acquired through quests)
+// 0128 - Log items stolen from mobs (Steal/Gank)
+// 0256 - Log player-used items.
+// 0512 - Log MVP prize items
+// 1024 - Log player created/deleted items (through @/# commands)
+// Example: Log trades+vending+script items+created items: 2+4+64+1024:
+// enable_logs: 1094
+enable_logs: 1
+
+// Use MySQL Logs? (SQL Version Only)
+sql_logs: 0
+
+// LOGGING FILTERS [Lupus]
+//=============================================================
+//if any condition is true then the item will be logged
+//0 = Don't log at all
+//1 = Log any item
+//Advanced Filter Bits by item type: ||
+//0002 - Healing items (0)
+//0004 - Etc Items(3) + Arrows (10)
+//0008 - Usable Items(2) + Lures,Scrolls(11)
+//0016 - Weapon(4)
+//0032 - Shields,Armor,Headgears,Accessories,etc(5)
+//0064 - Cards(6)
+//0128 - Pet Accessories(8) + Eggs(7) (well, monsters don't drop 'em but we'll use the same system for ALL logs)
+//0256 - Log expensive items ( >= price_items_log)
+//0512 - Log big amount of items ( >= amount_items_log)
+//1024 - Log refined items (if their refine >= refine_items_log )
+//2048 - Log rare items (if their drop chance <= rare_items_log )
+
+//Examples: (log filters)
+//log_filter: 1	= logs ANY items
+//log_filter: 2	= logs only HEALING items
+//log_filter: 4	= logs only Etc Items and Arrows
+//log_filter: 64	= logs only Cards
+//log_filter: 322	= logs only Healing items, Cards and those items which price is >= price_items_log
+//log_filter: 4080 = logs all items (including all rare, big amount) exept healing, etc, arrows and useble ones
+//etc
+log_filter: 1
+
+// Log Items which Refine >= refine_items_log
+refine_items_log: 5
+// Log Items whith min drop rate <= rare_items_log
+//1 = 0.01%, 100 = 1% drop chance, etc
+rare_items_log: 100
+//don't log it if the current item price < price_items_log
+price_items_log: 1000
+//don't log it if the current item amount < amount_items_log
+amount_items_log: 100
+//=============================================================
+
+// Log Dead Branch Usage
+log_branch: 0
+
+// Track Zeny Changes
+// Filter settings
+// 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolut logging zeny value
+log_zeny: 0
+
+// Log MVP Monster Drops
+//Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs
+log_mvpdrop: 0
+
+// Log GM Commands (set to minimum level of Logged Commands)
+log_gm: 40
+
+// Log NPC 'logmes' commands
+log_npc: 0
+
+// Log CHAT (currently only: Party, Guild, Whisper)
+// LOGGING FILTERS [Lupus]
+//=============================================================
+//0 = Don't log at all
+//1 = Log any chat messages
+//Advanced Filter Bits: ||
+//2 - Log Whisper messages
+//3 - Log Party messages
+//4 - Log Guild messages
+//5 - Log Common messages (not implemented)
+//6 - Don't log when WOE is on
+//Example:
+//log_chat: 1	= logs ANY messages
+//log_chat: 6	= logs both Whisper & Party messages
+//log_chat: 8	= logs only Guild messages
+//log_chat: 18	= logs only Whisper, when WOE is off
+
+log_chat: 0
+
+// Dead Branch Log Table
+log_branch_db: branchlog
+
+// Drops & Pickups  Table
+log_pick_db: picklog
+
+// Zeny Table
+log_zeny_db: zenylog
+
+// MVP Drop Table
+log_mvpdrop_db: mvplog
+
+// GM Log Table
+log_gm_db: atcommandlog
+
+// NPC Log Table
+log_npc_db: npclog
+
+// CHAT Log Table
+log_chat_db: chatlog
+
+
+// Dead Branch Log File
+log_branch_file: log/branchlog.log
+
+// Drops & Pickups  Log File
+log_pick_file: log/picklog.log
+
+// Zeny Log File
+log_zeny_file: log/zenylog.log
+
+// MVP Drop File
+log_mvpdrop_file: log/mvplog.log
+
+// GM Log File
+log_gm_file: log/atcommandlog.log
+
+// NPC Log File
+log_npc_file: log/npclog.log
+
+// CHAT Log File
+log_chat_file: log/chatlog.log
+
+
+import: conf/import/log_conf.txt
diff --git a/conf-tmpl/login_athena.conf b/conf-tmpl/login_athena.conf
index 834904a89..8adcb1ccd 100644
--- a/conf-tmpl/login_athena.conf
+++ b/conf-tmpl/login_athena.conf
@@ -1,204 +1,204 @@
-// Athena Login Server configuration file.

-// Translated by Peter Kieser <pfak@telus.net>

-

-// Note: "Comments" are all text on the right side of a double slash "//"

-// Whatever text is commented will not be parsed by the servers, and serves

-// only as information/reference.

-

-// The login server listens on the interface with this IP address.

-// NOTE: This allows you to run multiple servers on multiple interfaces

-// while using the same ports for each server.

-//bind_ip: 127.0.0.1

- 

-// Login Server Port

-login_port: 6900

-

-//Time-stamp format which will be printed before all messages.

-//Can at most be 20 characters long.

-//Common formats:

-// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)

-// %H:%M:%S (hour:minute:second, 24 hour format)

-// %d/%b/%Y (day/Month/year)

-//For full format information, consult the strftime() manual.

-//timestamp_format: [%d/%b %H:%M]

-

-//Defines if the ansi sequences should be parsed or skipped.

-//If set to yes the console output is in color. If the stream is redirected to

-//a file, the ansi sequences are printed out.

-//If set to no the console is colorless and, if redirected, will skip the ansi

-//sequences.

-//NOTE: this setting applyes for both stdout and stderr

-stdout_with_ansisequence: yes

-

-//Makes server output more silent by ommitting certain types of messages:

-//1: Hide Information messages

-//2: Hide Status messages

-//4: Hide Notice Messages

-//8: Hide Warning Messages

-//16: Hide Error and SQL Error messages.

-//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)

-console_silent: 0

-

-// Whether remote administration is enabled or disabled (1 for enabled, 0 for disabled)

-admin_state: 0

-

-// Administrative password, used by ladmin (perl software) to connect remotely to server.

-// NOTICE: If you enable remote administration, you should change its value for security

-admin_pass: admin

-

-// Indicate the IP that the server accepts for remote administration.

-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),

-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')

-//      or 'clear' to suppress previous parameter (use it in import file mainly)

-// Add as many IP's as you wish.

-ladminallowip: all

-

-// Console Commands

-// Allow for console commands to be used on/off

-// This prevents usage of >& log.file

-console: off

-

-// Are login's case sensitive (SQL only)?

-case_sensitive: on

-

-// Gamemaster password, used with the @gm command to obtain GM commands (level of gm set with level_new_gm parameter).

-// NOTICE: You should also change this one.

-gm_pass: gm

-

-// Level of new GM created with @gm command. (default: 60)

-// If you set to 0, you disable creation of new GM with @gm.

-// To be able to create a gm with @gm, you must:

-// - give a level to this value (not 0)

-// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100)

-// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)

-// - and normal player must give correct password when he use the @gm command

-level_new_gm: 60

-

-// Can you make new accounts on the server? (1 for Yes, 0 for no) 

-// (1 = _M/_F enabled, 0 = not enabled)

-new_account: 1

-

-// ********** account registration flood system **********

-// allowed_regs is the number of registrations allowed in time_allowed (in seconds)

-allowed_regs: 1

-time_allowed: 10

-

-// Account flatfile database, stores account information.

-account_filename: save/account.txt

-

-// What account AIDs have GM privs, and what level?

-gm_account_filename: conf/GM_account.txt

-

-// Timer to check if GM_account file has been changed and reload GM account automaticaly

-// (in seconds; default: 15; value: 0 (disabled), or 2 or more)

-gm_account_filename_check_timer: 15

-

-// Log Filename. All operations received by the server are logged in this file.

-login_log_filename: log/login.log

-

-// To log the login server?

-// NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.

-log_login: 1

-

-// Name of the file of that logs the unknown packets (for debug or hack check)

-login_log_unknown_packets_filename: log/login_unknown_packets.log

-

-//When set to yes, the login server will refuse connections from accounts that are considered online already. 

-//When a login attempt is rejected, the account in question is also kicked from all connected char-servers.

-//It's safe to turn this off if there's only one char-server connected, or if the char-servers don't share 

-//the same backend (ie: Multiple char servers reading from the same SQL tables)

-online_check: yes

-

-// Indicate if the unknown packets are saved or not

-//(the unknown packets coming from the char-server or ladministration does not relate to, which is always saved)

-// Be careful: if you receive an attack, your hard disk can cause lag...

-// So, active this option with a speed hard disk or for debug only.

-save_unknown_packets: 0

-

-// Indicate if you want display the parse of the packets received in a normal connection

-// It's useful for debug. Possible values: 0: no (default), 1: yes

-display_parse_login: 0

-

-// Indicate if you want display the parse of the packets received in administration connection

-// It's useful for debug. Possible values: 0: no (default), 1: yes

-display_parse_admin: 0

-

-// Indicate if you want display the parse of the packets received from a char-server

-// It's useful for debug. Possible values: 0: no (default), 1: yes (without packet 0x2714), 2: all packets

-display_parse_fromchar: 0

-

-// Indicate how to display date in logs, to players, etc.

-// 0: 31-12-2004 23:59:59

-// 1: 12-31-2004 23:59:59

-// 2: 2004-31-12 23:59:59

-// 3: 2004-12-31 23:59:59 (default)

-date_format: 3

-

-// Indicate the minimum GM level of player that the server accepts to connection.

-// 0: all players (normal player are 0. it's default), 1-99: GM level at least with level x

-min_level_to_connect: 0

-

-// Give possibility to adjust (ladmin command: timeadd) the time of an unlimited account.

-// If set to on/1/yes..., the adjustment is be done from actual time to set the final time of the account.

-// If set to no/0/no..., the adjustment can not be done on an unlimited account. You must set (ladmin command: timeset) a final time before to adjust (ladmin command: timeadd)

-add_to_unlimited_account: off

-

-// Starting additional sec from now for the limited time at creation of account

-// -1: new account are created with UNlimited time (default value)

-// 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time)

-start_limited_time: -1

-

-// It's to check IP of a player between login-server and char-server (part of anti-hacking system)

-// If player doesn't have same IP, connection is refused.

-// Set to 0/off/no to not check IP of player.

-// Set to 1/on/yes if you want to check (default)

-// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,

-//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.

-//       if not correct, you can read list of char-servers, but not look slots of characters (rejected by server).

-check_ip_flag: yes

-

-// Specify order of IP control if necessary (option: 'deny,allow', 'allow,deny', or 'mutual-failture')

-// (how to use 'allow' and 'deny' information)

-//order: allow,deny

-

-// Indicate the IP that the server accept.

-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),

-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')

-//      or 'clear' to suppress previous parameter (use it in import file mainly)

-// Add as many IP's as you wish.

-//allow: all

-

-// Indicate the IP that the server refuse.

-// Add as many IP's as you wish, as long as you put deny: before it.

-//deny: 123.123.123.123

-//deny: 234.234.234.234

-

-//Check The clientversion set in the clientinfo ?

-check_client_version: no

-

-//What version we would allow to connect? (if the options above is enabled..)

-client_version_to_connect: 20

-

-//Passwords in Login DB are MD5 - <passwordencrypt> cannot b used on client with this on

-use_MD5_passwords: no

-

-//Ban features: read readme for more info if you dont know this.

-ipban: 1

-dynamic_pass_failure_ban: 1

-dynamic_pass_failure_ban_time: 5

-dynamic_pass_failure_ban_how_many: 7

-dynamic_pass_failure_ban_how_long: 5

-dynamic_account_ban: 1

-dynamic_account_ban_class: 0

-

-//Interval (in minutes) to execute a DNS/IP update. Disabled by default.

-//Enable it if your server uses a dynamic IP which changes with time.

-//ip_sync_interval: 10

-

-//DNS Blacklist Blocking (on: 1, off: 0)

-use_dnsbl: 0

-

-//DNS Servers (seperated by a comma)

-dnsbl_servers: dnsbl.deltaanime.net

-

-import: conf/import/login_conf.txt

+// Athena Login Server configuration file.
+// Translated by Peter Kieser <pfak@telus.net>
+
+// Note: "Comments" are all text on the right side of a double slash "//"
+// Whatever text is commented will not be parsed by the servers, and serves
+// only as information/reference.
+
+// The login server listens on the interface with this IP address.
+// NOTE: This allows you to run multiple servers on multiple interfaces
+// while using the same ports for each server.
+//bind_ip: 127.0.0.1
+ 
+// Login Server Port
+login_port: 6900
+
+//Time-stamp format which will be printed before all messages.
+//Can at most be 20 characters long.
+//Common formats:
+// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)
+// %H:%M:%S (hour:minute:second, 24 hour format)
+// %d/%b/%Y (day/Month/year)
+//For full format information, consult the strftime() manual.
+//timestamp_format: [%d/%b %H:%M]
+
+//Defines if the ansi sequences should be parsed or skipped.
+//If set to yes the console output is in color. If the stream is redirected to
+//a file, the ansi sequences are printed out.
+//If set to no the console is colorless and, if redirected, will skip the ansi
+//sequences.
+//NOTE: this setting applyes for both stdout and stderr
+stdout_with_ansisequence: yes
+
+//Makes server output more silent by ommitting certain types of messages:
+//1: Hide Information messages
+//2: Hide Status messages
+//4: Hide Notice Messages
+//8: Hide Warning Messages
+//16: Hide Error and SQL Error messages.
+//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
+console_silent: 0
+
+// Whether remote administration is enabled or disabled (1 for enabled, 0 for disabled)
+admin_state: 0
+
+// Administrative password, used by ladmin (perl software) to connect remotely to server.
+// NOTICE: If you enable remote administration, you should change its value for security
+admin_pass: admin
+
+// Indicate the IP that the server accepts for remote administration.
+// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
+//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
+//      or 'clear' to suppress previous parameter (use it in import file mainly)
+// Add as many IP's as you wish.
+ladminallowip: all
+
+// Console Commands
+// Allow for console commands to be used on/off
+// This prevents usage of >& log.file
+console: off
+
+// Are login's case sensitive (SQL only)?
+case_sensitive: on
+
+// Gamemaster password, used with the @gm command to obtain GM commands (level of gm set with level_new_gm parameter).
+// NOTICE: You should also change this one.
+gm_pass: gm
+
+// Level of new GM created with @gm command. (default: 60)
+// If you set to 0, you disable creation of new GM with @gm.
+// To be able to create a gm with @gm, you must:
+// - give a level to this value (not 0)
+// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100)
+// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)
+// - and normal player must give correct password when he use the @gm command
+level_new_gm: 60
+
+// Can you make new accounts on the server? (1 for Yes, 0 for no) 
+// (1 = _M/_F enabled, 0 = not enabled)
+new_account: 1
+
+// ********** account registration flood system **********
+// allowed_regs is the number of registrations allowed in time_allowed (in seconds)
+allowed_regs: 1
+time_allowed: 10
+
+// Account flatfile database, stores account information.
+account_filename: save/account.txt
+
+// What account AIDs have GM privs, and what level?
+gm_account_filename: conf/GM_account.txt
+
+// Timer to check if GM_account file has been changed and reload GM account automaticaly
+// (in seconds; default: 15; value: 0 (disabled), or 2 or more)
+gm_account_filename_check_timer: 15
+
+// Log Filename. All operations received by the server are logged in this file.
+login_log_filename: log/login.log
+
+// To log the login server?
+// NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
+log_login: 1
+
+// Name of the file of that logs the unknown packets (for debug or hack check)
+login_log_unknown_packets_filename: log/login_unknown_packets.log
+
+//When set to yes, the login server will refuse connections from accounts that are considered online already. 
+//When a login attempt is rejected, the account in question is also kicked from all connected char-servers.
+//It's safe to turn this off if there's only one char-server connected, or if the char-servers don't share 
+//the same backend (ie: Multiple char servers reading from the same SQL tables)
+online_check: yes
+
+// Indicate if the unknown packets are saved or not
+//(the unknown packets coming from the char-server or ladministration does not relate to, which is always saved)
+// Be careful: if you receive an attack, your hard disk can cause lag...
+// So, active this option with a speed hard disk or for debug only.
+save_unknown_packets: 0
+
+// Indicate if you want display the parse of the packets received in a normal connection
+// It's useful for debug. Possible values: 0: no (default), 1: yes
+display_parse_login: 0
+
+// Indicate if you want display the parse of the packets received in administration connection
+// It's useful for debug. Possible values: 0: no (default), 1: yes
+display_parse_admin: 0
+
+// Indicate if you want display the parse of the packets received from a char-server
+// It's useful for debug. Possible values: 0: no (default), 1: yes (without packet 0x2714), 2: all packets
+display_parse_fromchar: 0
+
+// Indicate how to display date in logs, to players, etc.
+// 0: 31-12-2004 23:59:59
+// 1: 12-31-2004 23:59:59
+// 2: 2004-31-12 23:59:59
+// 3: 2004-12-31 23:59:59 (default)
+date_format: 3
+
+// Indicate the minimum GM level of player that the server accepts to connection.
+// 0: all players (normal player are 0. it's default), 1-99: GM level at least with level x
+min_level_to_connect: 0
+
+// Give possibility to adjust (ladmin command: timeadd) the time of an unlimited account.
+// If set to on/1/yes..., the adjustment is be done from actual time to set the final time of the account.
+// If set to no/0/no..., the adjustment can not be done on an unlimited account. You must set (ladmin command: timeset) a final time before to adjust (ladmin command: timeadd)
+add_to_unlimited_account: off
+
+// Starting additional sec from now for the limited time at creation of account
+// -1: new account are created with UNlimited time (default value)
+// 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time)
+start_limited_time: -1
+
+// It's to check IP of a player between login-server and char-server (part of anti-hacking system)
+// If player doesn't have same IP, connection is refused.
+// Set to 0/off/no to not check IP of player.
+// Set to 1/on/yes if you want to check (default)
+// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
+//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
+//       if not correct, you can read list of char-servers, but not look slots of characters (rejected by server).
+check_ip_flag: yes
+
+// Specify order of IP control if necessary (option: 'deny,allow', 'allow,deny', or 'mutual-failture')
+// (how to use 'allow' and 'deny' information)
+//order: allow,deny
+
+// Indicate the IP that the server accept.
+// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
+//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
+//      or 'clear' to suppress previous parameter (use it in import file mainly)
+// Add as many IP's as you wish.
+//allow: all
+
+// Indicate the IP that the server refuse.
+// Add as many IP's as you wish, as long as you put deny: before it.
+//deny: 123.123.123.123
+//deny: 234.234.234.234
+
+//Check The clientversion set in the clientinfo ?
+check_client_version: no
+
+//What version we would allow to connect? (if the options above is enabled..)
+client_version_to_connect: 20
+
+//Passwords in Login DB are MD5 - <passwordencrypt> cannot b used on client with this on
+use_MD5_passwords: no
+
+//Ban features: read readme for more info if you dont know this.
+ipban: 1
+dynamic_pass_failure_ban: 1
+dynamic_pass_failure_ban_time: 5
+dynamic_pass_failure_ban_how_many: 7
+dynamic_pass_failure_ban_how_long: 5
+dynamic_account_ban: 1
+dynamic_account_ban_class: 0
+
+//Interval (in minutes) to execute a DNS/IP update. Disabled by default.
+//Enable it if your server uses a dynamic IP which changes with time.
+//ip_sync_interval: 10
+
+//DNS Blacklist Blocking (on: 1, off: 0)
+use_dnsbl: 0
+
+//DNS Servers (seperated by a comma)
+dnsbl_servers: dnsbl.deltaanime.net
+
+import: conf/import/login_conf.txt
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 4812e5d1c..59fcc1210 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -1,145 +1,145 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------------

-//eAthena Map-Server Configuration File

-//--------------------------------------------------------------

-

-// Note: "Comments" are all text on the right side of a double slash "//"

-// Whatever text is commented will not be parsed by the servers, and serves

-// only as information/reference.

-

-//--------------------------------------------------------------

-//			Configuration Info			

-//--------------------------------------------------------------

-// Interserver communication passwords, set in account.txt (or equiv.)

-userid: s1

-passwd: p1

-

-// Character Server IP

-// The map server connects to the character server using this IP address.

-// NOTE: This is useful when you are running behind a firewall or are on

-// a machine with multiple interfaces.

-//char_ip: 127.0.0.1

-

-// The map server listens on the interface with this IP address.

-// NOTE: This allows you to run multiple servers on multiple interfaces

-// while using the same ports for each server.

-//bind_ip: 127.0.0.1

-

-// Character Server Port

-char_port: 6121

-

-// Map Server IP

-// The map server exports this IP address to the entire world.

-// NOTE: You should only need to set this if you are running behind a

-// firewall or are on a machine with multiple interfaces.

-//map_ip: 127.0.0.1

-

-// Map Server Port

-map_port: 5121

-

-//Time-stamp format which will be printed before all messages.

-//Can at most be 20 characters long.

-//Common formats:

-// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)

-// %H:%M:%S (hour:minute:second, 24 hour format)

-// %d/%b/%Y (day/Month/year)

-//For full format information, consult the strftime() manual.

-//timestamp_format: [%d/%b %H:%M]

-

-//Defines if the ansi sequences should be parsed or skipped.

-//If set to yes the console output is in color. If the stream is redirected to

-//a file, the ansi sequences are printed out.

-//If set to no the console is colorless and, if redirected, will skip the ansi

-//sequences.

-//NOTE: this setting applyes for both stdout and stderr

-stdout_with_ansisequence: yes

-

-//Makes server output more silent by ommitting certain types of messages:

-//1: Hide Information messages

-//2: Hide Status messages

-//4: Hide Notice Messages

-//8: Hide Warning Messages

-//16: Hide Error and SQL Error messages.

-//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)

-console_silent: 0

-

-//Preferred map loading method

-// 0: Read directly from grf

-// 1: Read from cache (with compression)

-// 2: Read from cache (without compression)

-// If the cache was not found it will read the maps from the GRF and copy

-// any necessary data into a newly created cache.

-// It is possible to reduce the map cache to 1MB for 400+ maps with compression

-// enabled. If all maps are already loaded in the cache, Athena can boot without

-// reading the grf files.

-read_map_from_cache: 1

-//

-//Where is the bitmap file stored?

-map_cache_file: db/mapinfo.txt

-

-//Where should all database data be read from?

-db_path: db

-

-// Advanced Fusion Maps directory

-afm_dir: afm

-

-// Enable the @guildspy and @partyspy at commands?

-// Note that enabling them decreases packet sending performance.

-enable_spy: no

-

-// Console Commands

-// Allow for console commands to be used on/off

-// This prevents usage of >& log.file

-console: off

-

-// Database autosave time

-// All characters are saved on this time in seconds (example:

-// autosave of 60 secs with 60 characters online -> one char is saved every 

-// second)

-autosave_time: 300

-

-// Min database save intervals (in ms)

-// Prevent saving characters faster than at this rate (prevents char-server 

-// save-load getting too high as character-count increases)

-minsave_time: 100

-

-// Apart from the autosave_time, players will also get saved when involved

-// in the following (add as needed):

-// 1: after every successful trade

-// 2: after every vending transaction

-// 4: after closing storage/guild storage.

-// 8: After hatching/returning to egg a pet.

-// NOTE: These settings decrease the chance of dupes/lost items when there's a

-// server crash at the expense of increasing the map/char server lag. If your 

-// server rarely crashes, but experiences interserver lag, you may want to set

-// these off.

-save_settings: 15

-

-// Message of the day file, when a character logs on, this message is displayed.

-motd_txt: conf/motd.txt

-

-// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.

-help_txt: conf/help.txt

-help2_txt: conf/help2.txt

-charhelp_txt: conf/charhelp.txt

-

-mapreg_txt: save/mapreg.txt

-

-// Scripts

-import: npc/scripts_main.conf

-

-// Maps:

-import: conf/maps_athena.conf

-

-import: conf/import/map_conf.txt

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------------
+//eAthena Map-Server Configuration File
+//--------------------------------------------------------------
+
+// Note: "Comments" are all text on the right side of a double slash "//"
+// Whatever text is commented will not be parsed by the servers, and serves
+// only as information/reference.
+
+//--------------------------------------------------------------
+//			Configuration Info			
+//--------------------------------------------------------------
+// Interserver communication passwords, set in account.txt (or equiv.)
+userid: s1
+passwd: p1
+
+// Character Server IP
+// The map server connects to the character server using this IP address.
+// NOTE: This is useful when you are running behind a firewall or are on
+// a machine with multiple interfaces.
+//char_ip: 127.0.0.1
+
+// The map server listens on the interface with this IP address.
+// NOTE: This allows you to run multiple servers on multiple interfaces
+// while using the same ports for each server.
+//bind_ip: 127.0.0.1
+
+// Character Server Port
+char_port: 6121
+
+// Map Server IP
+// The map server exports this IP address to the entire world.
+// NOTE: You should only need to set this if you are running behind a
+// firewall or are on a machine with multiple interfaces.
+//map_ip: 127.0.0.1
+
+// Map Server Port
+map_port: 5121
+
+//Time-stamp format which will be printed before all messages.
+//Can at most be 20 characters long.
+//Common formats:
+// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)
+// %H:%M:%S (hour:minute:second, 24 hour format)
+// %d/%b/%Y (day/Month/year)
+//For full format information, consult the strftime() manual.
+//timestamp_format: [%d/%b %H:%M]
+
+//Defines if the ansi sequences should be parsed or skipped.
+//If set to yes the console output is in color. If the stream is redirected to
+//a file, the ansi sequences are printed out.
+//If set to no the console is colorless and, if redirected, will skip the ansi
+//sequences.
+//NOTE: this setting applyes for both stdout and stderr
+stdout_with_ansisequence: yes
+
+//Makes server output more silent by ommitting certain types of messages:
+//1: Hide Information messages
+//2: Hide Status messages
+//4: Hide Notice Messages
+//8: Hide Warning Messages
+//16: Hide Error and SQL Error messages.
+//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
+console_silent: 0
+
+//Preferred map loading method
+// 0: Read directly from grf
+// 1: Read from cache (with compression)
+// 2: Read from cache (without compression)
+// If the cache was not found it will read the maps from the GRF and copy
+// any necessary data into a newly created cache.
+// It is possible to reduce the map cache to 1MB for 400+ maps with compression
+// enabled. If all maps are already loaded in the cache, Athena can boot without
+// reading the grf files.
+read_map_from_cache: 1
+//
+//Where is the bitmap file stored?
+map_cache_file: db/mapinfo.txt
+
+//Where should all database data be read from?
+db_path: db
+
+// Advanced Fusion Maps directory
+afm_dir: afm
+
+// Enable the @guildspy and @partyspy at commands?
+// Note that enabling them decreases packet sending performance.
+enable_spy: no
+
+// Console Commands
+// Allow for console commands to be used on/off
+// This prevents usage of >& log.file
+console: off
+
+// Database autosave time
+// All characters are saved on this time in seconds (example:
+// autosave of 60 secs with 60 characters online -> one char is saved every 
+// second)
+autosave_time: 300
+
+// Min database save intervals (in ms)
+// Prevent saving characters faster than at this rate (prevents char-server 
+// save-load getting too high as character-count increases)
+minsave_time: 100
+
+// Apart from the autosave_time, players will also get saved when involved
+// in the following (add as needed):
+// 1: after every successful trade
+// 2: after every vending transaction
+// 4: after closing storage/guild storage.
+// 8: After hatching/returning to egg a pet.
+// NOTE: These settings decrease the chance of dupes/lost items when there's a
+// server crash at the expense of increasing the map/char server lag. If your 
+// server rarely crashes, but experiences interserver lag, you may want to set
+// these off.
+save_settings: 15
+
+// Message of the day file, when a character logs on, this message is displayed.
+motd_txt: conf/motd.txt
+
+// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
+help_txt: conf/help.txt
+help2_txt: conf/help2.txt
+charhelp_txt: conf/charhelp.txt
+
+mapreg_txt: save/mapreg.txt
+
+// Scripts
+import: npc/scripts_main.conf
+
+// Maps:
+import: conf/maps_athena.conf
+
+import: conf/import/map_conf.txt
diff --git a/conf-tmpl/mapflag/gvg.txt b/conf-tmpl/mapflag/gvg.txt
index db3d08f2f..f57459d1c 100644
--- a/conf-tmpl/mapflag/gvg.txt
+++ b/conf-tmpl/mapflag/gvg.txt
@@ -1,82 +1,82 @@
-//===== eAthena Script =======================================

-//= GvG On Map Flags

-//===== By: ==================================================

-//= eAthena Dev Team

-//===== Current Version: =====================================

-//= 1.2

-//===== Description: =========================================

-//= gvg: Turns on GvG mode (same as PvP except Guilds are

-//=      automatically allied)

-//= gvg_castle: Describes castle maps for WoE.

-//===== Additional Comments: =================================

-//= 1.2 Updated with new meanings of gvg and gvg_castle

-//= 1.1 Added Novice Guild Castles

-//============================================================

-

-// GvG Arenas =============

-guild_vs1.gat	mapflag	gvg

-guild_vs2.gat	mapflag	gvg

-guild_vs3.gat	mapflag	gvg

-guild_vs4.gat	mapflag	gvg

-guild_vs5.gat	mapflag	gvg

-

-// Guild Castles ==========

-aldeg_cas01.gat	mapflag	gvg_castle

-aldeg_cas02.gat	mapflag	gvg_castle

-aldeg_cas03.gat	mapflag	gvg_castle

-aldeg_cas04.gat	mapflag	gvg_castle

-aldeg_cas05.gat	mapflag	gvg_castle

-gefg_cas01.gat	mapflag	gvg_castle

-gefg_cas02.gat	mapflag	gvg_castle

-gefg_cas03.gat	mapflag	gvg_castle

-gefg_cas04.gat	mapflag	gvg_castle

-gefg_cas05.gat	mapflag	gvg_castle

-payg_cas01.gat	mapflag	gvg_castle

-payg_cas02.gat	mapflag	gvg_castle

-payg_cas03.gat	mapflag	gvg_castle

-payg_cas04.gat	mapflag	gvg_castle

-payg_cas05.gat	mapflag	gvg_castle

-prtg_cas01.gat	mapflag	gvg_castle

-prtg_cas02.gat	mapflag	gvg_castle

-prtg_cas03.gat	mapflag	gvg_castle

-prtg_cas04.gat	mapflag	gvg_castle

-prtg_cas05.gat	mapflag	gvg_castle

-//Uncomment to disable monsters teleporting (prevents them from "escaping" when rude attacked)

-//aldeg_cas01.gat	mapflag	monster_noteleport

-//aldeg_cas02.gat	mapflag	monster_noteleport

-//aldeg_cas03.gat	mapflag	monster_noteleport

-//aldeg_cas04.gat	mapflag	monster_noteleport

-//aldeg_cas05.gat	mapflag	monster_noteleport

-//gefg_cas01.gat	mapflag	monster_noteleport

-//gefg_cas02.gat	mapflag	monster_noteleport

-//gefg_cas03.gat	mapflag	monster_noteleport

-//gefg_cas04.gat	mapflag	monster_noteleport

-//gefg_cas05.gat	mapflag	monster_noteleport

-//payg_cas01.gat	mapflag	monster_noteleport

-//payg_cas02.gat	mapflag	monster_noteleport

-//payg_cas03.gat	mapflag	monster_noteleport

-//payg_cas04.gat	mapflag	monster_noteleport

-//payg_cas05.gat	mapflag	monster_noteleport

-//prtg_cas01.gat	mapflag	monster_noteleport

-//prtg_cas02.gat	mapflag	monster_noteleport

-//prtg_cas03.gat	mapflag	monster_noteleport

-//prtg_cas04.gat	mapflag	monster_noteleport

-//prtg_cas05.gat	mapflag	monster_noteleport

-

-// Novice Guild Castles ===

-//n_castle.gat	mapflag	gvg_castle

-nguild_alde.gat	mapflag	gvg_castle

-nguild_gef.gat	mapflag	gvg_castle

-nguild_pay.gat	mapflag	gvg_castle

-nguild_prt.gat	mapflag	gvg_castle

-

-//nguild_alde.gat	mapflag	monster_noteleport

-//nguild_gef.gat	mapflag	monster_noteleport

-//nguild_pay.gat	mapflag	monster_noteleport

-//nguild_prt.gat	mapflag	monster_noteleport

-

-// Guild Dungeons =========

-gld_dun01.gat	mapflag	gvg_dungeon

-gld_dun02.gat	mapflag	gvg_dungeon

-gld_dun03.gat	mapflag	gvg_dungeon

-gld_dun04.gat	mapflag	gvg_dungeon

+//===== eAthena Script =======================================
+//= GvG On Map Flags
+//===== By: ==================================================
+//= eAthena Dev Team
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
+//= gvg: Turns on GvG mode (same as PvP except Guilds are
+//=      automatically allied)
+//= gvg_castle: Describes castle maps for WoE.
+//===== Additional Comments: =================================
+//= 1.2 Updated with new meanings of gvg and gvg_castle
+//= 1.1 Added Novice Guild Castles
+//============================================================
+
+// GvG Arenas =============
+guild_vs1.gat	mapflag	gvg
+guild_vs2.gat	mapflag	gvg
+guild_vs3.gat	mapflag	gvg
+guild_vs4.gat	mapflag	gvg
+guild_vs5.gat	mapflag	gvg
+
+// Guild Castles ==========
+aldeg_cas01.gat	mapflag	gvg_castle
+aldeg_cas02.gat	mapflag	gvg_castle
+aldeg_cas03.gat	mapflag	gvg_castle
+aldeg_cas04.gat	mapflag	gvg_castle
+aldeg_cas05.gat	mapflag	gvg_castle
+gefg_cas01.gat	mapflag	gvg_castle
+gefg_cas02.gat	mapflag	gvg_castle
+gefg_cas03.gat	mapflag	gvg_castle
+gefg_cas04.gat	mapflag	gvg_castle
+gefg_cas05.gat	mapflag	gvg_castle
+payg_cas01.gat	mapflag	gvg_castle
+payg_cas02.gat	mapflag	gvg_castle
+payg_cas03.gat	mapflag	gvg_castle
+payg_cas04.gat	mapflag	gvg_castle
+payg_cas05.gat	mapflag	gvg_castle
+prtg_cas01.gat	mapflag	gvg_castle
+prtg_cas02.gat	mapflag	gvg_castle
+prtg_cas03.gat	mapflag	gvg_castle
+prtg_cas04.gat	mapflag	gvg_castle
+prtg_cas05.gat	mapflag	gvg_castle
+//Uncomment to disable monsters teleporting (prevents them from "escaping" when rude attacked)
+//aldeg_cas01.gat	mapflag	monster_noteleport
+//aldeg_cas02.gat	mapflag	monster_noteleport
+//aldeg_cas03.gat	mapflag	monster_noteleport
+//aldeg_cas04.gat	mapflag	monster_noteleport
+//aldeg_cas05.gat	mapflag	monster_noteleport
+//gefg_cas01.gat	mapflag	monster_noteleport
+//gefg_cas02.gat	mapflag	monster_noteleport
+//gefg_cas03.gat	mapflag	monster_noteleport
+//gefg_cas04.gat	mapflag	monster_noteleport
+//gefg_cas05.gat	mapflag	monster_noteleport
+//payg_cas01.gat	mapflag	monster_noteleport
+//payg_cas02.gat	mapflag	monster_noteleport
+//payg_cas03.gat	mapflag	monster_noteleport
+//payg_cas04.gat	mapflag	monster_noteleport
+//payg_cas05.gat	mapflag	monster_noteleport
+//prtg_cas01.gat	mapflag	monster_noteleport
+//prtg_cas02.gat	mapflag	monster_noteleport
+//prtg_cas03.gat	mapflag	monster_noteleport
+//prtg_cas04.gat	mapflag	monster_noteleport
+//prtg_cas05.gat	mapflag	monster_noteleport
+
+// Novice Guild Castles ===
+//n_castle.gat	mapflag	gvg_castle
+nguild_alde.gat	mapflag	gvg_castle
+nguild_gef.gat	mapflag	gvg_castle
+nguild_pay.gat	mapflag	gvg_castle
+nguild_prt.gat	mapflag	gvg_castle
+
+//nguild_alde.gat	mapflag	monster_noteleport
+//nguild_gef.gat	mapflag	monster_noteleport
+//nguild_pay.gat	mapflag	monster_noteleport
+//nguild_prt.gat	mapflag	monster_noteleport
+
+// Guild Dungeons =========
+gld_dun01.gat	mapflag	gvg_dungeon
+gld_dun02.gat	mapflag	gvg_dungeon
+gld_dun03.gat	mapflag	gvg_dungeon
+gld_dun04.gat	mapflag	gvg_dungeon
diff --git a/conf-tmpl/mapflag/indoors.txt b/conf-tmpl/mapflag/indoors.txt
index 473c2da6e..cdbc458fc 100644
--- a/conf-tmpl/mapflag/indoors.txt
+++ b/conf-tmpl/mapflag/indoors.txt
@@ -1,81 +1,81 @@
-//===== eAthena Script =======================================

-//= Map Flags for Indoors Buildings or Dungeons

-//===== By: ==================================================

-//= eAthena Dev Team

-//===== Current Version: =====================================

-//= 1.3 [Lupus]

-//===== Compatible With: =====================================

-//=

-//===== Description: =========================================

-//= 'indoors' turns off all night effects.

-//============================================================

-

-alberta_in.gat	mapflag	indoors

-ama_test.gat	mapflag	indoors

-izlude_in.gat	mapflag	indoors

-gef_tower.gat	mapflag	indoors

-geffen_in.gat	mapflag	indoors

-moc_castle.gat	mapflag	indoors

-morocc_in.gat	mapflag	indoors

-payon_in01.gat	mapflag	indoors

-payon_in02.gat	mapflag	indoors

-payon_in03.gat	mapflag	indoors

-prt_in.gat	mapflag	indoors

-prt_castle.gat	mapflag	indoors

-prt_church.gat	mapflag	indoors

-in_orcs01.gat	mapflag	indoors

-aldeba_in.gat	mapflag	indoors

-monk_in.gat	mapflag	indoors

-prt_are_in.gat	mapflag	indoors

-arena_room.gat	mapflag	indoors

-job_sword1.gat	mapflag	indoors

-xmas_in.gat	mapflag	indoors

-cmd_in01.gat	mapflag	indoors

-cmd_in02.gat	mapflag	indoors

-yuno_in01.gat	mapflag	indoors

-yuno_in02.gat	mapflag	indoors

-yuno_in03.gat	mapflag	indoors

-yuno_in04.gat	mapflag	indoors

-yuno_in05.gat	mapflag	indoors

-alde_alche.gat	mapflag	indoors

-sec_in01.gat	mapflag	indoors

-ama_in01.gat	mapflag	indoors

-ama_in02.gat	mapflag	indoors

-gon_in.gat	mapflag	indoors

-um_in.gat	mapflag	indoors

-nif_in.gat	mapflag	indoors

-lou_in01.gat	mapflag	indoors

-lou_in02.gat	mapflag	indoors

-jawaii_in.gat	mapflag	indoors

-que_god01.gat	mapflag	indoors

-que_god02.gat	mapflag	indoors

-ayo_in01.gat	mapflag	indoors

-ayo_in02.gat	mapflag	indoors

-que_sign01.gat	mapflag	indoors

-ein_in01.gat	mapflag	indoors

-airport.gat	mapflag	indoors

-airplane.gat	mapflag	indoors

-airplane_01.gat	mapflag	indoors

-hu_in01.gat	mapflag	indoors

-y_airport.gat	mapflag	indoors

-lhz_airport.gat	mapflag	indoors

-lhz_in01.gat	mapflag	indoors

-lhz_in02.gat	mapflag	indoors

-lhz_in03.gat	mapflag	indoors

-lhz_cube.gat	mapflag	indoors

-hu_in01.gat	mapflag	indoors

-auction_01.gat	mapflag	indoors

-auction_02.gat	mapflag	indoors

-ra_in01.gat	mapflag	indoors

-ra_temin.gat	mapflag	indoors

-que_rachel.gat	mapflag	indoors

-yuno_pre.gat	mapflag	indoors

-lhz_que01.gat	mapflag	indoors

-que_job01.gat	mapflag	indoors

-thana_step.gat	mapflag	indoors

-kh_mansion.gat	mapflag	indoors

-kh_rossi.gat	mapflag	indoors

-kh_school.gat	mapflag	indoors

-kh_vila.gat	mapflag	indoors

-que_bingo.gat	mapflag	indoors

-que_ng.gat	mapflag	indoors

+//===== eAthena Script =======================================
+//= Map Flags for Indoors Buildings or Dungeons
+//===== By: ==================================================
+//= eAthena Dev Team
+//===== Current Version: =====================================
+//= 1.3 [Lupus]
+//===== Compatible With: =====================================
+//=
+//===== Description: =========================================
+//= 'indoors' turns off all night effects.
+//============================================================
+
+alberta_in.gat	mapflag	indoors
+ama_test.gat	mapflag	indoors
+izlude_in.gat	mapflag	indoors
+gef_tower.gat	mapflag	indoors
+geffen_in.gat	mapflag	indoors
+moc_castle.gat	mapflag	indoors
+morocc_in.gat	mapflag	indoors
+payon_in01.gat	mapflag	indoors
+payon_in02.gat	mapflag	indoors
+payon_in03.gat	mapflag	indoors
+prt_in.gat	mapflag	indoors
+prt_castle.gat	mapflag	indoors
+prt_church.gat	mapflag	indoors
+in_orcs01.gat	mapflag	indoors
+aldeba_in.gat	mapflag	indoors
+monk_in.gat	mapflag	indoors
+prt_are_in.gat	mapflag	indoors
+arena_room.gat	mapflag	indoors
+job_sword1.gat	mapflag	indoors
+xmas_in.gat	mapflag	indoors
+cmd_in01.gat	mapflag	indoors
+cmd_in02.gat	mapflag	indoors
+yuno_in01.gat	mapflag	indoors
+yuno_in02.gat	mapflag	indoors
+yuno_in03.gat	mapflag	indoors
+yuno_in04.gat	mapflag	indoors
+yuno_in05.gat	mapflag	indoors
+alde_alche.gat	mapflag	indoors
+sec_in01.gat	mapflag	indoors
+ama_in01.gat	mapflag	indoors
+ama_in02.gat	mapflag	indoors
+gon_in.gat	mapflag	indoors
+um_in.gat	mapflag	indoors
+nif_in.gat	mapflag	indoors
+lou_in01.gat	mapflag	indoors
+lou_in02.gat	mapflag	indoors
+jawaii_in.gat	mapflag	indoors
+que_god01.gat	mapflag	indoors
+que_god02.gat	mapflag	indoors
+ayo_in01.gat	mapflag	indoors
+ayo_in02.gat	mapflag	indoors
+que_sign01.gat	mapflag	indoors
+ein_in01.gat	mapflag	indoors
+airport.gat	mapflag	indoors
+airplane.gat	mapflag	indoors
+airplane_01.gat	mapflag	indoors
+hu_in01.gat	mapflag	indoors
+y_airport.gat	mapflag	indoors
+lhz_airport.gat	mapflag	indoors
+lhz_in01.gat	mapflag	indoors
+lhz_in02.gat	mapflag	indoors
+lhz_in03.gat	mapflag	indoors
+lhz_cube.gat	mapflag	indoors
+hu_in01.gat	mapflag	indoors
+auction_01.gat	mapflag	indoors
+auction_02.gat	mapflag	indoors
+ra_in01.gat	mapflag	indoors
+ra_temin.gat	mapflag	indoors
+que_rachel.gat	mapflag	indoors
+yuno_pre.gat	mapflag	indoors
+lhz_que01.gat	mapflag	indoors
+que_job01.gat	mapflag	indoors
+thana_step.gat	mapflag	indoors
+kh_mansion.gat	mapflag	indoors
+kh_rossi.gat	mapflag	indoors
+kh_school.gat	mapflag	indoors
+kh_vila.gat	mapflag	indoors
+que_bingo.gat	mapflag	indoors
+que_ng.gat	mapflag	indoors
diff --git a/conf-tmpl/mapflag/jail.txt b/conf-tmpl/mapflag/jail.txt
index 3d4f28675..4cb9d85cb 100644
--- a/conf-tmpl/mapflag/jail.txt
+++ b/conf-tmpl/mapflag/jail.txt
@@ -1,48 +1,48 @@
-//===== eAthena Script =======================================

-//= Map Flags for Jails ( ATCommand @jail <player> )

-//===== By: ==================================================

-//= eAthena Dev Team

-//===== Current Version: =====================================

-//= 1.0

-//===== Compatible With: =====================================

-//=

-//===== Description: =========================================

-//= pvp: Turns on PvP mode

-//= pvp_noparty: Can't attack player in same party

-//= nobranch: No Dead Branching allowed.

-//= nomemo: No Warp Portal Memory Point allowed.

-//= nopenalty: No Exp. penalty when player dies.

-//= nosave: No saving respawn point allowed. Use SavePoint to use the

-//=                players previous savepoint, or choose one manually.

-//= noteleport: No Teleporting allowed.  No f-wings or b-wings.

-//===== Additional Comments: =================================

-//= 

-//============================================================

-

-

-// No Memory =============================

-sec_pri.gat	mapflag	nomemo

-

-// No Save ===============================

-sec_pri.gat	mapflag	nosave	SavePoint

-

-// No Teleport ===========================

-sec_pri.gat	mapflag	noteleport

-

-// No Warp ===============================

-sec_pri.gat	mapflag	nowarp

-

-// No Return, Stop people from being pulled out of jail (warpparty/guild)

-sec_pri.gat	mapflag	noreturn 

-

-// Bloody Jail ===========================

-//Uncomment following maps to let your prisoners fight with other prisoners

-

-// PvP ===================================

-sec_pri.gat	mapflag	pvp

-

-// No Party ==============================

-sec_pri.gat	mapflag	pvp_noparty

-

-//Nightmare Equipment Drops PVP ==========

-sec_pri.gat	mapflag	pvp_nightmaredrop	random,equip,300

+//===== eAthena Script =======================================
+//= Map Flags for Jails ( ATCommand @jail <player> )
+//===== By: ==================================================
+//= eAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//=
+//===== Description: =========================================
+//= pvp: Turns on PvP mode
+//= pvp_noparty: Can't attack player in same party
+//= nobranch: No Dead Branching allowed.
+//= nomemo: No Warp Portal Memory Point allowed.
+//= nopenalty: No Exp. penalty when player dies.
+//= nosave: No saving respawn point allowed. Use SavePoint to use the
+//=                players previous savepoint, or choose one manually.
+//= noteleport: No Teleporting allowed.  No f-wings or b-wings.
+//===== Additional Comments: =================================
+//= 
+//============================================================
+
+
+// No Memory =============================
+sec_pri.gat	mapflag	nomemo
+
+// No Save ===============================
+sec_pri.gat	mapflag	nosave	SavePoint
+
+// No Teleport ===========================
+sec_pri.gat	mapflag	noteleport
+
+// No Warp ===============================
+sec_pri.gat	mapflag	nowarp
+
+// No Return, Stop people from being pulled out of jail (warpparty/guild)
+sec_pri.gat	mapflag	noreturn 
+
+// Bloody Jail ===========================
+//Uncomment following maps to let your prisoners fight with other prisoners
+
+// PvP ===================================
+sec_pri.gat	mapflag	pvp
+
+// No Party ==============================
+sec_pri.gat	mapflag	pvp_noparty
+
+//Nightmare Equipment Drops PVP ==========
+sec_pri.gat	mapflag	pvp_nightmaredrop	random,equip,300
diff --git a/conf-tmpl/mapflag/night.txt b/conf-tmpl/mapflag/night.txt
index 1b0e60086..fe588c6b3 100644
--- a/conf-tmpl/mapflag/night.txt
+++ b/conf-tmpl/mapflag/night.txt
@@ -1,230 +1,230 @@
-//===== eAthena Script =======================================

-//= Map Flags for maps where the night is visible.

-//===== By: ==================================================

-//= eAthena Dev Team

-//===== Current Version: =====================================

-//= 1.0 [Skotlex]

-//===== Compatible With: =====================================

-//=

-//===== Description: =========================================

-//= 'nightenabled' specifies which maps can display "night".

-//============================================================

-

-alb2trea.gat	mapflag	nightenabled

-alberta.gat	mapflag	nightenabled

-aldebaran.gat	mapflag	nightenabled

-gef_fild00.gat	mapflag	nightenabled

-gef_fild01.gat	mapflag	nightenabled

-gef_fild02.gat	mapflag	nightenabled

-gef_fild03.gat	mapflag	nightenabled

-gef_fild04.gat	mapflag	nightenabled

-gef_fild05.gat	mapflag	nightenabled

-gef_fild06.gat	mapflag	nightenabled

-gef_fild07.gat	mapflag	nightenabled

-gef_fild08.gat	mapflag	nightenabled

-gef_fild09.gat	mapflag	nightenabled

-gef_fild10.gat	mapflag	nightenabled

-gef_fild11.gat	mapflag	nightenabled

-geffen.gat	mapflag	nightenabled

-glast_01.gat	mapflag	nightenabled

-izlu2dun.gat	mapflag	nightenabled

-izlude.gat	mapflag	nightenabled

-mjolnir_01.gat	mapflag	nightenabled

-mjolnir_02.gat	mapflag	nightenabled

-mjolnir_03.gat	mapflag	nightenabled

-mjolnir_04.gat	mapflag	nightenabled

-mjolnir_05.gat	mapflag	nightenabled

-mjolnir_06.gat	mapflag	nightenabled

-mjolnir_07.gat	mapflag	nightenabled

-mjolnir_08.gat	mapflag	nightenabled

-mjolnir_09.gat	mapflag	nightenabled

-mjolnir_10.gat	mapflag	nightenabled

-mjolnir_11.gat	mapflag	nightenabled

-mjolnir_12.gat	mapflag	nightenabled

-moc_fild01.gat	mapflag	nightenabled

-moc_fild02.gat	mapflag	nightenabled

-moc_fild03.gat	mapflag	nightenabled

-moc_fild04.gat	mapflag	nightenabled

-moc_fild05.gat	mapflag	nightenabled

-moc_fild06.gat	mapflag	nightenabled

-moc_fild07.gat	mapflag	nightenabled

-moc_fild08.gat	mapflag	nightenabled

-moc_fild09.gat	mapflag	nightenabled

-moc_fild10.gat	mapflag	nightenabled

-moc_fild11.gat	mapflag	nightenabled

-moc_fild12.gat	mapflag	nightenabled

-moc_fild13.gat	mapflag	nightenabled

-moc_fild14.gat	mapflag	nightenabled

-moc_fild15.gat	mapflag	nightenabled

-moc_fild16.gat	mapflag	nightenabled

-moc_fild17.gat	mapflag	nightenabled

-moc_fild18.gat	mapflag	nightenabled

-moc_fild19.gat	mapflag	nightenabled

-moc_ruins.gat	mapflag	nightenabled

-morocc.gat	mapflag	nightenabled

-pay_arche.gat	mapflag	nightenabled

-pay_fild01.gat	mapflag	nightenabled

-pay_fild02.gat	mapflag	nightenabled

-pay_fild03.gat	mapflag	nightenabled

-pay_fild04.gat	mapflag	nightenabled

-pay_fild05.gat	mapflag	nightenabled

-pay_fild06.gat	mapflag	nightenabled

-pay_fild07.gat	mapflag	nightenabled

-pay_fild08.gat	mapflag	nightenabled

-pay_fild09.gat	mapflag	nightenabled

-pay_fild10.gat	mapflag	nightenabled

-pay_fild11.gat	mapflag	nightenabled

-prontera.gat	mapflag	nightenabled

-prt_fild00.gat	mapflag	nightenabled

-prt_fild01.gat	mapflag	nightenabled

-prt_fild02.gat	mapflag	nightenabled

-prt_fild03.gat	mapflag	nightenabled

-prt_fild04.gat	mapflag	nightenabled

-prt_fild05.gat	mapflag	nightenabled

-prt_fild06.gat	mapflag	nightenabled

-prt_fild07.gat	mapflag	nightenabled

-prt_fild08.gat	mapflag	nightenabled

-prt_fild09.gat	mapflag	nightenabled

-prt_fild10.gat	mapflag	nightenabled

-prt_fild11.gat	mapflag	nightenabled

-prt_monk.gat	mapflag	nightenabled

-pvp_y_1-1.gat	mapflag	nightenabled

-pvp_y_1-2.gat	mapflag	nightenabled

-pvp_y_1-3.gat	mapflag	nightenabled

-pvp_y_1-4.gat	mapflag	nightenabled

-pvp_y_1-5.gat	mapflag	nightenabled

-pvp_y_2-1.gat	mapflag	nightenabled

-pvp_y_2-2.gat	mapflag	nightenabled

-pvp_y_2-3.gat	mapflag	nightenabled

-pvp_y_2-4.gat	mapflag	nightenabled

-pvp_y_2-5.gat	mapflag	nightenabled

-pvp_y_3-1.gat	mapflag	nightenabled

-pvp_y_3-2.gat	mapflag	nightenabled

-pvp_y_3-3.gat	mapflag	nightenabled

-pvp_y_3-4.gat	mapflag	nightenabled

-pvp_y_3-5.gat	mapflag	nightenabled

-pvp_y_4-1.gat	mapflag	nightenabled

-pvp_y_4-2.gat	mapflag	nightenabled

-pvp_y_4-3.gat	mapflag	nightenabled

-pvp_y_4-4.gat	mapflag	nightenabled

-pvp_y_4-5.gat	mapflag	nightenabled

-pvp_y_5-1.gat	mapflag	nightenabled

-pvp_y_5-2.gat	mapflag	nightenabled

-pvp_y_5-3.gat	mapflag	nightenabled

-pvp_y_5-4.gat	mapflag	nightenabled

-pvp_y_5-5.gat	mapflag	nightenabled

-pvp_y_6-1.gat	mapflag	nightenabled

-pvp_y_6-2.gat	mapflag	nightenabled

-pvp_y_6-3.gat	mapflag	nightenabled

-pvp_y_6-4.gat	mapflag	nightenabled

-pvp_y_6-5.gat	mapflag	nightenabled

-pvp_y_7-1.gat	mapflag	nightenabled

-pvp_y_7-2.gat	mapflag	nightenabled

-pvp_y_7-3.gat	mapflag	nightenabled

-pvp_y_7-4.gat	mapflag	nightenabled

-pvp_y_7-5.gat	mapflag	nightenabled

-pvp_y_8-1.gat	mapflag	nightenabled

-pvp_y_8-2.gat	mapflag	nightenabled

-pvp_y_8-3.gat	mapflag	nightenabled

-pvp_y_8-4.gat	mapflag	nightenabled

-pvp_y_8-5.gat	mapflag	nightenabled

-xmas.gat	mapflag	nightenabled

-xmas_fild01.gat	mapflag	nightenabled

-cmd_fild01.gat	mapflag	nightenabled

-cmd_fild02.gat	mapflag	nightenabled

-cmd_fild03.gat	mapflag	nightenabled

-cmd_fild04.gat	mapflag	nightenabled

-cmd_fild05.gat	mapflag	nightenabled

-cmd_fild06.gat	mapflag	nightenabled

-cmd_fild07.gat	mapflag	nightenabled

-cmd_fild08.gat	mapflag	nightenabled

-cmd_fild09.gat	mapflag	nightenabled

-gef_fild12.gat	mapflag	nightenabled

-gef_fild13.gat	mapflag	nightenabled

-gef_fild14.gat	mapflag	nightenabled

-tur_dun01.gat	mapflag	nightenabled

-alde_gld.gat	mapflag	nightenabled

-pay_gld.gat	mapflag	nightenabled

-prt_gld.gat	mapflag	nightenabled

-yuno.gat	mapflag	nightenabled

-yuno_fild01.gat	mapflag	nightenabled

-yuno_fild02.gat	mapflag	nightenabled

-yuno_fild03.gat	mapflag	nightenabled

-yuno_fild04.gat	mapflag	nightenabled

-ama_fild01.gat	mapflag	nightenabled

-amatsu.gat	mapflag	nightenabled

-gon_fild01.gat	mapflag	nightenabled

-gonryun.gat	mapflag	nightenabled

-umbala.gat	mapflag	nightenabled

-um_fild01.gat	mapflag	nightenabled

-um_fild02.gat	mapflag	nightenabled

-um_fild03.gat	mapflag	nightenabled

-um_fild04.gat	mapflag	nightenabled

-lou_fild01.gat	mapflag	nightenabled

-louyang.gat	mapflag	nightenabled

-jawaii.gat	mapflag	nightenabled

-gefenia01.gat	mapflag	nightenabled

-gefenia02.gat	mapflag	nightenabled

-gefenia03.gat	mapflag	nightenabled

-gefenia04.gat	mapflag	nightenabled

-payon.gat	mapflag	nightenabled

-ayothaya.gat	mapflag	nightenabled

-ayo_fild01.gat	mapflag	nightenabled

-ayo_fild02.gat	mapflag	nightenabled

-yuno_fild05.gat	mapflag	nightenabled

-yuno_fild07.gat	mapflag	nightenabled

-yuno_fild08.gat	mapflag	nightenabled

-yuno_fild09.gat	mapflag	nightenabled

-yuno_fild11.gat	mapflag	nightenabled

-yuno_fild12.gat	mapflag	nightenabled

-einbech.gat	mapflag	nightenabled

-einbroch.gat	mapflag	nightenabled

-ein_fild06.gat	mapflag	nightenabled

-ein_fild07.gat	mapflag	nightenabled

-ein_fild08.gat	mapflag	nightenabled

-ein_fild09.gat	mapflag	nightenabled

-ein_fild10.gat	mapflag	nightenabled

-ein_fild03.gat	mapflag	nightenabled

-ein_fild04.gat	mapflag	nightenabled

-lhz_fild02.gat	mapflag	nightenabled

-lhz_fild03.gat	mapflag	nightenabled

-lhz_fild01.gat	mapflag	nightenabled

-lighthalzen.gat	mapflag	nightenabled

-lhz_in01.gat	mapflag	nightenabled

-lhz_in02.gat	mapflag	nightenabled

-lhz_in03.gat	mapflag	nightenabled

-hu_fild07.gat	mapflag	nightenabled

-hu_fild05.gat	mapflag	nightenabled

-hu_fild04.gat	mapflag	nightenabled

-hu_fild01.gat	mapflag	nightenabled

-yuno_fild06.gat	mapflag	nightenabled

-tha_scene01.gat	mapflag	nightenabled

-hugel.gat	mapflag	nightenabled

-p_track01.gat	mapflag	nightenabled

-p_track01.gat	mapflag	nightenabled

-odin_tem01.gat	mapflag	nightenabled

-odin_tem02.gat	mapflag	nightenabled

-odin_tem03.gat	mapflag	nightenabled

-hu_fild02.gat	mapflag	nightenabled

-hu_fild03.gat	mapflag	nightenabled

-hu_fild06.gat	mapflag	nightenabled

-ein_fild01.gat	mapflag	nightenabled

-ein_fild02.gat	mapflag	nightenabled

-ein_fild05.gat	mapflag	nightenabled

-yuno_fild10.gat	mapflag	nightenabled

-rachel.gat	mapflag	nightenabled

-ra_fild01.gat	mapflag	nightenabled

-ra_fild02.gat	mapflag	nightenabled

-ra_fild03.gat	mapflag	nightenabled

-ra_fild04.gat	mapflag	nightenabled

-ra_fild05.gat	mapflag	nightenabled

-ra_fild06.gat	mapflag	nightenabled

-ra_fild07.gat	mapflag	nightenabled

-ra_fild08.gat	mapflag	nightenabled

-ra_fild09.gat	mapflag	nightenabled

-ra_fild10.gat	mapflag	nightenabled

-ra_fild11.gat	mapflag	nightenabled

-ra_fild12.gat	mapflag	nightenabled

-ra_fild13.gat	mapflag	nightenabled

-ra_temple.gat	mapflag	nightenabled

-ra_temsky.gat	mapflag	nightenabled

+//===== eAthena Script =======================================
+//= Map Flags for maps where the night is visible.
+//===== By: ==================================================
+//= eAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0 [Skotlex]
+//===== Compatible With: =====================================
+//=
+//===== Description: =========================================
+//= 'nightenabled' specifies which maps can display "night".
+//============================================================
+
+alb2trea.gat	mapflag	nightenabled
+alberta.gat	mapflag	nightenabled
+aldebaran.gat	mapflag	nightenabled
+gef_fild00.gat	mapflag	nightenabled
+gef_fild01.gat	mapflag	nightenabled
+gef_fild02.gat	mapflag	nightenabled
+gef_fild03.gat	mapflag	nightenabled
+gef_fild04.gat	mapflag	nightenabled
+gef_fild05.gat	mapflag	nightenabled
+gef_fild06.gat	mapflag	nightenabled
+gef_fild07.gat	mapflag	nightenabled
+gef_fild08.gat	mapflag	nightenabled
+gef_fild09.gat	mapflag	nightenabled
+gef_fild10.gat	mapflag	nightenabled
+gef_fild11.gat	mapflag	nightenabled
+geffen.gat	mapflag	nightenabled
+glast_01.gat	mapflag	nightenabled
+izlu2dun.gat	mapflag	nightenabled
+izlude.gat	mapflag	nightenabled
+mjolnir_01.gat	mapflag	nightenabled
+mjolnir_02.gat	mapflag	nightenabled
+mjolnir_03.gat	mapflag	nightenabled
+mjolnir_04.gat	mapflag	nightenabled
+mjolnir_05.gat	mapflag	nightenabled
+mjolnir_06.gat	mapflag	nightenabled
+mjolnir_07.gat	mapflag	nightenabled
+mjolnir_08.gat	mapflag	nightenabled
+mjolnir_09.gat	mapflag	nightenabled
+mjolnir_10.gat	mapflag	nightenabled
+mjolnir_11.gat	mapflag	nightenabled
+mjolnir_12.gat	mapflag	nightenabled
+moc_fild01.gat	mapflag	nightenabled
+moc_fild02.gat	mapflag	nightenabled
+moc_fild03.gat	mapflag	nightenabled
+moc_fild04.gat	mapflag	nightenabled
+moc_fild05.gat	mapflag	nightenabled
+moc_fild06.gat	mapflag	nightenabled
+moc_fild07.gat	mapflag	nightenabled
+moc_fild08.gat	mapflag	nightenabled
+moc_fild09.gat	mapflag	nightenabled
+moc_fild10.gat	mapflag	nightenabled
+moc_fild11.gat	mapflag	nightenabled
+moc_fild12.gat	mapflag	nightenabled
+moc_fild13.gat	mapflag	nightenabled
+moc_fild14.gat	mapflag	nightenabled
+moc_fild15.gat	mapflag	nightenabled
+moc_fild16.gat	mapflag	nightenabled
+moc_fild17.gat	mapflag	nightenabled
+moc_fild18.gat	mapflag	nightenabled
+moc_fild19.gat	mapflag	nightenabled
+moc_ruins.gat	mapflag	nightenabled
+morocc.gat	mapflag	nightenabled
+pay_arche.gat	mapflag	nightenabled
+pay_fild01.gat	mapflag	nightenabled
+pay_fild02.gat	mapflag	nightenabled
+pay_fild03.gat	mapflag	nightenabled
+pay_fild04.gat	mapflag	nightenabled
+pay_fild05.gat	mapflag	nightenabled
+pay_fild06.gat	mapflag	nightenabled
+pay_fild07.gat	mapflag	nightenabled
+pay_fild08.gat	mapflag	nightenabled
+pay_fild09.gat	mapflag	nightenabled
+pay_fild10.gat	mapflag	nightenabled
+pay_fild11.gat	mapflag	nightenabled
+prontera.gat	mapflag	nightenabled
+prt_fild00.gat	mapflag	nightenabled
+prt_fild01.gat	mapflag	nightenabled
+prt_fild02.gat	mapflag	nightenabled
+prt_fild03.gat	mapflag	nightenabled
+prt_fild04.gat	mapflag	nightenabled
+prt_fild05.gat	mapflag	nightenabled
+prt_fild06.gat	mapflag	nightenabled
+prt_fild07.gat	mapflag	nightenabled
+prt_fild08.gat	mapflag	nightenabled
+prt_fild09.gat	mapflag	nightenabled
+prt_fild10.gat	mapflag	nightenabled
+prt_fild11.gat	mapflag	nightenabled
+prt_monk.gat	mapflag	nightenabled
+pvp_y_1-1.gat	mapflag	nightenabled
+pvp_y_1-2.gat	mapflag	nightenabled
+pvp_y_1-3.gat	mapflag	nightenabled
+pvp_y_1-4.gat	mapflag	nightenabled
+pvp_y_1-5.gat	mapflag	nightenabled
+pvp_y_2-1.gat	mapflag	nightenabled
+pvp_y_2-2.gat	mapflag	nightenabled
+pvp_y_2-3.gat	mapflag	nightenabled
+pvp_y_2-4.gat	mapflag	nightenabled
+pvp_y_2-5.gat	mapflag	nightenabled
+pvp_y_3-1.gat	mapflag	nightenabled
+pvp_y_3-2.gat	mapflag	nightenabled
+pvp_y_3-3.gat	mapflag	nightenabled
+pvp_y_3-4.gat	mapflag	nightenabled
+pvp_y_3-5.gat	mapflag	nightenabled
+pvp_y_4-1.gat	mapflag	nightenabled
+pvp_y_4-2.gat	mapflag	nightenabled
+pvp_y_4-3.gat	mapflag	nightenabled
+pvp_y_4-4.gat	mapflag	nightenabled
+pvp_y_4-5.gat	mapflag	nightenabled
+pvp_y_5-1.gat	mapflag	nightenabled
+pvp_y_5-2.gat	mapflag	nightenabled
+pvp_y_5-3.gat	mapflag	nightenabled
+pvp_y_5-4.gat	mapflag	nightenabled
+pvp_y_5-5.gat	mapflag	nightenabled
+pvp_y_6-1.gat	mapflag	nightenabled
+pvp_y_6-2.gat	mapflag	nightenabled
+pvp_y_6-3.gat	mapflag	nightenabled
+pvp_y_6-4.gat	mapflag	nightenabled
+pvp_y_6-5.gat	mapflag	nightenabled
+pvp_y_7-1.gat	mapflag	nightenabled
+pvp_y_7-2.gat	mapflag	nightenabled
+pvp_y_7-3.gat	mapflag	nightenabled
+pvp_y_7-4.gat	mapflag	nightenabled
+pvp_y_7-5.gat	mapflag	nightenabled
+pvp_y_8-1.gat	mapflag	nightenabled
+pvp_y_8-2.gat	mapflag	nightenabled
+pvp_y_8-3.gat	mapflag	nightenabled
+pvp_y_8-4.gat	mapflag	nightenabled
+pvp_y_8-5.gat	mapflag	nightenabled
+xmas.gat	mapflag	nightenabled
+xmas_fild01.gat	mapflag	nightenabled
+cmd_fild01.gat	mapflag	nightenabled
+cmd_fild02.gat	mapflag	nightenabled
+cmd_fild03.gat	mapflag	nightenabled
+cmd_fild04.gat	mapflag	nightenabled
+cmd_fild05.gat	mapflag	nightenabled
+cmd_fild06.gat	mapflag	nightenabled
+cmd_fild07.gat	mapflag	nightenabled
+cmd_fild08.gat	mapflag	nightenabled
+cmd_fild09.gat	mapflag	nightenabled
+gef_fild12.gat	mapflag	nightenabled
+gef_fild13.gat	mapflag	nightenabled
+gef_fild14.gat	mapflag	nightenabled
+tur_dun01.gat	mapflag	nightenabled
+alde_gld.gat	mapflag	nightenabled
+pay_gld.gat	mapflag	nightenabled
+prt_gld.gat	mapflag	nightenabled
+yuno.gat	mapflag	nightenabled
+yuno_fild01.gat	mapflag	nightenabled
+yuno_fild02.gat	mapflag	nightenabled
+yuno_fild03.gat	mapflag	nightenabled
+yuno_fild04.gat	mapflag	nightenabled
+ama_fild01.gat	mapflag	nightenabled
+amatsu.gat	mapflag	nightenabled
+gon_fild01.gat	mapflag	nightenabled
+gonryun.gat	mapflag	nightenabled
+umbala.gat	mapflag	nightenabled
+um_fild01.gat	mapflag	nightenabled
+um_fild02.gat	mapflag	nightenabled
+um_fild03.gat	mapflag	nightenabled
+um_fild04.gat	mapflag	nightenabled
+lou_fild01.gat	mapflag	nightenabled
+louyang.gat	mapflag	nightenabled
+jawaii.gat	mapflag	nightenabled
+gefenia01.gat	mapflag	nightenabled
+gefenia02.gat	mapflag	nightenabled
+gefenia03.gat	mapflag	nightenabled
+gefenia04.gat	mapflag	nightenabled
+payon.gat	mapflag	nightenabled
+ayothaya.gat	mapflag	nightenabled
+ayo_fild01.gat	mapflag	nightenabled
+ayo_fild02.gat	mapflag	nightenabled
+yuno_fild05.gat	mapflag	nightenabled
+yuno_fild07.gat	mapflag	nightenabled
+yuno_fild08.gat	mapflag	nightenabled
+yuno_fild09.gat	mapflag	nightenabled
+yuno_fild11.gat	mapflag	nightenabled
+yuno_fild12.gat	mapflag	nightenabled
+einbech.gat	mapflag	nightenabled
+einbroch.gat	mapflag	nightenabled
+ein_fild06.gat	mapflag	nightenabled
+ein_fild07.gat	mapflag	nightenabled
+ein_fild08.gat	mapflag	nightenabled
+ein_fild09.gat	mapflag	nightenabled
+ein_fild10.gat	mapflag	nightenabled
+ein_fild03.gat	mapflag	nightenabled
+ein_fild04.gat	mapflag	nightenabled
+lhz_fild02.gat	mapflag	nightenabled
+lhz_fild03.gat	mapflag	nightenabled
+lhz_fild01.gat	mapflag	nightenabled
+lighthalzen.gat	mapflag	nightenabled
+lhz_in01.gat	mapflag	nightenabled
+lhz_in02.gat	mapflag	nightenabled
+lhz_in03.gat	mapflag	nightenabled
+hu_fild07.gat	mapflag	nightenabled
+hu_fild05.gat	mapflag	nightenabled
+hu_fild04.gat	mapflag	nightenabled
+hu_fild01.gat	mapflag	nightenabled
+yuno_fild06.gat	mapflag	nightenabled
+tha_scene01.gat	mapflag	nightenabled
+hugel.gat	mapflag	nightenabled
+p_track01.gat	mapflag	nightenabled
+p_track01.gat	mapflag	nightenabled
+odin_tem01.gat	mapflag	nightenabled
+odin_tem02.gat	mapflag	nightenabled
+odin_tem03.gat	mapflag	nightenabled
+hu_fild02.gat	mapflag	nightenabled
+hu_fild03.gat	mapflag	nightenabled
+hu_fild06.gat	mapflag	nightenabled
+ein_fild01.gat	mapflag	nightenabled
+ein_fild02.gat	mapflag	nightenabled
+ein_fild05.gat	mapflag	nightenabled
+yuno_fild10.gat	mapflag	nightenabled
+rachel.gat	mapflag	nightenabled
+ra_fild01.gat	mapflag	nightenabled
+ra_fild02.gat	mapflag	nightenabled
+ra_fild03.gat	mapflag	nightenabled
+ra_fild04.gat	mapflag	nightenabled
+ra_fild05.gat	mapflag	nightenabled
+ra_fild06.gat	mapflag	nightenabled
+ra_fild07.gat	mapflag	nightenabled
+ra_fild08.gat	mapflag	nightenabled
+ra_fild09.gat	mapflag	nightenabled
+ra_fild10.gat	mapflag	nightenabled
+ra_fild11.gat	mapflag	nightenabled
+ra_fild12.gat	mapflag	nightenabled
+ra_fild13.gat	mapflag	nightenabled
+ra_temple.gat	mapflag	nightenabled
+ra_temsky.gat	mapflag	nightenabled
diff --git a/conf-tmpl/mapflag/nightmare.txt b/conf-tmpl/mapflag/nightmare.txt
index d0c34d188..b185569b6 100644
--- a/conf-tmpl/mapflag/nightmare.txt
+++ b/conf-tmpl/mapflag/nightmare.txt
@@ -1,48 +1,48 @@
-//===== eAthena Script =======================================

-//= Map flags that allow players to drop items/equips on death

-//===== By: ==================================================

-//= eAthena Dev Team

-//===== Current Version: =====================================

-

-

-//Nightmare Equipment Drops PVP

-pvp_n_1-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_2-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_3-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_4-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_5-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_6-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_7-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_8-1.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_1-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_2-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_3-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_4-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_5-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_6-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_7-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_8-2.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_1-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_2-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_3-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_4-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_5-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_6-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_7-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_8-3.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_1-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_2-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_3-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_4-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_5-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_6-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_7-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_8-4.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_1-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_2-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_3-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_4-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_5-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_6-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_7-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

-pvp_n_8-5.gat	mapflag	pvp_nightmaredrop	random,equip,300

+//===== eAthena Script =======================================
+//= Map flags that allow players to drop items/equips on death
+//===== By: ==================================================
+//= eAthena Dev Team
+//===== Current Version: =====================================
+
+
+//Nightmare Equipment Drops PVP
+pvp_n_1-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-1.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-2.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-3.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-4.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-5.gat	mapflag	pvp_nightmaredrop	random,equip,300
diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt
index 81a04d2ae..53cedab5e 100644
--- a/conf-tmpl/mapflag/nobranch.txt
+++ b/conf-tmpl/mapflag/nobranch.txt
@@ -1,288 +1,288 @@
-//===== eAthena Script =======================================

-//= Map flags that disable dead branching

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.2 [Lupus]

-//= 1.3 [massdriller]

-//= 1.6 [Lupus]

-//===== Current Version: =====================================

-

-// Cities ================>\\

-ayo_in01.gat	mapflag	nobranch

-ayo_in02.gat	mapflag	nobranch

-alb_ship.gat	mapflag	nobranch

-alberta_in.gat	mapflag	nobranch

-aldeba_in.gat	mapflag	nobranch

-ama_in01.gat	mapflag	nobranch

-ama_in02.gat	mapflag	nobranch

-ama_test.gat	mapflag	nobranch

-cmd_in01.gat	mapflag	nobranch

-cmd_in02.gat	mapflag	nobranch

-gef_tower.gat	mapflag	nobranch

-geffen_in.gat	mapflag	nobranch

-gon_in.gat	mapflag	nobranch

-gon_test.gat	mapflag	nobranch

-in_orcs01.gat	mapflag	nobranch

-izlude_in.gat	mapflag	nobranch

-jawaii_in.gat	mapflag	nobranch

-lou_in01.gat	mapflag	nobranch

-lou_in02.gat	mapflag	nobranch

-moc_castle.gat	mapflag	nobranch

-morocc_in.gat	mapflag	nobranch

-new_zone01.gat	mapflag	nobranch

-new_zone02.gat	mapflag	nobranch

-new_zone03.gat	mapflag	nobranch

-new_zone04.gat	mapflag	nobranch

-nif_in.gat	mapflag	nobranch

-payon_in01.gat	mapflag	nobranch

-payon_in02.gat	mapflag	nobranch

-payon_in03.gat	mapflag	nobranch

-prt_castle.gat	mapflag	nobranch

-prt_church.gat	mapflag	nobranch

-prt_in.gat	mapflag	nobranch

-um_in.gat	mapflag	nobranch

-xmas_in.gat	mapflag	nobranch

-yuno_in01.gat	mapflag	nobranch

-yuno_in02.gat	mapflag	nobranch

-yuno_in03.gat	mapflag	nobranch

-yuno_in04.gat	mapflag	nobranch

-yuno_in05.gat	mapflag	nobranch

-que_sign01.gat	mapflag	nobranch

-ein_in01.gat	mapflag	nobranch

-airport.gat	mapflag	nobranch

-airplane.gat	mapflag	nobranch

-airplane_01.gat	mapflag	nobranch

-ra_in01.gat	mapflag	nobranch

-// New areas

-yuno_pre.gat	mapflag	nobranch

-y_airport.gat	mapflag	nobranch

-lhz_airport.gat	mapflag	nobranch

-lhz_in01.gat	mapflag	nobranch

-lhz_in02.gat	mapflag	nobranch

-lhz_in03.gat	mapflag	nobranch

-lhz_que01.gat	mapflag	nobranch

-lhz_cube.gat	mapflag	nobranch

-hu_in01.gat	mapflag	nobranch

-auction_01.gat	mapflag	nobranch

-auction_02.gat	mapflag	nobranch

-p_track01.gat	mapflag	nobranch

-p_track02.gat	mapflag	nobranch

-ra_temple.gat	mapflag	nobranch

-ra_temsky.gat	mapflag	nobranch

-que_rachel.gat	mapflag	nobranch

-

-// Job Quests ====================

-job_sword1.gat	mapflag	nobranch

-job_thief1.gat	mapflag	nobranch

-// 2-1

-job_knt.gat	mapflag	nobranch

-job_prist.gat	mapflag	nobranch

-job_wiz.gat	mapflag	nobranch

-job_hunte.gat	mapflag	nobranch

-in_hunter.gat	mapflag	nobranch

-in_moc_16.gat	mapflag	nobranch

-// 2-2

-alde_alche.gat	mapflag	nobranch

-job_cru.gat	mapflag	nobranch

-job_duncer.gat	mapflag	nobranch

-job_monk.gat	mapflag	nobranch

-monk_test.gat	mapflag	nobranch

-monk_in.gat	mapflag	nobranch

-in_rogue.gat	mapflag	nobranch

-job_sage.gat	mapflag	nobranch

-que_ng.gat	mapflag	nobranch

-job_soul.gat	mapflag	nobranch

-job_star.gat	mapflag	nobranch

-

-// Special Quests Places =========

-que_god01.gat	mapflag	nobranch

-que_god02.gat	mapflag	nobranch

-que_bingo.gat	mapflag	nobranch

-que_hugel.gat	mapflag	nobranch

-poring_c01.gat	mapflag	nobranch

-poring_c02.gat	mapflag	nobranch

-kh_mansion.gat	mapflag	nobranch

-kh_rossi.gat	mapflag	nobranch

-kh_school.gat	mapflag	nobranch

-kh_vila.gat	mapflag	nobranch

-

-// Guild Castles ==================

-//alde_gld.gat	mapflag	nobranch

-aldeg_cas01.gat	mapflag	nobranch

-aldeg_cas02.gat	mapflag	nobranch

-aldeg_cas03.gat	mapflag	nobranch

-aldeg_cas04.gat	mapflag	nobranch

-aldeg_cas05.gat	mapflag	nobranch

-gefg_cas01.gat	mapflag	nobranch

-gefg_cas02.gat	mapflag	nobranch

-gefg_cas03.gat	mapflag	nobranch

-gefg_cas04.gat	mapflag	nobranch

-gefg_cas05.gat	mapflag	nobranch

-//pay_gld.gat	mapflag	nobranch

-payg_cas01.gat	mapflag	nobranch

-payg_cas02.gat	mapflag	nobranch

-payg_cas03.gat	mapflag	nobranch

-payg_cas04.gat	mapflag	nobranch

-payg_cas05.gat	mapflag	nobranch

-//prt_gld.gat	mapflag	nobranch

-prtg_cas01.gat	mapflag	nobranch

-prtg_cas02.gat	mapflag	nobranch

-prtg_cas03.gat	mapflag	nobranch

-prtg_cas04.gat	mapflag	nobranch

-prtg_cas05.gat	mapflag	nobranch

-//n_castle.gat	mapflag	nobranch

-nguild_alde.gat	mapflag	nobranch

-nguild_gef.gat	mapflag	nobranch

-nguild_pay.gat	mapflag	nobranch

-nguild_prt.gat	mapflag	nobranch

-

-// GvG Arenas =====================

-guild_vs1.gat	mapflag	nobranch

-guild_vs2.gat	mapflag	nobranch

-guild_vs3.gat	mapflag	nobranch

-guild_vs4.gat	mapflag	nobranch

-guild_vs5.gat	mapflag	nobranch

-

-// Arenas ================>\\

-arena_room.gat	mapflag	nobranch

-force_1-1.gat	mapflag	nobranch

-force_1-2.gat	mapflag	nobranch

-force_1-3.gat	mapflag	nobranch

-ordeal_1-1.gat	mapflag	nobranch

-ordeal_1-2.gat	mapflag	nobranch

-ordeal_1-3.gat	mapflag	nobranch

-ordeal_2-1.gat	mapflag	nobranch

-ordeal_2-2.gat	mapflag	nobranch

-ordeal_2-3.gat	mapflag	nobranch

-ordeal_3-1.gat	mapflag	nobranch

-ordeal_3-2.gat	mapflag	nobranch

-ordeal_3-3.gat	mapflag	nobranch

-pvp_2vs2.gat	mapflag	nobranch

-pvp_c_room.gat	mapflag	nobranch

-quiz_00.gat	mapflag	nobranch

-quiz_01.gat	mapflag	nobranch

-sec_in01.gat	mapflag	nobranch

-//hunter_1-1.gat	mapflag	nobranch

-//hunter_2-1.gat	mapflag	nobranch

-//hunter_3-1.gat	mapflag	nobranch

-//knight_1-1.gat	mapflag	nobranch

-//knight_2-1.gat	mapflag	nobranch

-//knight_3-1.gat	mapflag	nobranch

-//priest_1-1.gat	mapflag	nobranch

-//priest_2-1.gat	mapflag	nobranch

-//priest_3-1.gat	mapflag	nobranch

-prt_are_in.gat	mapflag	nobranch

-prt_are01.gat	mapflag	nobranch

-//wizard_1-1.gat	mapflag	nobranch

-//wizard_2-1.gat	mapflag	nobranch

-//wizard_3-1.gat	mapflag	nobranch

-

-// PvP Arenas =========================

-pvp_y_room.gat	mapflag	nobranch

-pvp_y_1-1.gat	mapflag	nobranch

-pvp_y_1-2.gat	mapflag	nobranch

-pvp_y_1-3.gat	mapflag	nobranch

-pvp_y_1-4.gat	mapflag	nobranch

-pvp_y_1-5.gat	mapflag	nobranch

-pvp_y_2-1.gat	mapflag	nobranch

-pvp_y_2-2.gat	mapflag	nobranch

-pvp_y_2-3.gat	mapflag	nobranch

-pvp_y_2-4.gat	mapflag	nobranch

-pvp_y_2-5.gat	mapflag	nobranch

-pvp_y_3-1.gat	mapflag	nobranch

-pvp_y_3-2.gat	mapflag	nobranch

-pvp_y_3-3.gat	mapflag	nobranch

-pvp_y_3-4.gat	mapflag	nobranch

-pvp_y_3-5.gat	mapflag	nobranch

-pvp_y_4-1.gat	mapflag	nobranch

-pvp_y_4-2.gat	mapflag	nobranch

-pvp_y_4-3.gat	mapflag	nobranch

-pvp_y_4-4.gat	mapflag	nobranch

-pvp_y_4-5.gat	mapflag	nobranch

-pvp_y_5-1.gat	mapflag	nobranch

-pvp_y_5-2.gat	mapflag	nobranch

-pvp_y_5-3.gat	mapflag	nobranch

-pvp_y_5-4.gat	mapflag	nobranch

-pvp_y_5-5.gat	mapflag	nobranch

-pvp_y_6-1.gat	mapflag	nobranch

-pvp_y_6-2.gat	mapflag	nobranch

-pvp_y_6-3.gat	mapflag	nobranch

-pvp_y_6-4.gat	mapflag	nobranch

-pvp_y_6-5.gat	mapflag	nobranch

-pvp_y_7-1.gat	mapflag	nobranch

-pvp_y_7-2.gat	mapflag	nobranch

-pvp_y_7-3.gat	mapflag	nobranch

-pvp_y_7-4.gat	mapflag	nobranch

-pvp_y_7-5.gat	mapflag	nobranch

-pvp_y_8-1.gat	mapflag	nobranch

-pvp_y_8-2.gat	mapflag	nobranch

-pvp_y_8-3.gat	mapflag	nobranch

-pvp_y_8-4.gat	mapflag	nobranch

-pvp_y_8-5.gat	mapflag	nobranch

-pvp_n_room.gat	mapflag	nobranch

-pvp_n_1-1.gat	mapflag	nobranch

-pvp_n_1-2.gat	mapflag	nobranch

-pvp_n_1-3.gat	mapflag	nobranch

-pvp_n_1-4.gat	mapflag	nobranch

-pvp_n_1-5.gat	mapflag	nobranch

-pvp_n_2-1.gat	mapflag	nobranch

-pvp_n_2-2.gat	mapflag	nobranch

-pvp_n_2-3.gat	mapflag	nobranch

-pvp_n_2-4.gat	mapflag	nobranch

-pvp_n_2-5.gat	mapflag	nobranch

-pvp_n_3-1.gat	mapflag	nobranch

-pvp_n_3-2.gat	mapflag	nobranch

-pvp_n_3-3.gat	mapflag	nobranch

-pvp_n_3-4.gat	mapflag	nobranch

-pvp_n_3-5.gat	mapflag	nobranch

-pvp_n_4-1.gat	mapflag	nobranch

-pvp_n_4-2.gat	mapflag	nobranch

-pvp_n_4-3.gat	mapflag	nobranch

-pvp_n_4-4.gat	mapflag	nobranch

-pvp_n_4-5.gat	mapflag	nobranch

-pvp_n_5-1.gat	mapflag	nobranch

-pvp_n_5-2.gat	mapflag	nobranch

-pvp_n_5-3.gat	mapflag	nobranch

-pvp_n_5-4.gat	mapflag	nobranch

-pvp_n_5-5.gat	mapflag	nobranch

-pvp_n_6-1.gat	mapflag	nobranch

-pvp_n_6-2.gat	mapflag	nobranch

-pvp_n_6-3.gat	mapflag	nobranch

-pvp_n_6-4.gat	mapflag	nobranch

-pvp_n_6-5.gat	mapflag	nobranch

-pvp_n_7-1.gat	mapflag	nobranch

-pvp_n_7-2.gat	mapflag	nobranch

-pvp_n_7-3.gat	mapflag	nobranch

-pvp_n_7-4.gat	mapflag	nobranch

-pvp_n_7-5.gat	mapflag	nobranch

-pvp_n_8-1.gat	mapflag	nobranch

-pvp_n_8-2.gat	mapflag	nobranch

-pvp_n_8-3.gat	mapflag	nobranch

-pvp_n_8-4.gat	mapflag	nobranch

-pvp_n_8-5.gat	mapflag	nobranch

-pvp_2vs2.gat	mapflag	nobranch

-

-//Main City maps

-alberta.gat	mapflag	nobranch

-aldebaran.gat	mapflag	nobranch

-amatsu.gat	mapflag	nobranch

-ayothaya.gat	mapflag	nobranch

-comodo.gat	mapflag	nobranch

-einbroch.gat	mapflag	nobranch

-einbech.gat	mapflag	nobranch

-geffen.gat	mapflag	nobranch

-gonryun.gat	mapflag	nobranch

-izlude.gat	mapflag	nobranch

-jawaii.gat	mapflag	nobranch

-hugel.gat	mapflag	nobranch

-lighthalzen.gat	mapflag	nobranch

-louyang.gat	mapflag	nobranch

-morocc.gat	mapflag	nobranch

-niflheim.gat	mapflag	nobranch

-prontera.gat	mapflag	nobranch

-payon.gat	mapflag	nobranch

-pay_arche.gat	mapflag	nobranch

-umbala.gat	mapflag	nobranch

-xmas.gat	mapflag	nobranch

-yuno.gat	mapflag	nobranch

+//===== eAthena Script =======================================
+//= Map flags that disable dead branching
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.2 [Lupus]
+//= 1.3 [massdriller]
+//= 1.6 [Lupus]
+//===== Current Version: =====================================
+
+// Cities ================>\\
+ayo_in01.gat	mapflag	nobranch
+ayo_in02.gat	mapflag	nobranch
+alb_ship.gat	mapflag	nobranch
+alberta_in.gat	mapflag	nobranch
+aldeba_in.gat	mapflag	nobranch
+ama_in01.gat	mapflag	nobranch
+ama_in02.gat	mapflag	nobranch
+ama_test.gat	mapflag	nobranch
+cmd_in01.gat	mapflag	nobranch
+cmd_in02.gat	mapflag	nobranch
+gef_tower.gat	mapflag	nobranch
+geffen_in.gat	mapflag	nobranch
+gon_in.gat	mapflag	nobranch
+gon_test.gat	mapflag	nobranch
+in_orcs01.gat	mapflag	nobranch
+izlude_in.gat	mapflag	nobranch
+jawaii_in.gat	mapflag	nobranch
+lou_in01.gat	mapflag	nobranch
+lou_in02.gat	mapflag	nobranch
+moc_castle.gat	mapflag	nobranch
+morocc_in.gat	mapflag	nobranch
+new_zone01.gat	mapflag	nobranch
+new_zone02.gat	mapflag	nobranch
+new_zone03.gat	mapflag	nobranch
+new_zone04.gat	mapflag	nobranch
+nif_in.gat	mapflag	nobranch
+payon_in01.gat	mapflag	nobranch
+payon_in02.gat	mapflag	nobranch
+payon_in03.gat	mapflag	nobranch
+prt_castle.gat	mapflag	nobranch
+prt_church.gat	mapflag	nobranch
+prt_in.gat	mapflag	nobranch
+um_in.gat	mapflag	nobranch
+xmas_in.gat	mapflag	nobranch
+yuno_in01.gat	mapflag	nobranch
+yuno_in02.gat	mapflag	nobranch
+yuno_in03.gat	mapflag	nobranch
+yuno_in04.gat	mapflag	nobranch
+yuno_in05.gat	mapflag	nobranch
+que_sign01.gat	mapflag	nobranch
+ein_in01.gat	mapflag	nobranch
+airport.gat	mapflag	nobranch
+airplane.gat	mapflag	nobranch
+airplane_01.gat	mapflag	nobranch
+ra_in01.gat	mapflag	nobranch
+// New areas
+yuno_pre.gat	mapflag	nobranch
+y_airport.gat	mapflag	nobranch
+lhz_airport.gat	mapflag	nobranch
+lhz_in01.gat	mapflag	nobranch
+lhz_in02.gat	mapflag	nobranch
+lhz_in03.gat	mapflag	nobranch
+lhz_que01.gat	mapflag	nobranch
+lhz_cube.gat	mapflag	nobranch
+hu_in01.gat	mapflag	nobranch
+auction_01.gat	mapflag	nobranch
+auction_02.gat	mapflag	nobranch
+p_track01.gat	mapflag	nobranch
+p_track02.gat	mapflag	nobranch
+ra_temple.gat	mapflag	nobranch
+ra_temsky.gat	mapflag	nobranch
+que_rachel.gat	mapflag	nobranch
+
+// Job Quests ====================
+job_sword1.gat	mapflag	nobranch
+job_thief1.gat	mapflag	nobranch
+// 2-1
+job_knt.gat	mapflag	nobranch
+job_prist.gat	mapflag	nobranch
+job_wiz.gat	mapflag	nobranch
+job_hunte.gat	mapflag	nobranch
+in_hunter.gat	mapflag	nobranch
+in_moc_16.gat	mapflag	nobranch
+// 2-2
+alde_alche.gat	mapflag	nobranch
+job_cru.gat	mapflag	nobranch
+job_duncer.gat	mapflag	nobranch
+job_monk.gat	mapflag	nobranch
+monk_test.gat	mapflag	nobranch
+monk_in.gat	mapflag	nobranch
+in_rogue.gat	mapflag	nobranch
+job_sage.gat	mapflag	nobranch
+que_ng.gat	mapflag	nobranch
+job_soul.gat	mapflag	nobranch
+job_star.gat	mapflag	nobranch
+
+// Special Quests Places =========
+que_god01.gat	mapflag	nobranch
+que_god02.gat	mapflag	nobranch
+que_bingo.gat	mapflag	nobranch
+que_hugel.gat	mapflag	nobranch
+poring_c01.gat	mapflag	nobranch
+poring_c02.gat	mapflag	nobranch
+kh_mansion.gat	mapflag	nobranch
+kh_rossi.gat	mapflag	nobranch
+kh_school.gat	mapflag	nobranch
+kh_vila.gat	mapflag	nobranch
+
+// Guild Castles ==================
+//alde_gld.gat	mapflag	nobranch
+aldeg_cas01.gat	mapflag	nobranch
+aldeg_cas02.gat	mapflag	nobranch
+aldeg_cas03.gat	mapflag	nobranch
+aldeg_cas04.gat	mapflag	nobranch
+aldeg_cas05.gat	mapflag	nobranch
+gefg_cas01.gat	mapflag	nobranch
+gefg_cas02.gat	mapflag	nobranch
+gefg_cas03.gat	mapflag	nobranch
+gefg_cas04.gat	mapflag	nobranch
+gefg_cas05.gat	mapflag	nobranch
+//pay_gld.gat	mapflag	nobranch
+payg_cas01.gat	mapflag	nobranch
+payg_cas02.gat	mapflag	nobranch
+payg_cas03.gat	mapflag	nobranch
+payg_cas04.gat	mapflag	nobranch
+payg_cas05.gat	mapflag	nobranch
+//prt_gld.gat	mapflag	nobranch
+prtg_cas01.gat	mapflag	nobranch
+prtg_cas02.gat	mapflag	nobranch
+prtg_cas03.gat	mapflag	nobranch
+prtg_cas04.gat	mapflag	nobranch
+prtg_cas05.gat	mapflag	nobranch
+//n_castle.gat	mapflag	nobranch
+nguild_alde.gat	mapflag	nobranch
+nguild_gef.gat	mapflag	nobranch
+nguild_pay.gat	mapflag	nobranch
+nguild_prt.gat	mapflag	nobranch
+
+// GvG Arenas =====================
+guild_vs1.gat	mapflag	nobranch
+guild_vs2.gat	mapflag	nobranch
+guild_vs3.gat	mapflag	nobranch
+guild_vs4.gat	mapflag	nobranch
+guild_vs5.gat	mapflag	nobranch
+
+// Arenas ================>\\
+arena_room.gat	mapflag	nobranch
+force_1-1.gat	mapflag	nobranch
+force_1-2.gat	mapflag	nobranch
+force_1-3.gat	mapflag	nobranch
+ordeal_1-1.gat	mapflag	nobranch
+ordeal_1-2.gat	mapflag	nobranch
+ordeal_1-3.gat	mapflag	nobranch
+ordeal_2-1.gat	mapflag	nobranch
+ordeal_2-2.gat	mapflag	nobranch
+ordeal_2-3.gat	mapflag	nobranch
+ordeal_3-1.gat	mapflag	nobranch
+ordeal_3-2.gat	mapflag	nobranch
+ordeal_3-3.gat	mapflag	nobranch
+pvp_2vs2.gat	mapflag	nobranch
+pvp_c_room.gat	mapflag	nobranch
+quiz_00.gat	mapflag	nobranch
+quiz_01.gat	mapflag	nobranch
+sec_in01.gat	mapflag	nobranch
+//hunter_1-1.gat	mapflag	nobranch
+//hunter_2-1.gat	mapflag	nobranch
+//hunter_3-1.gat	mapflag	nobranch
+//knight_1-1.gat	mapflag	nobranch
+//knight_2-1.gat	mapflag	nobranch
+//knight_3-1.gat	mapflag	nobranch
+//priest_1-1.gat	mapflag	nobranch
+//priest_2-1.gat	mapflag	nobranch
+//priest_3-1.gat	mapflag	nobranch
+prt_are_in.gat	mapflag	nobranch
+prt_are01.gat	mapflag	nobranch
+//wizard_1-1.gat	mapflag	nobranch
+//wizard_2-1.gat	mapflag	nobranch
+//wizard_3-1.gat	mapflag	nobranch
+
+// PvP Arenas =========================
+pvp_y_room.gat	mapflag	nobranch
+pvp_y_1-1.gat	mapflag	nobranch
+pvp_y_1-2.gat	mapflag	nobranch
+pvp_y_1-3.gat	mapflag	nobranch
+pvp_y_1-4.gat	mapflag	nobranch
+pvp_y_1-5.gat	mapflag	nobranch
+pvp_y_2-1.gat	mapflag	nobranch
+pvp_y_2-2.gat	mapflag	nobranch
+pvp_y_2-3.gat	mapflag	nobranch
+pvp_y_2-4.gat	mapflag	nobranch
+pvp_y_2-5.gat	mapflag	nobranch
+pvp_y_3-1.gat	mapflag	nobranch
+pvp_y_3-2.gat	mapflag	nobranch
+pvp_y_3-3.gat	mapflag	nobranch
+pvp_y_3-4.gat	mapflag	nobranch
+pvp_y_3-5.gat	mapflag	nobranch
+pvp_y_4-1.gat	mapflag	nobranch
+pvp_y_4-2.gat	mapflag	nobranch
+pvp_y_4-3.gat	mapflag	nobranch
+pvp_y_4-4.gat	mapflag	nobranch
+pvp_y_4-5.gat	mapflag	nobranch
+pvp_y_5-1.gat	mapflag	nobranch
+pvp_y_5-2.gat	mapflag	nobranch
+pvp_y_5-3.gat	mapflag	nobranch
+pvp_y_5-4.gat	mapflag	nobranch
+pvp_y_5-5.gat	mapflag	nobranch
+pvp_y_6-1.gat	mapflag	nobranch
+pvp_y_6-2.gat	mapflag	nobranch
+pvp_y_6-3.gat	mapflag	nobranch
+pvp_y_6-4.gat	mapflag	nobranch
+pvp_y_6-5.gat	mapflag	nobranch
+pvp_y_7-1.gat	mapflag	nobranch
+pvp_y_7-2.gat	mapflag	nobranch
+pvp_y_7-3.gat	mapflag	nobranch
+pvp_y_7-4.gat	mapflag	nobranch
+pvp_y_7-5.gat	mapflag	nobranch
+pvp_y_8-1.gat	mapflag	nobranch
+pvp_y_8-2.gat	mapflag	nobranch
+pvp_y_8-3.gat	mapflag	nobranch
+pvp_y_8-4.gat	mapflag	nobranch
+pvp_y_8-5.gat	mapflag	nobranch
+pvp_n_room.gat	mapflag	nobranch
+pvp_n_1-1.gat	mapflag	nobranch
+pvp_n_1-2.gat	mapflag	nobranch
+pvp_n_1-3.gat	mapflag	nobranch
+pvp_n_1-4.gat	mapflag	nobranch
+pvp_n_1-5.gat	mapflag	nobranch
+pvp_n_2-1.gat	mapflag	nobranch
+pvp_n_2-2.gat	mapflag	nobranch
+pvp_n_2-3.gat	mapflag	nobranch
+pvp_n_2-4.gat	mapflag	nobranch
+pvp_n_2-5.gat	mapflag	nobranch
+pvp_n_3-1.gat	mapflag	nobranch
+pvp_n_3-2.gat	mapflag	nobranch
+pvp_n_3-3.gat	mapflag	nobranch
+pvp_n_3-4.gat	mapflag	nobranch
+pvp_n_3-5.gat	mapflag	nobranch
+pvp_n_4-1.gat	mapflag	nobranch
+pvp_n_4-2.gat	mapflag	nobranch
+pvp_n_4-3.gat	mapflag	nobranch
+pvp_n_4-4.gat	mapflag	nobranch
+pvp_n_4-5.gat	mapflag	nobranch
+pvp_n_5-1.gat	mapflag	nobranch
+pvp_n_5-2.gat	mapflag	nobranch
+pvp_n_5-3.gat	mapflag	nobranch
+pvp_n_5-4.gat	mapflag	nobranch
+pvp_n_5-5.gat	mapflag	nobranch
+pvp_n_6-1.gat	mapflag	nobranch
+pvp_n_6-2.gat	mapflag	nobranch
+pvp_n_6-3.gat	mapflag	nobranch
+pvp_n_6-4.gat	mapflag	nobranch
+pvp_n_6-5.gat	mapflag	nobranch
+pvp_n_7-1.gat	mapflag	nobranch
+pvp_n_7-2.gat	mapflag	nobranch
+pvp_n_7-3.gat	mapflag	nobranch
+pvp_n_7-4.gat	mapflag	nobranch
+pvp_n_7-5.gat	mapflag	nobranch
+pvp_n_8-1.gat	mapflag	nobranch
+pvp_n_8-2.gat	mapflag	nobranch
+pvp_n_8-3.gat	mapflag	nobranch
+pvp_n_8-4.gat	mapflag	nobranch
+pvp_n_8-5.gat	mapflag	nobranch
+pvp_2vs2.gat	mapflag	nobranch
+
+//Main City maps
+alberta.gat	mapflag	nobranch
+aldebaran.gat	mapflag	nobranch
+amatsu.gat	mapflag	nobranch
+ayothaya.gat	mapflag	nobranch
+comodo.gat	mapflag	nobranch
+einbroch.gat	mapflag	nobranch
+einbech.gat	mapflag	nobranch
+geffen.gat	mapflag	nobranch
+gonryun.gat	mapflag	nobranch
+izlude.gat	mapflag	nobranch
+jawaii.gat	mapflag	nobranch
+hugel.gat	mapflag	nobranch
+lighthalzen.gat	mapflag	nobranch
+louyang.gat	mapflag	nobranch
+morocc.gat	mapflag	nobranch
+niflheim.gat	mapflag	nobranch
+prontera.gat	mapflag	nobranch
+payon.gat	mapflag	nobranch
+pay_arche.gat	mapflag	nobranch
+umbala.gat	mapflag	nobranch
+xmas.gat	mapflag	nobranch
+yuno.gat	mapflag	nobranch
 rachel.gat	mapflag	nobranch
\ No newline at end of file
diff --git a/conf-tmpl/mapflag/noexp.txt b/conf-tmpl/mapflag/noexp.txt
index 0d6fbddef..17fe3dd8c 100644
--- a/conf-tmpl/mapflag/noexp.txt
+++ b/conf-tmpl/mapflag/noexp.txt
@@ -1,23 +1,23 @@
-//===== eAthena Script =======================================

-//= Map flags that disable gaining EXP

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky

-//= 1.6 Added Lighthalzen (due to quests) [Lupus]

-//============================================================

-

-// Location for Job's Quests

-job_thief1.gat	mapflag	noexp

-job_sword1.gat	mapflag	noexp

-in_moc_16.gat	mapflag	noexp

-job_hunte.gat	mapflag	noexp

-job_knt.gat	mapflag	noexp

-job_prist.gat	mapflag	noexp

-job_wiz.gat	mapflag	noexp

-job_cru.gat	mapflag	noexp

-monk_test.gat	mapflag	noexp

-in_rogue.gat	mapflag	noexp

-job_sage.gat	mapflag	noexp

-job_soul.gat	mapflag	noexp

-job_star.gat	mapflag	noexp

-que_ng.gat	mapflag	noexp

+//===== eAthena Script =======================================
+//= Map flags that disable gaining EXP
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky
+//= 1.6 Added Lighthalzen (due to quests) [Lupus]
+//============================================================
+
+// Location for Job's Quests
+job_thief1.gat	mapflag	noexp
+job_sword1.gat	mapflag	noexp
+in_moc_16.gat	mapflag	noexp
+job_hunte.gat	mapflag	noexp
+job_knt.gat	mapflag	noexp
+job_prist.gat	mapflag	noexp
+job_wiz.gat	mapflag	noexp
+job_cru.gat	mapflag	noexp
+monk_test.gat	mapflag	noexp
+in_rogue.gat	mapflag	noexp
+job_sage.gat	mapflag	noexp
+job_soul.gat	mapflag	noexp
+job_star.gat	mapflag	noexp
+que_ng.gat	mapflag	noexp
diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt
index 4d89791c0..616feb8dc 100644
--- a/conf-tmpl/mapflag/noicewall.txt
+++ b/conf-tmpl/mapflag/noicewall.txt
@@ -1,120 +1,120 @@
-//===== eAthena Script =======================================

-//= Map flags that disable icewall skill

-//===== By: ==================================================

-//= eAthena Dev Team

-//=============================================================

-//= noicewall: Disables Icewall skill.

-//= To disable Icewall on a specific map add the mapname here.

-//= 1.5 [Lupus]

-//============================================================

-

-ayo_in01.gat	mapflag	noicewall

-ayo_in02.gat	mapflag	noicewall

-alberta_in.gat	mapflag	noicewall

-alberta.gat	mapflag	noicewall

-alde_alche.gat	mapflag	noicewall

-aldeba_in.gat	mapflag	noicewall

-aldebaran.gat	mapflag	noicewall

-ama_in01.gat	mapflag	noicewall

-ama_in02.gat	mapflag	noicewall

-amatsu.gat	mapflag	noicewall

-ayothaya.gat	mapflag	noicewall

-cmd_in01.gat	mapflag	noicewall

-cmd_in02.gat	mapflag	noicewall

-comodo.gat	mapflag	noicewall

-einbroch.gat	mapflag	noicewall

-einbech.gat	mapflag	noicewall

-gef_tower.gat	mapflag	noicewall

-geffen.gat	mapflag	noicewall

-geffen_in.gat	mapflag	noicewall

-gon_in.gat	mapflag	noicewall

-gonryun.gat	mapflag	noicewall

-in_hunter.gat	mapflag	noicewall

-in_moc_16.gat	mapflag	noicewall

-in_orcs01.gat	mapflag	noicewall

-izlude_in.gat	mapflag	noicewall

-izlude.gat	mapflag	noicewall

-hugel.gat	mapflag	noicewall

-jawaii.gat	mapflag	noicewall

-moc_castle.gat	mapflag	noicewall

-monk_in.gat	mapflag	noicewall

-morocc_in.gat	mapflag	noicewall

-morocc.gat	mapflag	noicewall

-payon_in01.gat	mapflag	noicewall

-payon_in02.gat	mapflag	noicewall

-payon_in03.gat	mapflag	noicewall

-payon.gat	mapflag	noicewall

-pay_arche.gat	mapflag	noicewall

-prt_are_in.gat	mapflag	noicewall

-prt_are01.gat	mapflag	noicewall

-prt_castle.gat	mapflag	noicewall

-prt_church.gat	mapflag	noicewall

-prt_in.gat	mapflag	noicewall

-prontera.gat	mapflag	noicewall

-sec_in01.gat	mapflag	noicewall

-job_sword1.gat	mapflag	noicewall

-um_in.gat	mapflag	noicewall

-umbala.gat	mapflag	noicewall

-xmas_in.gat	mapflag	noicewall

-xmas.gat	mapflag	noicewall

-yuno_in01.gat	mapflag	noicewall

-yuno_in02.gat	mapflag	noicewall

-yuno_in03.gat	mapflag	noicewall

-yuno_in04.gat	mapflag	noicewall

-yuno_in05.gat	mapflag	noicewall

-yuno.gat	mapflag	noicewall

-gon_test.gat	mapflag	noicewall

-nif_in.gat	mapflag	noicewall

-louyang.gat	mapflag	noicewall

-que_sign01.gat	mapflag	noicewall

-ein_in01.gat	mapflag	noicewall

-airport.gat	mapflag	noicewall

-airplane.gat	mapflag	noicewall

-airplane_01.gat	mapflag	noicewall

-lighthalzen.gat	mapflag	noicewall

-yuno_pre.gat	mapflag	noicewall

-y_airport.gat	mapflag	noicewall

-lhz_airport.gat	mapflag	noicewall

-lhz_in01.gat	mapflag	noicewall

-lhz_in02.gat	mapflag	noicewall

-lhz_in03.gat	mapflag	noicewall

-rachel.gat	mapflag	noicewall

-ra_in01.gat	mapflag	noicewall

-ra_temin.gat	mapflag	noicewall

-ra_temple.gat	mapflag	noicewall

-ra_temsky.gat	mapflag	noicewall

-que_rachel.gat	mapflag	noicewall

-auction_01.gat	mapflag	noicewall

-auction_02.gat	mapflag	noicewall

-hu_in01.gat	mapflag	noicewall

-kh_mansion.gat	mapflag	noicewall

-kh_rossi.gat	mapflag	noicewall

-kh_school.gat	mapflag	noicewall

-kh_vila.gat	mapflag	noicewall

-

-// Guild Castles ==========

-aldeg_cas01.gat	mapflag	noicewall

-aldeg_cas02.gat	mapflag	noicewall

-aldeg_cas03.gat	mapflag	noicewall

-aldeg_cas04.gat	mapflag	noicewall

-aldeg_cas05.gat	mapflag	noicewall

-gefg_cas01.gat	mapflag	noicewall

-gefg_cas02.gat	mapflag	noicewall

-gefg_cas03.gat	mapflag	noicewall

-gefg_cas04.gat	mapflag	noicewall

-gefg_cas05.gat	mapflag	noicewall

-payg_cas01.gat	mapflag	noicewall

-payg_cas02.gat	mapflag	noicewall

-payg_cas03.gat	mapflag	noicewall

-payg_cas04.gat	mapflag	noicewall

-payg_cas05.gat	mapflag	noicewall

-prtg_cas01.gat	mapflag	noicewall

-prtg_cas02.gat	mapflag	noicewall

-prtg_cas03.gat	mapflag	noicewall

-prtg_cas04.gat	mapflag	noicewall

-prtg_cas05.gat	mapflag	noicewall

-// Novice Guild Castles ===

-nguild_alde.gat	mapflag	noicewall

-nguild_gef.gat	mapflag	noicewall

-nguild_pay.gat	mapflag	noicewall

-nguild_prt.gat	mapflag	noicewall

+//===== eAthena Script =======================================
+//= Map flags that disable icewall skill
+//===== By: ==================================================
+//= eAthena Dev Team
+//=============================================================
+//= noicewall: Disables Icewall skill.
+//= To disable Icewall on a specific map add the mapname here.
+//= 1.5 [Lupus]
+//============================================================
+
+ayo_in01.gat	mapflag	noicewall
+ayo_in02.gat	mapflag	noicewall
+alberta_in.gat	mapflag	noicewall
+alberta.gat	mapflag	noicewall
+alde_alche.gat	mapflag	noicewall
+aldeba_in.gat	mapflag	noicewall
+aldebaran.gat	mapflag	noicewall
+ama_in01.gat	mapflag	noicewall
+ama_in02.gat	mapflag	noicewall
+amatsu.gat	mapflag	noicewall
+ayothaya.gat	mapflag	noicewall
+cmd_in01.gat	mapflag	noicewall
+cmd_in02.gat	mapflag	noicewall
+comodo.gat	mapflag	noicewall
+einbroch.gat	mapflag	noicewall
+einbech.gat	mapflag	noicewall
+gef_tower.gat	mapflag	noicewall
+geffen.gat	mapflag	noicewall
+geffen_in.gat	mapflag	noicewall
+gon_in.gat	mapflag	noicewall
+gonryun.gat	mapflag	noicewall
+in_hunter.gat	mapflag	noicewall
+in_moc_16.gat	mapflag	noicewall
+in_orcs01.gat	mapflag	noicewall
+izlude_in.gat	mapflag	noicewall
+izlude.gat	mapflag	noicewall
+hugel.gat	mapflag	noicewall
+jawaii.gat	mapflag	noicewall
+moc_castle.gat	mapflag	noicewall
+monk_in.gat	mapflag	noicewall
+morocc_in.gat	mapflag	noicewall
+morocc.gat	mapflag	noicewall
+payon_in01.gat	mapflag	noicewall
+payon_in02.gat	mapflag	noicewall
+payon_in03.gat	mapflag	noicewall
+payon.gat	mapflag	noicewall
+pay_arche.gat	mapflag	noicewall
+prt_are_in.gat	mapflag	noicewall
+prt_are01.gat	mapflag	noicewall
+prt_castle.gat	mapflag	noicewall
+prt_church.gat	mapflag	noicewall
+prt_in.gat	mapflag	noicewall
+prontera.gat	mapflag	noicewall
+sec_in01.gat	mapflag	noicewall
+job_sword1.gat	mapflag	noicewall
+um_in.gat	mapflag	noicewall
+umbala.gat	mapflag	noicewall
+xmas_in.gat	mapflag	noicewall
+xmas.gat	mapflag	noicewall
+yuno_in01.gat	mapflag	noicewall
+yuno_in02.gat	mapflag	noicewall
+yuno_in03.gat	mapflag	noicewall
+yuno_in04.gat	mapflag	noicewall
+yuno_in05.gat	mapflag	noicewall
+yuno.gat	mapflag	noicewall
+gon_test.gat	mapflag	noicewall
+nif_in.gat	mapflag	noicewall
+louyang.gat	mapflag	noicewall
+que_sign01.gat	mapflag	noicewall
+ein_in01.gat	mapflag	noicewall
+airport.gat	mapflag	noicewall
+airplane.gat	mapflag	noicewall
+airplane_01.gat	mapflag	noicewall
+lighthalzen.gat	mapflag	noicewall
+yuno_pre.gat	mapflag	noicewall
+y_airport.gat	mapflag	noicewall
+lhz_airport.gat	mapflag	noicewall
+lhz_in01.gat	mapflag	noicewall
+lhz_in02.gat	mapflag	noicewall
+lhz_in03.gat	mapflag	noicewall
+rachel.gat	mapflag	noicewall
+ra_in01.gat	mapflag	noicewall
+ra_temin.gat	mapflag	noicewall
+ra_temple.gat	mapflag	noicewall
+ra_temsky.gat	mapflag	noicewall
+que_rachel.gat	mapflag	noicewall
+auction_01.gat	mapflag	noicewall
+auction_02.gat	mapflag	noicewall
+hu_in01.gat	mapflag	noicewall
+kh_mansion.gat	mapflag	noicewall
+kh_rossi.gat	mapflag	noicewall
+kh_school.gat	mapflag	noicewall
+kh_vila.gat	mapflag	noicewall
+
+// Guild Castles ==========
+aldeg_cas01.gat	mapflag	noicewall
+aldeg_cas02.gat	mapflag	noicewall
+aldeg_cas03.gat	mapflag	noicewall
+aldeg_cas04.gat	mapflag	noicewall
+aldeg_cas05.gat	mapflag	noicewall
+gefg_cas01.gat	mapflag	noicewall
+gefg_cas02.gat	mapflag	noicewall
+gefg_cas03.gat	mapflag	noicewall
+gefg_cas04.gat	mapflag	noicewall
+gefg_cas05.gat	mapflag	noicewall
+payg_cas01.gat	mapflag	noicewall
+payg_cas02.gat	mapflag	noicewall
+payg_cas03.gat	mapflag	noicewall
+payg_cas04.gat	mapflag	noicewall
+payg_cas05.gat	mapflag	noicewall
+prtg_cas01.gat	mapflag	noicewall
+prtg_cas02.gat	mapflag	noicewall
+prtg_cas03.gat	mapflag	noicewall
+prtg_cas04.gat	mapflag	noicewall
+prtg_cas05.gat	mapflag	noicewall
+// Novice Guild Castles ===
+nguild_alde.gat	mapflag	noicewall
+nguild_gef.gat	mapflag	noicewall
+nguild_pay.gat	mapflag	noicewall
+nguild_prt.gat	mapflag	noicewall
diff --git a/conf-tmpl/mapflag/noloot.txt b/conf-tmpl/mapflag/noloot.txt
index 928588338..99f6493e4 100644
--- a/conf-tmpl/mapflag/noloot.txt
+++ b/conf-tmpl/mapflag/noloot.txt
@@ -1,25 +1,25 @@
-//===== eAthena Script =======================================

-//= Map flags that disable drop of loot

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky

-//= 1.6 Added Lighthalzen (due to quests) [Lupus]

-//============================================================

-

-// Location for Job's Quests

-job_sword1.gat	mapflag	noloot

-in_moc_16.gat	mapflag	noloot

-job_hunte.gat	mapflag	noloot

-job_knt.gat	mapflag	noloot

-job_prist.gat	mapflag	noloot

-job_wiz.gat	mapflag	noloot

-job_cru.gat	mapflag	noloot

-monk_test.gat	mapflag	noloot

-in_rogue.gat	mapflag	noloot

-job_sage.gat	mapflag	noloot

-job_soul.gat	mapflag	noloot

-job_star.gat	mapflag	noloot

-que_ng.gat	mapflag	noloot

-

-//Thievs have to gather some mushrooms. So they need loot

-//job_thief1.gat	mapflag	noloot

+//===== eAthena Script =======================================
+//= Map flags that disable drop of loot
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.2 [Lupus] 1.3 [massdriller] 1.4 Lupus 1.5 Lorky
+//= 1.6 Added Lighthalzen (due to quests) [Lupus]
+//============================================================
+
+// Location for Job's Quests
+job_sword1.gat	mapflag	noloot
+in_moc_16.gat	mapflag	noloot
+job_hunte.gat	mapflag	noloot
+job_knt.gat	mapflag	noloot
+job_prist.gat	mapflag	noloot
+job_wiz.gat	mapflag	noloot
+job_cru.gat	mapflag	noloot
+monk_test.gat	mapflag	noloot
+in_rogue.gat	mapflag	noloot
+job_sage.gat	mapflag	noloot
+job_soul.gat	mapflag	noloot
+job_star.gat	mapflag	noloot
+que_ng.gat	mapflag	noloot
+
+//Thievs have to gather some mushrooms. So they need loot
+//job_thief1.gat	mapflag	noloot
diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt
index c31c32480..a84b87067 100644
--- a/conf-tmpl/mapflag/nomemo.txt
+++ b/conf-tmpl/mapflag/nomemo.txt
@@ -1,531 +1,531 @@
-//===== eAthena Script =======================================

-//= Map flags that disable warp portal memory

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.6 added up to Hugel maps. [Lupus]

-//===== Current Version: =====================================

-

-

-// Towns  ====================

-ayo_in01.gat	mapflag	nomemo

-ayo_in02.gat	mapflag	nomemo

-alb_ship.gat	mapflag	nomemo

-alberta_in.gat	mapflag	nomemo

-aldeba_in.gat	mapflag	nomemo

-ama_in01.gat	mapflag	nomemo

-ama_in02.gat	mapflag	nomemo

-ama_test.gat	mapflag	nomemo

-cmd_in01.gat	mapflag	nomemo

-cmd_in02.gat	mapflag	nomemo

-gef_tower.gat	mapflag	nomemo

-geffen_in.gat	mapflag	nomemo

-gon_test.gat	mapflag	nomemo

-gon_in.gat	mapflag	nomemo

-in_orcs01.gat	mapflag	nomemo

-izlude_in.gat	mapflag	nomemo

-jawaii_in.gat	mapflag	nomemo

-lou_in01.gat	mapflag	nomemo

-lou_in02.gat	mapflag	nomemo

-moc_castle.gat	mapflag	nomemo

-morocc_in.gat	mapflag	nomemo

-niflheim.gat	mapflag	nomemo

-nif_in.gat	mapflag	nomemo

-new_zone01.gat	mapflag	nomemo

-new_zone02.gat	mapflag	nomemo

-new_zone03.gat	mapflag	nomemo

-new_zone04.gat	mapflag	nomemo

-pay_arche.gat	mapflag	nomemo

-payon_in01.gat	mapflag	nomemo

-payon_in02.gat	mapflag	nomemo

-payon_in03.gat	mapflag	nomemo

-prt_castle.gat	mapflag	nomemo

-prt_church.gat	mapflag	nomemo

-prt_in.gat	mapflag	nomemo

-um_in.gat	mapflag	nomemo

-xmas_in.gat	mapflag	nomemo

-valkyrie.gat	mapflag	nomemo

-yuno_in01.gat	mapflag	nomemo

-yuno_in02.gat	mapflag	nomemo

-yuno_in03.gat	mapflag	nomemo

-yuno_in04.gat	mapflag	nomemo

-yuno_in05.gat	mapflag	nomemo

-yuno.gat	mapflag	nomemo

-ein_in01.gat	mapflag	nomemo

-airport.gat	mapflag	nomemo

-airplane.gat	mapflag	nomemo

-airplane_01.gat	mapflag	nomemo

-lighthalzen.gat	mapflag	nomemo

-yuno_pre.gat	mapflag	nomemo

-y_airport.gat	mapflag	nomemo

-lhz_airport.gat	mapflag	nomemo

-einbroch.gat	mapflag	nomemo

-einbech.gat	mapflag	nomemo

-lhz_cube.gat	mapflag	nomemo

-lhz_in01.gat	mapflag	nomemo

-lhz_in02.gat	mapflag	nomemo

-lhz_in03.gat	mapflag	nomemo

-hu_in01.gat	mapflag	nomemo

-auction_01.gat	mapflag	nomemo

-auction_02.gat	mapflag	nomemo

-p_track01.gat	mapflag	nomemo

-p_track02.gat	mapflag	nomemo

-ra_in01.gat	mapflag	nomemo

-ra_temin.gat	mapflag	nomemo

-ra_temsky.gat	mapflag	nomemo

-

-// Fields  ===================

-alb2trea.gat	mapflag	nomemo

-ayo_fild02.gat	mapflag	nomemo

-cmd_fild01.gat	mapflag	nomemo

-cmd_fild02.gat	mapflag	nomemo

-cmd_fild03.gat	mapflag	nomemo

-cmd_fild04.gat	mapflag	nomemo

-cmd_fild05.gat	mapflag	nomemo

-cmd_fild06.gat	mapflag	nomemo

-cmd_fild07.gat	mapflag	nomemo

-cmd_fild08.gat	mapflag	nomemo

-cmd_fild09.gat	mapflag	nomemo

-gef_fild02.gat	mapflag	nomemo

-gef_fild03.gat	mapflag	nomemo

-gef_fild06.gat	mapflag	nomemo

-gef_fild08.gat	mapflag	nomemo

-gef_fild10.gat	mapflag	nomemo

-gef_fild11.gat	mapflag	nomemo

-gef_fild12.gat	mapflag	nomemo

-gef_fild14.gat	mapflag	nomemo

-glast_01.gat	mapflag	nomemo

-hu_fild01.gat	mapflag	nomemo

-hu_fild05.gat	mapflag	nomemo

-izlu2dun.gat	mapflag	nomemo

-mjolnir_01.gat	mapflag	nomemo

-mjolnir_02.gat	mapflag	nomemo

-mjolnir_03.gat	mapflag	nomemo

-mjolnir_04.gat	mapflag	nomemo

-mjolnir_05.gat	mapflag	nomemo

-mjolnir_07.gat	mapflag	nomemo

-mjolnir_08.gat	mapflag	nomemo

-mjolnir_10.gat	mapflag	nomemo

-mjolnir_11.gat	mapflag	nomemo

-moc_fild01.gat	mapflag	nomemo

-moc_fild02.gat	mapflag	nomemo

-moc_fild03.gat	mapflag	nomemo

-moc_fild04.gat	mapflag	nomemo

-moc_fild05.gat	mapflag	nomemo

-moc_fild08.gat	mapflag	nomemo

-moc_fild09.gat	mapflag	nomemo

-moc_fild13.gat	mapflag	nomemo

-moc_fild14.gat	mapflag	nomemo

-moc_fild15.gat	mapflag	nomemo

-moc_fild16.gat	mapflag	nomemo

-moc_fild17.gat	mapflag	nomemo

-moc_fild18.gat	mapflag	nomemo

-nif_fild01.gat	mapflag	nomemo

-nif_fild02.gat	mapflag	nomemo

-pay_fild02.gat	mapflag	nomemo

-//pay_fild04.gat	mapflag	nomemo

-pay_fild05.gat	mapflag	nomemo

-pay_fild09.gat	mapflag	nomemo

-pay_fild10.gat	mapflag	nomemo

-pay_fild11.gat	mapflag	nomemo

-prt_fild00.gat	mapflag	nomemo

-prt_fild03.gat	mapflag	nomemo

-prt_fild04.gat	mapflag	nomemo

-prt_fild09.gat	mapflag	nomemo

-prt_fild10.gat	mapflag	nomemo

-prt_fild11.gat	mapflag	nomemo

-prt_monk.gat	mapflag	nomemo

-um_fild01.gat	mapflag	nomemo

-um_fild02.gat	mapflag	nomemo

-um_fild03.gat	mapflag	nomemo

-yuno_fild02.gat	mapflag	nomemo

-yuno_fild03.gat	mapflag	nomemo

-yuno_fild04.gat	mapflag	nomemo

-yuno_fild05.gat	mapflag	nomemo

-yuno_fild07.gat	mapflag	nomemo

-yuno_fild08.gat	mapflag	nomemo

-yuno_fild09.gat	mapflag	nomemo

-yuno_fild10.gat	mapflag	nomemo

-

-

-// Job Quests ================

-// First Job Class

-job_sword1.gat	mapflag	nomemo

-job_thief1.gat	mapflag	nomemo

-job_star.gat	mapflag	nomemo

-// Primary Second Job Class

-job_prist.gat	mapflag	nomemo

-job_wiz.gat	mapflag	nomemo

-job_hunte.gat	mapflag	nomemo

-in_hunter.gat	mapflag	nomemo

-in_moc_16.gat	mapflag	nomemo

-// Secondary Second Job Class

-alde_alche.gat	mapflag	nomemo

-job_cru.gat	mapflag	nomemo

-job_duncer.gat	mapflag	nomemo

-job_monk.gat	mapflag	nomemo

-monk_test.gat	mapflag	nomemo

-monk_in.gat	mapflag	nomemo

-in_rogue.gat	mapflag	nomemo

-job_sage.gat	mapflag	nomemo

-job_soul.gat	mapflag	nomemo

-que_ng.gat	mapflag	nomemo

-

-// Special Quests Places =====

-que_god01.gat	mapflag	nomemo

-que_god02.gat	mapflag	nomemo

-que_bingo.gat	mapflag	nomemo

-que_sign01.gat	mapflag	nomemo

-que_hugel.gat	mapflag	nomemo

-que_rachel.gat	mapflag	nomemo

-poring_c01.gat	mapflag	nomemo

-poring_c02.gat	mapflag	nomemo

-// Dungeons =================

-alde_dun01.gat	mapflag	nomemo

-alde_dun02.gat	mapflag	nomemo

-alde_dun03.gat	mapflag	nomemo

-alde_dun04.gat	mapflag	nomemo

-// Anthelll ------------------

-anthell01.gat	mapflag	nomemo

-anthell02.gat	mapflag	nomemo

-// Amatsu Dungeon ------------

-ama_dun01.gat	mapflag	nomemo

-ama_dun02.gat	mapflag	nomemo 

-ama_dun03.gat	mapflag	nomemo 

-// Ayothaya

-ayo_dun01.gat	mapflag	nomemo

-ayo_dun02.gat	mapflag	nomemo

-// Comodo Beach --------------

-beach_dun.gat	mapflag	nomemo

-beach_dun2.gat	mapflag	nomemo

-beach_dun3.gat	mapflag	nomemo

-// Clock Tower ---------------

-c_tower1.gat	mapflag	nomemo

-c_tower2.gat	mapflag	nomemo

-c_tower3.gat	mapflag	nomemo

-c_tower4.gat	mapflag	nomemo

-// Einbech Mines -------------

-ein_dun01.gat	mapflag	nomemo

-ein_dun02.gat	mapflag	nomemo

-// Geffen Dun ----------------

-gef_dun00.gat	mapflag	nomemo

-gef_dun01.gat	mapflag	nomemo

-gef_dun02.gat	mapflag	nomemo

-gef_dun03.gat	mapflag	nomemo

-// Glast Hiem ----------------

-gl_cas01.gat	mapflag	nomemo

-gl_cas02.gat	mapflag	nomemo

-gl_church.gat	mapflag	nomemo

-gl_chyard.gat	mapflag	nomemo

-gl_dun01.gat	mapflag	nomemo

-gl_dun02.gat	mapflag	nomemo

-gl_in01.gat	mapflag	nomemo

-gl_knt01.gat	mapflag	nomemo

-gl_knt02.gat	mapflag	nomemo

-gl_prison.gat	mapflag	nomemo

-gl_prison1.gat	mapflag	nomemo

-gl_sew01.gat	mapflag	nomemo

-gl_sew02.gat	mapflag	nomemo

-gl_sew03.gat	mapflag	nomemo

-gl_sew04.gat	mapflag	nomemo

-gl_step.gat	mapflag	nomemo

-// Guild Dun -----------------

-gld_dun01.gat	mapflag	nomemo

-gld_dun02.gat	mapflag	nomemo

-gld_dun03.gat	mapflag	nomemo

-gld_dun04.gat	mapflag	nomemo

-// Bayalan Island ------------

-iz_dun00.gat	mapflag	nomemo

-iz_dun01.gat	mapflag	nomemo

-iz_dun02.gat	mapflag	nomemo

-iz_dun03.gat	mapflag	nomemo

-iz_dun04.gat	mapflag	nomemo

-// Sphinx --------------------

-in_sphinx1.gat	mapflag	nomemo

-in_sphinx2.gat	mapflag	nomemo

-in_sphinx3.gat	mapflag	nomemo

-in_sphinx4.gat	mapflag	nomemo

-in_sphinx5.gat	mapflag	nomemo

-// Louyang Dun --------------

-lou_dun03.gat	mapflag	nomemo

-lou_dun02.gat	mapflag	nomemo

-lou_dun01.gat	mapflag	nomemo

-// Magma Dun -----------------

-mag_dun01.gat	mapflag	nomemo

-mag_dun02.gat	mapflag	nomemo

-// Pyrmaids ------------------

-moc_pryd01.gat	mapflag	nomemo

-moc_pryd02.gat	mapflag	nomemo

-moc_pryd03.gat	mapflag	nomemo

-moc_pryd04.gat	mapflag	nomemo

-moc_pryd05.gat	mapflag	nomemo

-moc_pryd06.gat	mapflag	nomemo

-moc_prydb1.gat	mapflag	nomemo

-// Coal Mine(Dead Pitt) ------

-mjo_dun01.gat	mapflag	nomemo

-mjo_dun02.gat	mapflag	nomemo

-mjo_dun03.gat	mapflag	nomemo

-// Orc Dun -------------------

-orcsdun01.gat	mapflag	nomemo

-orcsdun02.gat	mapflag	nomemo

-// Payon Cave ----------------

-pay_dun00.gat	mapflag	nomemo

-pay_dun01.gat	mapflag	nomemo

-pay_dun02.gat	mapflag	nomemo

-pay_dun03.gat	mapflag	nomemo

-pay_dun04.gat	mapflag	nomemo

-// Hidden Temple  ------------

-prt_maze01.gat	mapflag	nomemo

-prt_maze02.gat	mapflag	nomemo

-prt_maze03.gat	mapflag	nomemo

-// Culvert Sewers ------------

-prt_sewb1.gat	mapflag	nomemo

-prt_sewb2.gat	mapflag	nomemo

-prt_sewb3.gat	mapflag	nomemo

-prt_sewb4.gat	mapflag	nomemo

-// Gonryun Dun ---------------

-gon_dun01.gat	mapflag	nomemo

-gon_dun02.gat	mapflag	nomemo

-gon_dun03.gat	mapflag	nomemo

-// Sunken Ship ---------------

-treasure01.gat	mapflag	nomemo

-treasure02.gat	mapflag	nomemo

-// Turtle Island -------------

-tur_dun01.gat	mapflag	nomemo

-tur_dun02.gat	mapflag	nomemo

-tur_dun03.gat	mapflag	nomemo

-tur_dun04.gat	mapflag	nomemo

-tur_dun05.gat	mapflag	nomemo

-tur_dun06.gat	mapflag	nomemo

-// Umbala Dun ----------------

-um_dun01.gat	mapflag	nomemo

-um_dun02.gat	mapflag	nomemo

-// Toy Factory ---------------

-xmas_dun01.gat	mapflag	nomemo

-xmas_dun02.gat	mapflag	nomemo

-// Yggdrasil Tree Dun --------

-yggdrasil01.gat	mapflag	nomemo

-// Old Geffenia --------------

-gefenia01.gat	mapflag	nomemo

-gefenia02.gat	mapflag	nomemo

-gefenia03.gat	mapflag	nomemo

-gefenia04.gat	mapflag	nomemo

-// Bio Lab Dungeon -----------

-lhz_dun01.gat	mapflag	nomemo

-lhz_dun02.gat	mapflag	nomemo

-lhz_dun03.gat	mapflag	nomemo

-// Juperos Dungeon -----------

-juperos_01.gat	mapflag	nomemo

-juperos_02.gat	mapflag	nomemo

-jupe_area1.gat	mapflag	nomemo

-jupe_area2.gat	mapflag	nomemo

-jupe_core.gat	mapflag	nomemo

-jupe_ele.gat	mapflag	nomemo

-jupe_ele_r.gat	mapflag	nomemo

-jupe_gate.gat	mapflag	nomemo

-jupe_cave.gat	mapflag	nomemo

-// Thanatos Tower ------------

-thana_boss.gat	mapflag	nomemo

-tha_scene01.gat	mapflag	nomemo

-tha_t01.gat	mapflag	nomemo

-tha_t02.gat	mapflag	nomemo

-tha_t03.gat	mapflag	nomemo

-tha_t04.gat	mapflag	nomemo

-tha_t05.gat	mapflag	nomemo

-tha_t06.gat	mapflag	nomemo

-tha_t07.gat	mapflag	nomemo

-tha_t08.gat	mapflag	nomemo

-tha_t09.gat	mapflag	nomemo

-tha_t10.gat	mapflag	nomemo

-tha_t11.gat	mapflag	nomemo

-tha_t12.gat	mapflag	nomemo

-thana_step.gat	mapflag	nomemo

-// Abyss Lake Dungeon --------

-abyss_01.gat	mapflag	nomemo

-abyss_02.gat	mapflag	nomemo

-abyss_03.gat	mapflag	nomemo

-//Odin's Temple & Kiehl

-odin_tem01.gat	mapflag	nomemo

-odin_tem02.gat	mapflag	nomemo

-odin_tem03.gat	mapflag	nomemo

-kh_kiehl02.gat	mapflag	nomemo

-kh_kiehl01.gat	mapflag	nomemo

-kh_dun02.gat	mapflag	nomemo

-kh_dun01.gat	mapflag	nomemo

-kh_mansion.gat	mapflag	nomemo

-kh_rossi.gat	mapflag	nomemo

-kh_school.gat	mapflag	nomemo

-kh_vila.gat	mapflag	nomemo

-//Ice Dungeon

-ice_dun01.gat	mapflag	nomemo

-ice_dun02.gat	mapflag	nomemo

-ice_dun03.gat	mapflag	nomemo

-ice_dun04.gat	mapflag	nomemo

-//Rachel Santuary

-ra_san01.gat	mapflag	nomemo

-ra_san02.gat	mapflag	nomemo

-ra_san03.gat	mapflag	nomemo

-ra_san04.gat	mapflag	nomemo

-ra_san05.gat	mapflag	nomemo

-

-// Guild Castles =============

-//alde_gld.gat	mapflag	nomemo

-aldeg_cas01.gat	mapflag	nomemo

-aldeg_cas02.gat	mapflag	nomemo

-aldeg_cas03.gat	mapflag	nomemo

-aldeg_cas04.gat	mapflag	nomemo

-aldeg_cas05.gat	mapflag	nomemo

-gefg_cas01.gat	mapflag	nomemo

-gefg_cas02.gat	mapflag	nomemo

-gefg_cas03.gat	mapflag	nomemo

-gefg_cas04.gat	mapflag	nomemo

-gefg_cas05.gat	mapflag	nomemo

-//pay_gld.gat	mapflag	nomemo

-payg_cas01.gat	mapflag	nomemo

-payg_cas02.gat	mapflag	nomemo

-payg_cas03.gat	mapflag	nomemo

-payg_cas04.gat	mapflag	nomemo

-payg_cas05.gat	mapflag	nomemo

-//prt_gld.gat	mapflag	nomemo

-prtg_cas01.gat	mapflag	nomemo

-prtg_cas02.gat	mapflag	nomemo

-prtg_cas03.gat	mapflag	nomemo

-prtg_cas04.gat	mapflag	nomemo

-prtg_cas05.gat	mapflag	nomemo

-gefg_cas01.gat	mapflag	nomemo

-gefg_cas02.gat	mapflag	nomemo

-gefg_cas03.gat	mapflag	nomemo

-gefg_cas04.gat	mapflag	nomemo

-gefg_cas05.gat	mapflag	nomemo

-nguild_alde.gat	mapflag	nomemo

-nguild_gef.gat	mapflag	nomemo

-nguild_pay.gat	mapflag	nomemo

-nguild_prt.gat	mapflag	nomemo

-//To Protect Novices Guilds from level abusers

-n_castle.gat	mapflag	nomemo

-

-// GvG Arenas ================

-guild_vs1.gat	mapflag	nomemo

-guild_vs2.gat	mapflag	nomemo

-guild_vs3.gat	mapflag	nomemo

-guild_vs4.gat	mapflag	nomemo

-guild_vs5.gat	mapflag	nomemo

-

-// Arenas ====================

-arena_room.gat	mapflag	nomemo

-force_1-1.gat	mapflag	nomemo

-force_1-2.gat	mapflag	nomemo

-force_1-3.gat	mapflag	nomemo

-ordeal_1-1.gat	mapflag	nomemo

-ordeal_1-2.gat	mapflag	nomemo

-ordeal_1-3.gat	mapflag	nomemo

-ordeal_2-1.gat	mapflag	nomemo

-ordeal_2-2.gat	mapflag	nomemo

-ordeal_2-3.gat	mapflag	nomemo

-ordeal_3-1.gat	mapflag	nomemo

-ordeal_3-2.gat	mapflag	nomemo

-ordeal_3-3.gat	mapflag	nomemo

-pvp_c_room.gat	mapflag	nomemo

-quiz_00.gat	mapflag	nomemo

-quiz_01.gat	mapflag	nomemo

-sec_in01.gat	mapflag	nomemo

-sec_in02.gat	mapflag	nomemo

-//hunter_1-1.gat	mapflag	nomemo

-//hunter_2-1.gat	mapflag	nomemo

-//hunter_3-1.gat	mapflag	nomemo

-//knight_1-1.gat	mapflag	nomemo

-//knight_2-1.gat	mapflag	nomemo

-//knight_3-1.gat	mapflag	nomemo

-//priest_1-1.gat	mapflag	nomemo

-//priest_2-1.gat	mapflag	nomemo

-//priest_3-1.gat	mapflag	nomemo

-prt_are_in.gat	mapflag	nomemo

-prt_are_in.gat	mapflag	nomemo

-prt_are01.gat	mapflag	nomemo

-//wizard_1-1.gat	mapflag	nomemo

-//wizard_2-1.gat	mapflag	nomemo

-//wizard_3-1.gat	mapflag	nomemo

-

-// PvP Arenas ================

-pvp_y_room.gat	mapflag	nomemo

-pvp_y_1-1.gat	mapflag	nomemo

-pvp_y_1-2.gat	mapflag	nomemo

-pvp_y_1-3.gat	mapflag	nomemo

-pvp_y_1-4.gat	mapflag	nomemo

-pvp_y_1-5.gat	mapflag	nomemo

-pvp_y_2-1.gat	mapflag	nomemo

-pvp_y_2-2.gat	mapflag	nomemo

-pvp_y_2-3.gat	mapflag	nomemo

-pvp_y_2-4.gat	mapflag	nomemo

-pvp_y_2-5.gat	mapflag	nomemo

-pvp_y_3-1.gat	mapflag	nomemo

-pvp_y_3-2.gat	mapflag	nomemo

-pvp_y_3-3.gat	mapflag	nomemo

-pvp_y_3-4.gat	mapflag	nomemo

-pvp_y_3-5.gat	mapflag	nomemo

-pvp_y_4-1.gat	mapflag	nomemo

-pvp_y_4-2.gat	mapflag	nomemo

-pvp_y_4-3.gat	mapflag	nomemo

-pvp_y_4-4.gat	mapflag	nomemo

-pvp_y_4-5.gat	mapflag	nomemo

-pvp_y_5-1.gat	mapflag	nomemo

-pvp_y_5-2.gat	mapflag	nomemo

-pvp_y_5-3.gat	mapflag	nomemo

-pvp_y_5-4.gat	mapflag	nomemo

-pvp_y_5-5.gat	mapflag	nomemo

-pvp_y_6-1.gat	mapflag	nomemo

-pvp_y_6-2.gat	mapflag	nomemo

-pvp_y_6-3.gat	mapflag	nomemo

-pvp_y_6-4.gat	mapflag	nomemo

-pvp_y_6-5.gat	mapflag	nomemo

-pvp_y_7-1.gat	mapflag	nomemo

-pvp_y_7-2.gat	mapflag	nomemo

-pvp_y_7-3.gat	mapflag	nomemo

-pvp_y_7-4.gat	mapflag	nomemo

-pvp_y_7-5.gat	mapflag	nomemo

-pvp_y_8-1.gat	mapflag	nomemo

-pvp_y_8-2.gat	mapflag	nomemo

-pvp_y_8-3.gat	mapflag	nomemo

-pvp_y_8-4.gat	mapflag	nomemo

-pvp_y_8-5.gat	mapflag	nomemo

-pvp_n_room.gat	mapflag	nomemo

-pvp_n_1-1.gat	mapflag	nomemo

-pvp_n_1-2.gat	mapflag	nomemo

-pvp_n_1-3.gat	mapflag	nomemo

-pvp_n_1-4.gat	mapflag	nomemo

-pvp_n_1-5.gat	mapflag	nomemo

-pvp_n_2-1.gat	mapflag	nomemo

-pvp_n_2-2.gat	mapflag	nomemo

-pvp_n_2-3.gat	mapflag	nomemo

-pvp_n_2-4.gat	mapflag	nomemo

-pvp_n_2-5.gat	mapflag	nomemo

-pvp_n_3-1.gat	mapflag	nomemo

-pvp_n_3-2.gat	mapflag	nomemo

-pvp_n_3-3.gat	mapflag	nomemo

-pvp_n_3-4.gat	mapflag	nomemo

-pvp_n_3-5.gat	mapflag	nomemo

-pvp_n_4-1.gat	mapflag	nomemo

-pvp_n_4-2.gat	mapflag	nomemo

-pvp_n_4-3.gat	mapflag	nomemo

-pvp_n_4-4.gat	mapflag	nomemo

-pvp_n_4-5.gat	mapflag	nomemo

-pvp_n_5-1.gat	mapflag	nomemo

-pvp_n_5-2.gat	mapflag	nomemo

-pvp_n_5-3.gat	mapflag	nomemo

-pvp_n_5-4.gat	mapflag	nomemo

-pvp_n_5-5.gat	mapflag	nomemo

-pvp_n_6-1.gat	mapflag	nomemo

-pvp_n_6-2.gat	mapflag	nomemo

-pvp_n_6-3.gat	mapflag	nomemo

-pvp_n_6-4.gat	mapflag	nomemo

-pvp_n_6-5.gat	mapflag	nomemo

-pvp_n_7-1.gat	mapflag	nomemo

-pvp_n_7-2.gat	mapflag	nomemo

-pvp_n_7-3.gat	mapflag	nomemo

-pvp_n_7-4.gat	mapflag	nomemo

-pvp_n_7-5.gat	mapflag	nomemo

-pvp_n_8-1.gat	mapflag	nomemo

-pvp_n_8-2.gat	mapflag	nomemo

-pvp_n_8-3.gat	mapflag	nomemo

-pvp_n_8-4.gat	mapflag	nomemo

-pvp_n_8-5.gat	mapflag	nomemo

-pvp_2vs2.gat	mapflag	nomemo

+//===== eAthena Script =======================================
+//= Map flags that disable warp portal memory
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.6 added up to Hugel maps. [Lupus]
+//===== Current Version: =====================================
+
+
+// Towns  ====================
+ayo_in01.gat	mapflag	nomemo
+ayo_in02.gat	mapflag	nomemo
+alb_ship.gat	mapflag	nomemo
+alberta_in.gat	mapflag	nomemo
+aldeba_in.gat	mapflag	nomemo
+ama_in01.gat	mapflag	nomemo
+ama_in02.gat	mapflag	nomemo
+ama_test.gat	mapflag	nomemo
+cmd_in01.gat	mapflag	nomemo
+cmd_in02.gat	mapflag	nomemo
+gef_tower.gat	mapflag	nomemo
+geffen_in.gat	mapflag	nomemo
+gon_test.gat	mapflag	nomemo
+gon_in.gat	mapflag	nomemo
+in_orcs01.gat	mapflag	nomemo
+izlude_in.gat	mapflag	nomemo
+jawaii_in.gat	mapflag	nomemo
+lou_in01.gat	mapflag	nomemo
+lou_in02.gat	mapflag	nomemo
+moc_castle.gat	mapflag	nomemo
+morocc_in.gat	mapflag	nomemo
+niflheim.gat	mapflag	nomemo
+nif_in.gat	mapflag	nomemo
+new_zone01.gat	mapflag	nomemo
+new_zone02.gat	mapflag	nomemo
+new_zone03.gat	mapflag	nomemo
+new_zone04.gat	mapflag	nomemo
+pay_arche.gat	mapflag	nomemo
+payon_in01.gat	mapflag	nomemo
+payon_in02.gat	mapflag	nomemo
+payon_in03.gat	mapflag	nomemo
+prt_castle.gat	mapflag	nomemo
+prt_church.gat	mapflag	nomemo
+prt_in.gat	mapflag	nomemo
+um_in.gat	mapflag	nomemo
+xmas_in.gat	mapflag	nomemo
+valkyrie.gat	mapflag	nomemo
+yuno_in01.gat	mapflag	nomemo
+yuno_in02.gat	mapflag	nomemo
+yuno_in03.gat	mapflag	nomemo
+yuno_in04.gat	mapflag	nomemo
+yuno_in05.gat	mapflag	nomemo
+yuno.gat	mapflag	nomemo
+ein_in01.gat	mapflag	nomemo
+airport.gat	mapflag	nomemo
+airplane.gat	mapflag	nomemo
+airplane_01.gat	mapflag	nomemo
+lighthalzen.gat	mapflag	nomemo
+yuno_pre.gat	mapflag	nomemo
+y_airport.gat	mapflag	nomemo
+lhz_airport.gat	mapflag	nomemo
+einbroch.gat	mapflag	nomemo
+einbech.gat	mapflag	nomemo
+lhz_cube.gat	mapflag	nomemo
+lhz_in01.gat	mapflag	nomemo
+lhz_in02.gat	mapflag	nomemo
+lhz_in03.gat	mapflag	nomemo
+hu_in01.gat	mapflag	nomemo
+auction_01.gat	mapflag	nomemo
+auction_02.gat	mapflag	nomemo
+p_track01.gat	mapflag	nomemo
+p_track02.gat	mapflag	nomemo
+ra_in01.gat	mapflag	nomemo
+ra_temin.gat	mapflag	nomemo
+ra_temsky.gat	mapflag	nomemo
+
+// Fields  ===================
+alb2trea.gat	mapflag	nomemo
+ayo_fild02.gat	mapflag	nomemo
+cmd_fild01.gat	mapflag	nomemo
+cmd_fild02.gat	mapflag	nomemo
+cmd_fild03.gat	mapflag	nomemo
+cmd_fild04.gat	mapflag	nomemo
+cmd_fild05.gat	mapflag	nomemo
+cmd_fild06.gat	mapflag	nomemo
+cmd_fild07.gat	mapflag	nomemo
+cmd_fild08.gat	mapflag	nomemo
+cmd_fild09.gat	mapflag	nomemo
+gef_fild02.gat	mapflag	nomemo
+gef_fild03.gat	mapflag	nomemo
+gef_fild06.gat	mapflag	nomemo
+gef_fild08.gat	mapflag	nomemo
+gef_fild10.gat	mapflag	nomemo
+gef_fild11.gat	mapflag	nomemo
+gef_fild12.gat	mapflag	nomemo
+gef_fild14.gat	mapflag	nomemo
+glast_01.gat	mapflag	nomemo
+hu_fild01.gat	mapflag	nomemo
+hu_fild05.gat	mapflag	nomemo
+izlu2dun.gat	mapflag	nomemo
+mjolnir_01.gat	mapflag	nomemo
+mjolnir_02.gat	mapflag	nomemo
+mjolnir_03.gat	mapflag	nomemo
+mjolnir_04.gat	mapflag	nomemo
+mjolnir_05.gat	mapflag	nomemo
+mjolnir_07.gat	mapflag	nomemo
+mjolnir_08.gat	mapflag	nomemo
+mjolnir_10.gat	mapflag	nomemo
+mjolnir_11.gat	mapflag	nomemo
+moc_fild01.gat	mapflag	nomemo
+moc_fild02.gat	mapflag	nomemo
+moc_fild03.gat	mapflag	nomemo
+moc_fild04.gat	mapflag	nomemo
+moc_fild05.gat	mapflag	nomemo
+moc_fild08.gat	mapflag	nomemo
+moc_fild09.gat	mapflag	nomemo
+moc_fild13.gat	mapflag	nomemo
+moc_fild14.gat	mapflag	nomemo
+moc_fild15.gat	mapflag	nomemo
+moc_fild16.gat	mapflag	nomemo
+moc_fild17.gat	mapflag	nomemo
+moc_fild18.gat	mapflag	nomemo
+nif_fild01.gat	mapflag	nomemo
+nif_fild02.gat	mapflag	nomemo
+pay_fild02.gat	mapflag	nomemo
+//pay_fild04.gat	mapflag	nomemo
+pay_fild05.gat	mapflag	nomemo
+pay_fild09.gat	mapflag	nomemo
+pay_fild10.gat	mapflag	nomemo
+pay_fild11.gat	mapflag	nomemo
+prt_fild00.gat	mapflag	nomemo
+prt_fild03.gat	mapflag	nomemo
+prt_fild04.gat	mapflag	nomemo
+prt_fild09.gat	mapflag	nomemo
+prt_fild10.gat	mapflag	nomemo
+prt_fild11.gat	mapflag	nomemo
+prt_monk.gat	mapflag	nomemo
+um_fild01.gat	mapflag	nomemo
+um_fild02.gat	mapflag	nomemo
+um_fild03.gat	mapflag	nomemo
+yuno_fild02.gat	mapflag	nomemo
+yuno_fild03.gat	mapflag	nomemo
+yuno_fild04.gat	mapflag	nomemo
+yuno_fild05.gat	mapflag	nomemo
+yuno_fild07.gat	mapflag	nomemo
+yuno_fild08.gat	mapflag	nomemo
+yuno_fild09.gat	mapflag	nomemo
+yuno_fild10.gat	mapflag	nomemo
+
+
+// Job Quests ================
+// First Job Class
+job_sword1.gat	mapflag	nomemo
+job_thief1.gat	mapflag	nomemo
+job_star.gat	mapflag	nomemo
+// Primary Second Job Class
+job_prist.gat	mapflag	nomemo
+job_wiz.gat	mapflag	nomemo
+job_hunte.gat	mapflag	nomemo
+in_hunter.gat	mapflag	nomemo
+in_moc_16.gat	mapflag	nomemo
+// Secondary Second Job Class
+alde_alche.gat	mapflag	nomemo
+job_cru.gat	mapflag	nomemo
+job_duncer.gat	mapflag	nomemo
+job_monk.gat	mapflag	nomemo
+monk_test.gat	mapflag	nomemo
+monk_in.gat	mapflag	nomemo
+in_rogue.gat	mapflag	nomemo
+job_sage.gat	mapflag	nomemo
+job_soul.gat	mapflag	nomemo
+que_ng.gat	mapflag	nomemo
+
+// Special Quests Places =====
+que_god01.gat	mapflag	nomemo
+que_god02.gat	mapflag	nomemo
+que_bingo.gat	mapflag	nomemo
+que_sign01.gat	mapflag	nomemo
+que_hugel.gat	mapflag	nomemo
+que_rachel.gat	mapflag	nomemo
+poring_c01.gat	mapflag	nomemo
+poring_c02.gat	mapflag	nomemo
+// Dungeons =================
+alde_dun01.gat	mapflag	nomemo
+alde_dun02.gat	mapflag	nomemo
+alde_dun03.gat	mapflag	nomemo
+alde_dun04.gat	mapflag	nomemo
+// Anthelll ------------------
+anthell01.gat	mapflag	nomemo
+anthell02.gat	mapflag	nomemo
+// Amatsu Dungeon ------------
+ama_dun01.gat	mapflag	nomemo
+ama_dun02.gat	mapflag	nomemo 
+ama_dun03.gat	mapflag	nomemo 
+// Ayothaya
+ayo_dun01.gat	mapflag	nomemo
+ayo_dun02.gat	mapflag	nomemo
+// Comodo Beach --------------
+beach_dun.gat	mapflag	nomemo
+beach_dun2.gat	mapflag	nomemo
+beach_dun3.gat	mapflag	nomemo
+// Clock Tower ---------------
+c_tower1.gat	mapflag	nomemo
+c_tower2.gat	mapflag	nomemo
+c_tower3.gat	mapflag	nomemo
+c_tower4.gat	mapflag	nomemo
+// Einbech Mines -------------
+ein_dun01.gat	mapflag	nomemo
+ein_dun02.gat	mapflag	nomemo
+// Geffen Dun ----------------
+gef_dun00.gat	mapflag	nomemo
+gef_dun01.gat	mapflag	nomemo
+gef_dun02.gat	mapflag	nomemo
+gef_dun03.gat	mapflag	nomemo
+// Glast Hiem ----------------
+gl_cas01.gat	mapflag	nomemo
+gl_cas02.gat	mapflag	nomemo
+gl_church.gat	mapflag	nomemo
+gl_chyard.gat	mapflag	nomemo
+gl_dun01.gat	mapflag	nomemo
+gl_dun02.gat	mapflag	nomemo
+gl_in01.gat	mapflag	nomemo
+gl_knt01.gat	mapflag	nomemo
+gl_knt02.gat	mapflag	nomemo
+gl_prison.gat	mapflag	nomemo
+gl_prison1.gat	mapflag	nomemo
+gl_sew01.gat	mapflag	nomemo
+gl_sew02.gat	mapflag	nomemo
+gl_sew03.gat	mapflag	nomemo
+gl_sew04.gat	mapflag	nomemo
+gl_step.gat	mapflag	nomemo
+// Guild Dun -----------------
+gld_dun01.gat	mapflag	nomemo
+gld_dun02.gat	mapflag	nomemo
+gld_dun03.gat	mapflag	nomemo
+gld_dun04.gat	mapflag	nomemo
+// Bayalan Island ------------
+iz_dun00.gat	mapflag	nomemo
+iz_dun01.gat	mapflag	nomemo
+iz_dun02.gat	mapflag	nomemo
+iz_dun03.gat	mapflag	nomemo
+iz_dun04.gat	mapflag	nomemo
+// Sphinx --------------------
+in_sphinx1.gat	mapflag	nomemo
+in_sphinx2.gat	mapflag	nomemo
+in_sphinx3.gat	mapflag	nomemo
+in_sphinx4.gat	mapflag	nomemo
+in_sphinx5.gat	mapflag	nomemo
+// Louyang Dun --------------
+lou_dun03.gat	mapflag	nomemo
+lou_dun02.gat	mapflag	nomemo
+lou_dun01.gat	mapflag	nomemo
+// Magma Dun -----------------
+mag_dun01.gat	mapflag	nomemo
+mag_dun02.gat	mapflag	nomemo
+// Pyrmaids ------------------
+moc_pryd01.gat	mapflag	nomemo
+moc_pryd02.gat	mapflag	nomemo
+moc_pryd03.gat	mapflag	nomemo
+moc_pryd04.gat	mapflag	nomemo
+moc_pryd05.gat	mapflag	nomemo
+moc_pryd06.gat	mapflag	nomemo
+moc_prydb1.gat	mapflag	nomemo
+// Coal Mine(Dead Pitt) ------
+mjo_dun01.gat	mapflag	nomemo
+mjo_dun02.gat	mapflag	nomemo
+mjo_dun03.gat	mapflag	nomemo
+// Orc Dun -------------------
+orcsdun01.gat	mapflag	nomemo
+orcsdun02.gat	mapflag	nomemo
+// Payon Cave ----------------
+pay_dun00.gat	mapflag	nomemo
+pay_dun01.gat	mapflag	nomemo
+pay_dun02.gat	mapflag	nomemo
+pay_dun03.gat	mapflag	nomemo
+pay_dun04.gat	mapflag	nomemo
+// Hidden Temple  ------------
+prt_maze01.gat	mapflag	nomemo
+prt_maze02.gat	mapflag	nomemo
+prt_maze03.gat	mapflag	nomemo
+// Culvert Sewers ------------
+prt_sewb1.gat	mapflag	nomemo
+prt_sewb2.gat	mapflag	nomemo
+prt_sewb3.gat	mapflag	nomemo
+prt_sewb4.gat	mapflag	nomemo
+// Gonryun Dun ---------------
+gon_dun01.gat	mapflag	nomemo
+gon_dun02.gat	mapflag	nomemo
+gon_dun03.gat	mapflag	nomemo
+// Sunken Ship ---------------
+treasure01.gat	mapflag	nomemo
+treasure02.gat	mapflag	nomemo
+// Turtle Island -------------
+tur_dun01.gat	mapflag	nomemo
+tur_dun02.gat	mapflag	nomemo
+tur_dun03.gat	mapflag	nomemo
+tur_dun04.gat	mapflag	nomemo
+tur_dun05.gat	mapflag	nomemo
+tur_dun06.gat	mapflag	nomemo
+// Umbala Dun ----------------
+um_dun01.gat	mapflag	nomemo
+um_dun02.gat	mapflag	nomemo
+// Toy Factory ---------------
+xmas_dun01.gat	mapflag	nomemo
+xmas_dun02.gat	mapflag	nomemo
+// Yggdrasil Tree Dun --------
+yggdrasil01.gat	mapflag	nomemo
+// Old Geffenia --------------
+gefenia01.gat	mapflag	nomemo
+gefenia02.gat	mapflag	nomemo
+gefenia03.gat	mapflag	nomemo
+gefenia04.gat	mapflag	nomemo
+// Bio Lab Dungeon -----------
+lhz_dun01.gat	mapflag	nomemo
+lhz_dun02.gat	mapflag	nomemo
+lhz_dun03.gat	mapflag	nomemo
+// Juperos Dungeon -----------
+juperos_01.gat	mapflag	nomemo
+juperos_02.gat	mapflag	nomemo
+jupe_area1.gat	mapflag	nomemo
+jupe_area2.gat	mapflag	nomemo
+jupe_core.gat	mapflag	nomemo
+jupe_ele.gat	mapflag	nomemo
+jupe_ele_r.gat	mapflag	nomemo
+jupe_gate.gat	mapflag	nomemo
+jupe_cave.gat	mapflag	nomemo
+// Thanatos Tower ------------
+thana_boss.gat	mapflag	nomemo
+tha_scene01.gat	mapflag	nomemo
+tha_t01.gat	mapflag	nomemo
+tha_t02.gat	mapflag	nomemo
+tha_t03.gat	mapflag	nomemo
+tha_t04.gat	mapflag	nomemo
+tha_t05.gat	mapflag	nomemo
+tha_t06.gat	mapflag	nomemo
+tha_t07.gat	mapflag	nomemo
+tha_t08.gat	mapflag	nomemo
+tha_t09.gat	mapflag	nomemo
+tha_t10.gat	mapflag	nomemo
+tha_t11.gat	mapflag	nomemo
+tha_t12.gat	mapflag	nomemo
+thana_step.gat	mapflag	nomemo
+// Abyss Lake Dungeon --------
+abyss_01.gat	mapflag	nomemo
+abyss_02.gat	mapflag	nomemo
+abyss_03.gat	mapflag	nomemo
+//Odin's Temple & Kiehl
+odin_tem01.gat	mapflag	nomemo
+odin_tem02.gat	mapflag	nomemo
+odin_tem03.gat	mapflag	nomemo
+kh_kiehl02.gat	mapflag	nomemo
+kh_kiehl01.gat	mapflag	nomemo
+kh_dun02.gat	mapflag	nomemo
+kh_dun01.gat	mapflag	nomemo
+kh_mansion.gat	mapflag	nomemo
+kh_rossi.gat	mapflag	nomemo
+kh_school.gat	mapflag	nomemo
+kh_vila.gat	mapflag	nomemo
+//Ice Dungeon
+ice_dun01.gat	mapflag	nomemo
+ice_dun02.gat	mapflag	nomemo
+ice_dun03.gat	mapflag	nomemo
+ice_dun04.gat	mapflag	nomemo
+//Rachel Santuary
+ra_san01.gat	mapflag	nomemo
+ra_san02.gat	mapflag	nomemo
+ra_san03.gat	mapflag	nomemo
+ra_san04.gat	mapflag	nomemo
+ra_san05.gat	mapflag	nomemo
+
+// Guild Castles =============
+//alde_gld.gat	mapflag	nomemo
+aldeg_cas01.gat	mapflag	nomemo
+aldeg_cas02.gat	mapflag	nomemo
+aldeg_cas03.gat	mapflag	nomemo
+aldeg_cas04.gat	mapflag	nomemo
+aldeg_cas05.gat	mapflag	nomemo
+gefg_cas01.gat	mapflag	nomemo
+gefg_cas02.gat	mapflag	nomemo
+gefg_cas03.gat	mapflag	nomemo
+gefg_cas04.gat	mapflag	nomemo
+gefg_cas05.gat	mapflag	nomemo
+//pay_gld.gat	mapflag	nomemo
+payg_cas01.gat	mapflag	nomemo
+payg_cas02.gat	mapflag	nomemo
+payg_cas03.gat	mapflag	nomemo
+payg_cas04.gat	mapflag	nomemo
+payg_cas05.gat	mapflag	nomemo
+//prt_gld.gat	mapflag	nomemo
+prtg_cas01.gat	mapflag	nomemo
+prtg_cas02.gat	mapflag	nomemo
+prtg_cas03.gat	mapflag	nomemo
+prtg_cas04.gat	mapflag	nomemo
+prtg_cas05.gat	mapflag	nomemo
+gefg_cas01.gat	mapflag	nomemo
+gefg_cas02.gat	mapflag	nomemo
+gefg_cas03.gat	mapflag	nomemo
+gefg_cas04.gat	mapflag	nomemo
+gefg_cas05.gat	mapflag	nomemo
+nguild_alde.gat	mapflag	nomemo
+nguild_gef.gat	mapflag	nomemo
+nguild_pay.gat	mapflag	nomemo
+nguild_prt.gat	mapflag	nomemo
+//To Protect Novices Guilds from level abusers
+n_castle.gat	mapflag	nomemo
+
+// GvG Arenas ================
+guild_vs1.gat	mapflag	nomemo
+guild_vs2.gat	mapflag	nomemo
+guild_vs3.gat	mapflag	nomemo
+guild_vs4.gat	mapflag	nomemo
+guild_vs5.gat	mapflag	nomemo
+
+// Arenas ====================
+arena_room.gat	mapflag	nomemo
+force_1-1.gat	mapflag	nomemo
+force_1-2.gat	mapflag	nomemo
+force_1-3.gat	mapflag	nomemo
+ordeal_1-1.gat	mapflag	nomemo
+ordeal_1-2.gat	mapflag	nomemo
+ordeal_1-3.gat	mapflag	nomemo
+ordeal_2-1.gat	mapflag	nomemo
+ordeal_2-2.gat	mapflag	nomemo
+ordeal_2-3.gat	mapflag	nomemo
+ordeal_3-1.gat	mapflag	nomemo
+ordeal_3-2.gat	mapflag	nomemo
+ordeal_3-3.gat	mapflag	nomemo
+pvp_c_room.gat	mapflag	nomemo
+quiz_00.gat	mapflag	nomemo
+quiz_01.gat	mapflag	nomemo
+sec_in01.gat	mapflag	nomemo
+sec_in02.gat	mapflag	nomemo
+//hunter_1-1.gat	mapflag	nomemo
+//hunter_2-1.gat	mapflag	nomemo
+//hunter_3-1.gat	mapflag	nomemo
+//knight_1-1.gat	mapflag	nomemo
+//knight_2-1.gat	mapflag	nomemo
+//knight_3-1.gat	mapflag	nomemo
+//priest_1-1.gat	mapflag	nomemo
+//priest_2-1.gat	mapflag	nomemo
+//priest_3-1.gat	mapflag	nomemo
+prt_are_in.gat	mapflag	nomemo
+prt_are_in.gat	mapflag	nomemo
+prt_are01.gat	mapflag	nomemo
+//wizard_1-1.gat	mapflag	nomemo
+//wizard_2-1.gat	mapflag	nomemo
+//wizard_3-1.gat	mapflag	nomemo
+
+// PvP Arenas ================
+pvp_y_room.gat	mapflag	nomemo
+pvp_y_1-1.gat	mapflag	nomemo
+pvp_y_1-2.gat	mapflag	nomemo
+pvp_y_1-3.gat	mapflag	nomemo
+pvp_y_1-4.gat	mapflag	nomemo
+pvp_y_1-5.gat	mapflag	nomemo
+pvp_y_2-1.gat	mapflag	nomemo
+pvp_y_2-2.gat	mapflag	nomemo
+pvp_y_2-3.gat	mapflag	nomemo
+pvp_y_2-4.gat	mapflag	nomemo
+pvp_y_2-5.gat	mapflag	nomemo
+pvp_y_3-1.gat	mapflag	nomemo
+pvp_y_3-2.gat	mapflag	nomemo
+pvp_y_3-3.gat	mapflag	nomemo
+pvp_y_3-4.gat	mapflag	nomemo
+pvp_y_3-5.gat	mapflag	nomemo
+pvp_y_4-1.gat	mapflag	nomemo
+pvp_y_4-2.gat	mapflag	nomemo
+pvp_y_4-3.gat	mapflag	nomemo
+pvp_y_4-4.gat	mapflag	nomemo
+pvp_y_4-5.gat	mapflag	nomemo
+pvp_y_5-1.gat	mapflag	nomemo
+pvp_y_5-2.gat	mapflag	nomemo
+pvp_y_5-3.gat	mapflag	nomemo
+pvp_y_5-4.gat	mapflag	nomemo
+pvp_y_5-5.gat	mapflag	nomemo
+pvp_y_6-1.gat	mapflag	nomemo
+pvp_y_6-2.gat	mapflag	nomemo
+pvp_y_6-3.gat	mapflag	nomemo
+pvp_y_6-4.gat	mapflag	nomemo
+pvp_y_6-5.gat	mapflag	nomemo
+pvp_y_7-1.gat	mapflag	nomemo
+pvp_y_7-2.gat	mapflag	nomemo
+pvp_y_7-3.gat	mapflag	nomemo
+pvp_y_7-4.gat	mapflag	nomemo
+pvp_y_7-5.gat	mapflag	nomemo
+pvp_y_8-1.gat	mapflag	nomemo
+pvp_y_8-2.gat	mapflag	nomemo
+pvp_y_8-3.gat	mapflag	nomemo
+pvp_y_8-4.gat	mapflag	nomemo
+pvp_y_8-5.gat	mapflag	nomemo
+pvp_n_room.gat	mapflag	nomemo
+pvp_n_1-1.gat	mapflag	nomemo
+pvp_n_1-2.gat	mapflag	nomemo
+pvp_n_1-3.gat	mapflag	nomemo
+pvp_n_1-4.gat	mapflag	nomemo
+pvp_n_1-5.gat	mapflag	nomemo
+pvp_n_2-1.gat	mapflag	nomemo
+pvp_n_2-2.gat	mapflag	nomemo
+pvp_n_2-3.gat	mapflag	nomemo
+pvp_n_2-4.gat	mapflag	nomemo
+pvp_n_2-5.gat	mapflag	nomemo
+pvp_n_3-1.gat	mapflag	nomemo
+pvp_n_3-2.gat	mapflag	nomemo
+pvp_n_3-3.gat	mapflag	nomemo
+pvp_n_3-4.gat	mapflag	nomemo
+pvp_n_3-5.gat	mapflag	nomemo
+pvp_n_4-1.gat	mapflag	nomemo
+pvp_n_4-2.gat	mapflag	nomemo
+pvp_n_4-3.gat	mapflag	nomemo
+pvp_n_4-4.gat	mapflag	nomemo
+pvp_n_4-5.gat	mapflag	nomemo
+pvp_n_5-1.gat	mapflag	nomemo
+pvp_n_5-2.gat	mapflag	nomemo
+pvp_n_5-3.gat	mapflag	nomemo
+pvp_n_5-4.gat	mapflag	nomemo
+pvp_n_5-5.gat	mapflag	nomemo
+pvp_n_6-1.gat	mapflag	nomemo
+pvp_n_6-2.gat	mapflag	nomemo
+pvp_n_6-3.gat	mapflag	nomemo
+pvp_n_6-4.gat	mapflag	nomemo
+pvp_n_6-5.gat	mapflag	nomemo
+pvp_n_7-1.gat	mapflag	nomemo
+pvp_n_7-2.gat	mapflag	nomemo
+pvp_n_7-3.gat	mapflag	nomemo
+pvp_n_7-4.gat	mapflag	nomemo
+pvp_n_7-5.gat	mapflag	nomemo
+pvp_n_8-1.gat	mapflag	nomemo
+pvp_n_8-2.gat	mapflag	nomemo
+pvp_n_8-3.gat	mapflag	nomemo
+pvp_n_8-4.gat	mapflag	nomemo
+pvp_n_8-5.gat	mapflag	nomemo
+pvp_2vs2.gat	mapflag	nomemo
diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt
index 6328e8c4f..0952441d0 100644
--- a/conf-tmpl/mapflag/nopenalty.txt
+++ b/conf-tmpl/mapflag/nopenalty.txt
@@ -1,226 +1,226 @@
-//===== eAthena Script =======================================

-//= Map flags that disable exp. penalty on death.

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.2 [Lupus]

-//===== Current Version: =====================================

-

-

-// Towns ====================>\\

-ayo_in01.gat	mapflag	nopenalty

-ayo_in02.gat	mapflag	nopenalty

-alb_ship.gat	mapflag	nopenalty

-alberta.gat	mapflag	nopenalty

-alberta_in.gat	mapflag	nopenalty

-aldebaran.gat	mapflag	nopenalty

-aldeba_in.gat	mapflag	nopenalty

-amatsu.gat	mapflag	nopenalty

-ama_in01.gat	mapflag	nopenalty

-ama_in02.gat	mapflag	nopenalty

-ama_test.gat	mapflag	nopenalty

-arena_room.gat	mapflag	nopenalty

-comodo.gat	mapflag	nopenalty

-cmd_in01.gat	mapflag	nopenalty

-cmd_in02.gat	mapflag	nopenalty

-geffen.gat	mapflag	nopenalty

-gef_dun03.gat	mapflag	nopenalty

-gef_tower.gat	mapflag	nopenalty

-geffen_in.gat	mapflag	nopenalty

-gonryun.gat	mapflag	nopenalty

-gon_in.gat	mapflag	nopenalty

-gon_test.gat	mapflag	nopenalty

-hugel.gat	mapflag	nopenalty

-in_orcs01.gat	mapflag	nopenalty

-izlude.gat	mapflag	nopenalty

-izlude_in.gat	mapflag	nopenalty

-jawaii.gat	mapflag	nopenalty

-jawaii_in.gat	mapflag	nopenalty

-lighthalzen.gat	mapflag	nopenalty

-louyang.gat	mapflag	nopenalty

-lou_in01.gat	mapflag	nopenalty

-lou_in02.gat	mapflag	nopenalty

-morocc.gat	mapflag	nopenalty

-moc_castle.gat	mapflag	nopenalty

-morocc_in.gat	mapflag	nopenalty

-new_zone01.gat	mapflag	nopenalty

-new_zone02.gat	mapflag	nopenalty

-new_zone03.gat	mapflag	nopenalty

-new_zone04.gat	mapflag	nopenalty

-nif_in.gat	mapflag	nopenalty

-pay_arche.gat	mapflag	nopenalty

-payon.gat	mapflag	nopenalty

-payon_in01.gat	mapflag	nopenalty

-payon_in02.gat	mapflag	nopenalty

-payon_in03.gat	mapflag	nopenalty

-prontera.gat	mapflag	nopenalty

-prt_are_in.gat	mapflag	nopenalty

-prt_are01.gat	mapflag	nopenalty

-prt_castle.gat	mapflag	nopenalty

-prt_church.gat	mapflag	nopenalty

-prt_in.gat	mapflag	nopenalty

-umbala.gat	mapflag	nopenalty

-um_in.gat	mapflag	nopenalty

-xmas.gat	mapflag	nopenalty

-xmas_in.gat	mapflag	nopenalty

-yuno.gat	mapflag	nopenalty

-yuno_in01.gat	mapflag	nopenalty

-yuno_in02.gat	mapflag	nopenalty

-yuno_in03.gat	mapflag	nopenalty

-yuno_in04.gat	mapflag	nopenalty

-yuno_in05.gat	mapflag	nopenalty

-yuno_pre.gat	mapflag	nopenalty

-y_airport.gat	mapflag	nopenalty

-lhz_airport.gat	mapflag	nopenalty

-lhz_in01.gat	mapflag	nopenalty

-lhz_in02.gat	mapflag	nopenalty

-lhz_in03.gat	mapflag	nopenalty

-rachel.gat	mapflag	nopenalty

-ra_in01.gat	mapflag	nopenalty

-ra_temin.gat	mapflag	nopenalty

-ra_temple.gat	mapflag	nopenalty

-ra_temsky.gat	mapflag	nopenalty

-que_rachel.gat	mapflag	nopenalty

-airplane.gat	mapflag	nopenalty

-airport.gat	mapflag	nopenalty

-einbech.gat	mapflag	nopenalty

-einbroch.gat	mapflag	nopenalty

-ein_in01.gat	mapflag	nopenalty

-job_soul.gat	mapflag	nopenalty

-job_star.gat	mapflag	nopenalty

-auction_01.gat	mapflag	nopenalty

-auction_02.gat	mapflag	nopenalty

-hu_in01.gat	mapflag	nopenalty

-que_ng.gat	mapflag	nopenalty

-kh_mansion.gat	mapflag	nopenalty

-kh_rossi.gat	mapflag	nopenalty

-kh_school.gat	mapflag	nopenalty

-kh_vila.gat	mapflag	nopenalty

-ayothaya.gat	mapflag	nopenalty

-

-// Job Quests ========================

-job_sword1.gat	mapflag	nopenalty

-job_thief1.gat	mapflag	nopenalty

-// 2-1 -----------------------

-job_prist.gat	mapflag	nopenalty

-job_wiz.gat	mapflag	nopenalty

-job_hunte.gat	mapflag	nopenalty

-in_hunter.gat	mapflag	nopenalty

-in_moc_16.gat	mapflag	nopenalty

-// 2-2 --------------------

-alde_alche.gat	mapflag	nopenalty

-job_cru.gat	mapflag	nopenalty

-job_duncer.gat	mapflag	nopenalty

-job_monk.gat	mapflag	nopenalty

-monk_test.gat	mapflag	nopenalty

-monk_in.gat	mapflag	nopenalty

-in_rogue.gat	mapflag	nopenalty

-job_sage.gat	mapflag	nopenalty

-

-// Misc Quests =======================

-que_sign01.gat	mapflag	nopenalty

-que_sign02.gat	mapflag	nopenalty

-

-// GvG Arenas ===================

-guild_vs1.gat	mapflag	nopenalty

-guild_vs2.gat	mapflag	nopenalty

-guild_vs3.gat	mapflag	nopenalty

-guild_vs4.gat	mapflag	nopenalty

-guild_vs5.gat	mapflag	nopenalty

-

-// Arenas=======================>\\

-sec_in01.gat	mapflag	nopenalty

-sec_in02.gat	mapflag	nopenalty

-

-// Izlude Arena ========================

-force_1-1.gat	mapflag	nopenalty

-force_1-2.gat	mapflag	nopenalty

-force_1-3.gat	mapflag	nopenalty

-force_2-1.gat	mapflag	nopenalty

-force_2-2.gat	mapflag	nopenalty

-force_2-3.gat	mapflag	nopenalty

-force_3-1.gat	mapflag	nopenalty

-force_3-2.gat	mapflag	nopenalty

-force_3-3.gat	mapflag	nopenalty

-

-// PvP Arenas =========================

-pvp_y_1-1.gat	mapflag	nopenalty

-pvp_y_1-2.gat	mapflag	nopenalty

-pvp_y_1-3.gat	mapflag	nopenalty

-pvp_y_1-4.gat	mapflag	nopenalty

-pvp_y_1-5.gat	mapflag	nopenalty

-pvp_y_2-1.gat	mapflag	nopenalty

-pvp_y_2-2.gat	mapflag	nopenalty

-pvp_y_2-3.gat	mapflag	nopenalty

-pvp_y_2-4.gat	mapflag	nopenalty

-pvp_y_2-5.gat	mapflag	nopenalty

-pvp_y_3-1.gat	mapflag	nopenalty

-pvp_y_3-2.gat	mapflag	nopenalty

-pvp_y_3-3.gat	mapflag	nopenalty

-pvp_y_3-4.gat	mapflag	nopenalty

-pvp_y_3-5.gat	mapflag	nopenalty

-pvp_y_4-1.gat	mapflag	nopenalty

-pvp_y_4-2.gat	mapflag	nopenalty

-pvp_y_4-3.gat	mapflag	nopenalty

-pvp_y_4-4.gat	mapflag	nopenalty

-pvp_y_4-5.gat	mapflag	nopenalty

-pvp_y_5-1.gat	mapflag	nopenalty

-pvp_y_5-2.gat	mapflag	nopenalty

-pvp_y_5-3.gat	mapflag	nopenalty

-pvp_y_5-4.gat	mapflag	nopenalty

-pvp_y_5-5.gat	mapflag	nopenalty

-pvp_y_6-1.gat	mapflag	nopenalty

-pvp_y_6-2.gat	mapflag	nopenalty

-pvp_y_6-3.gat	mapflag	nopenalty

-pvp_y_6-4.gat	mapflag	nopenalty

-pvp_y_6-5.gat	mapflag	nopenalty

-pvp_y_7-1.gat	mapflag	nopenalty

-pvp_y_7-2.gat	mapflag	nopenalty

-pvp_y_7-3.gat	mapflag	nopenalty

-pvp_y_7-4.gat	mapflag	nopenalty

-pvp_y_7-5.gat	mapflag	nopenalty

-pvp_y_8-1.gat	mapflag	nopenalty

-pvp_y_8-2.gat	mapflag	nopenalty

-pvp_y_8-3.gat	mapflag	nopenalty

-pvp_y_8-4.gat	mapflag	nopenalty

-pvp_y_8-5.gat	mapflag	nopenalty

-pvp_n_1-1.gat	mapflag	nopenalty

-pvp_n_1-2.gat	mapflag	nopenalty

-pvp_n_1-3.gat	mapflag	nopenalty

-pvp_n_1-4.gat	mapflag	nopenalty

-pvp_n_1-5.gat	mapflag	nopenalty

-pvp_n_2-1.gat	mapflag	nopenalty

-pvp_n_2-2.gat	mapflag	nopenalty

-pvp_n_2-3.gat	mapflag	nopenalty

-pvp_n_2-4.gat	mapflag	nopenalty

-pvp_n_2-5.gat	mapflag	nopenalty

-pvp_n_3-1.gat	mapflag	nopenalty

-pvp_n_3-2.gat	mapflag	nopenalty

-pvp_n_3-3.gat	mapflag	nopenalty

-pvp_n_3-4.gat	mapflag	nopenalty

-pvp_n_3-5.gat	mapflag	nopenalty

-pvp_n_4-1.gat	mapflag	nopenalty

-pvp_n_4-2.gat	mapflag	nopenalty

-pvp_n_4-3.gat	mapflag	nopenalty

-pvp_n_4-4.gat	mapflag	nopenalty

-pvp_n_4-5.gat	mapflag	nopenalty

-pvp_n_5-1.gat	mapflag	nopenalty

-pvp_n_5-2.gat	mapflag	nopenalty

-pvp_n_5-3.gat	mapflag	nopenalty

-pvp_n_5-4.gat	mapflag	nopenalty

-pvp_n_5-5.gat	mapflag	nopenalty

-pvp_n_6-1.gat	mapflag	nopenalty

-pvp_n_6-2.gat	mapflag	nopenalty

-pvp_n_6-3.gat	mapflag	nopenalty

-pvp_n_6-4.gat	mapflag	nopenalty

-pvp_n_6-5.gat	mapflag	nopenalty

-pvp_n_7-1.gat	mapflag	nopenalty

-pvp_n_7-2.gat	mapflag	nopenalty

-pvp_n_7-3.gat	mapflag	nopenalty

-pvp_n_7-4.gat	mapflag	nopenalty

-pvp_n_7-5.gat	mapflag	nopenalty

-pvp_n_8-1.gat	mapflag	nopenalty

-pvp_n_8-2.gat	mapflag	nopenalty

-pvp_n_8-3.gat	mapflag	nopenalty

-pvp_n_8-4.gat	mapflag	nopenalty

-pvp_n_8-5.gat	mapflag	nopenalty

+//===== eAthena Script =======================================
+//= Map flags that disable exp. penalty on death.
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.2 [Lupus]
+//===== Current Version: =====================================
+
+
+// Towns ====================>\\
+ayo_in01.gat	mapflag	nopenalty
+ayo_in02.gat	mapflag	nopenalty
+alb_ship.gat	mapflag	nopenalty
+alberta.gat	mapflag	nopenalty
+alberta_in.gat	mapflag	nopenalty
+aldebaran.gat	mapflag	nopenalty
+aldeba_in.gat	mapflag	nopenalty
+amatsu.gat	mapflag	nopenalty
+ama_in01.gat	mapflag	nopenalty
+ama_in02.gat	mapflag	nopenalty
+ama_test.gat	mapflag	nopenalty
+arena_room.gat	mapflag	nopenalty
+comodo.gat	mapflag	nopenalty
+cmd_in01.gat	mapflag	nopenalty
+cmd_in02.gat	mapflag	nopenalty
+geffen.gat	mapflag	nopenalty
+gef_dun03.gat	mapflag	nopenalty
+gef_tower.gat	mapflag	nopenalty
+geffen_in.gat	mapflag	nopenalty
+gonryun.gat	mapflag	nopenalty
+gon_in.gat	mapflag	nopenalty
+gon_test.gat	mapflag	nopenalty
+hugel.gat	mapflag	nopenalty
+in_orcs01.gat	mapflag	nopenalty
+izlude.gat	mapflag	nopenalty
+izlude_in.gat	mapflag	nopenalty
+jawaii.gat	mapflag	nopenalty
+jawaii_in.gat	mapflag	nopenalty
+lighthalzen.gat	mapflag	nopenalty
+louyang.gat	mapflag	nopenalty
+lou_in01.gat	mapflag	nopenalty
+lou_in02.gat	mapflag	nopenalty
+morocc.gat	mapflag	nopenalty
+moc_castle.gat	mapflag	nopenalty
+morocc_in.gat	mapflag	nopenalty
+new_zone01.gat	mapflag	nopenalty
+new_zone02.gat	mapflag	nopenalty
+new_zone03.gat	mapflag	nopenalty
+new_zone04.gat	mapflag	nopenalty
+nif_in.gat	mapflag	nopenalty
+pay_arche.gat	mapflag	nopenalty
+payon.gat	mapflag	nopenalty
+payon_in01.gat	mapflag	nopenalty
+payon_in02.gat	mapflag	nopenalty
+payon_in03.gat	mapflag	nopenalty
+prontera.gat	mapflag	nopenalty
+prt_are_in.gat	mapflag	nopenalty
+prt_are01.gat	mapflag	nopenalty
+prt_castle.gat	mapflag	nopenalty
+prt_church.gat	mapflag	nopenalty
+prt_in.gat	mapflag	nopenalty
+umbala.gat	mapflag	nopenalty
+um_in.gat	mapflag	nopenalty
+xmas.gat	mapflag	nopenalty
+xmas_in.gat	mapflag	nopenalty
+yuno.gat	mapflag	nopenalty
+yuno_in01.gat	mapflag	nopenalty
+yuno_in02.gat	mapflag	nopenalty
+yuno_in03.gat	mapflag	nopenalty
+yuno_in04.gat	mapflag	nopenalty
+yuno_in05.gat	mapflag	nopenalty
+yuno_pre.gat	mapflag	nopenalty
+y_airport.gat	mapflag	nopenalty
+lhz_airport.gat	mapflag	nopenalty
+lhz_in01.gat	mapflag	nopenalty
+lhz_in02.gat	mapflag	nopenalty
+lhz_in03.gat	mapflag	nopenalty
+rachel.gat	mapflag	nopenalty
+ra_in01.gat	mapflag	nopenalty
+ra_temin.gat	mapflag	nopenalty
+ra_temple.gat	mapflag	nopenalty
+ra_temsky.gat	mapflag	nopenalty
+que_rachel.gat	mapflag	nopenalty
+airplane.gat	mapflag	nopenalty
+airport.gat	mapflag	nopenalty
+einbech.gat	mapflag	nopenalty
+einbroch.gat	mapflag	nopenalty
+ein_in01.gat	mapflag	nopenalty
+job_soul.gat	mapflag	nopenalty
+job_star.gat	mapflag	nopenalty
+auction_01.gat	mapflag	nopenalty
+auction_02.gat	mapflag	nopenalty
+hu_in01.gat	mapflag	nopenalty
+que_ng.gat	mapflag	nopenalty
+kh_mansion.gat	mapflag	nopenalty
+kh_rossi.gat	mapflag	nopenalty
+kh_school.gat	mapflag	nopenalty
+kh_vila.gat	mapflag	nopenalty
+ayothaya.gat	mapflag	nopenalty
+
+// Job Quests ========================
+job_sword1.gat	mapflag	nopenalty
+job_thief1.gat	mapflag	nopenalty
+// 2-1 -----------------------
+job_prist.gat	mapflag	nopenalty
+job_wiz.gat	mapflag	nopenalty
+job_hunte.gat	mapflag	nopenalty
+in_hunter.gat	mapflag	nopenalty
+in_moc_16.gat	mapflag	nopenalty
+// 2-2 --------------------
+alde_alche.gat	mapflag	nopenalty
+job_cru.gat	mapflag	nopenalty
+job_duncer.gat	mapflag	nopenalty
+job_monk.gat	mapflag	nopenalty
+monk_test.gat	mapflag	nopenalty
+monk_in.gat	mapflag	nopenalty
+in_rogue.gat	mapflag	nopenalty
+job_sage.gat	mapflag	nopenalty
+
+// Misc Quests =======================
+que_sign01.gat	mapflag	nopenalty
+que_sign02.gat	mapflag	nopenalty
+
+// GvG Arenas ===================
+guild_vs1.gat	mapflag	nopenalty
+guild_vs2.gat	mapflag	nopenalty
+guild_vs3.gat	mapflag	nopenalty
+guild_vs4.gat	mapflag	nopenalty
+guild_vs5.gat	mapflag	nopenalty
+
+// Arenas=======================>\\
+sec_in01.gat	mapflag	nopenalty
+sec_in02.gat	mapflag	nopenalty
+
+// Izlude Arena ========================
+force_1-1.gat	mapflag	nopenalty
+force_1-2.gat	mapflag	nopenalty
+force_1-3.gat	mapflag	nopenalty
+force_2-1.gat	mapflag	nopenalty
+force_2-2.gat	mapflag	nopenalty
+force_2-3.gat	mapflag	nopenalty
+force_3-1.gat	mapflag	nopenalty
+force_3-2.gat	mapflag	nopenalty
+force_3-3.gat	mapflag	nopenalty
+
+// PvP Arenas =========================
+pvp_y_1-1.gat	mapflag	nopenalty
+pvp_y_1-2.gat	mapflag	nopenalty
+pvp_y_1-3.gat	mapflag	nopenalty
+pvp_y_1-4.gat	mapflag	nopenalty
+pvp_y_1-5.gat	mapflag	nopenalty
+pvp_y_2-1.gat	mapflag	nopenalty
+pvp_y_2-2.gat	mapflag	nopenalty
+pvp_y_2-3.gat	mapflag	nopenalty
+pvp_y_2-4.gat	mapflag	nopenalty
+pvp_y_2-5.gat	mapflag	nopenalty
+pvp_y_3-1.gat	mapflag	nopenalty
+pvp_y_3-2.gat	mapflag	nopenalty
+pvp_y_3-3.gat	mapflag	nopenalty
+pvp_y_3-4.gat	mapflag	nopenalty
+pvp_y_3-5.gat	mapflag	nopenalty
+pvp_y_4-1.gat	mapflag	nopenalty
+pvp_y_4-2.gat	mapflag	nopenalty
+pvp_y_4-3.gat	mapflag	nopenalty
+pvp_y_4-4.gat	mapflag	nopenalty
+pvp_y_4-5.gat	mapflag	nopenalty
+pvp_y_5-1.gat	mapflag	nopenalty
+pvp_y_5-2.gat	mapflag	nopenalty
+pvp_y_5-3.gat	mapflag	nopenalty
+pvp_y_5-4.gat	mapflag	nopenalty
+pvp_y_5-5.gat	mapflag	nopenalty
+pvp_y_6-1.gat	mapflag	nopenalty
+pvp_y_6-2.gat	mapflag	nopenalty
+pvp_y_6-3.gat	mapflag	nopenalty
+pvp_y_6-4.gat	mapflag	nopenalty
+pvp_y_6-5.gat	mapflag	nopenalty
+pvp_y_7-1.gat	mapflag	nopenalty
+pvp_y_7-2.gat	mapflag	nopenalty
+pvp_y_7-3.gat	mapflag	nopenalty
+pvp_y_7-4.gat	mapflag	nopenalty
+pvp_y_7-5.gat	mapflag	nopenalty
+pvp_y_8-1.gat	mapflag	nopenalty
+pvp_y_8-2.gat	mapflag	nopenalty
+pvp_y_8-3.gat	mapflag	nopenalty
+pvp_y_8-4.gat	mapflag	nopenalty
+pvp_y_8-5.gat	mapflag	nopenalty
+pvp_n_1-1.gat	mapflag	nopenalty
+pvp_n_1-2.gat	mapflag	nopenalty
+pvp_n_1-3.gat	mapflag	nopenalty
+pvp_n_1-4.gat	mapflag	nopenalty
+pvp_n_1-5.gat	mapflag	nopenalty
+pvp_n_2-1.gat	mapflag	nopenalty
+pvp_n_2-2.gat	mapflag	nopenalty
+pvp_n_2-3.gat	mapflag	nopenalty
+pvp_n_2-4.gat	mapflag	nopenalty
+pvp_n_2-5.gat	mapflag	nopenalty
+pvp_n_3-1.gat	mapflag	nopenalty
+pvp_n_3-2.gat	mapflag	nopenalty
+pvp_n_3-3.gat	mapflag	nopenalty
+pvp_n_3-4.gat	mapflag	nopenalty
+pvp_n_3-5.gat	mapflag	nopenalty
+pvp_n_4-1.gat	mapflag	nopenalty
+pvp_n_4-2.gat	mapflag	nopenalty
+pvp_n_4-3.gat	mapflag	nopenalty
+pvp_n_4-4.gat	mapflag	nopenalty
+pvp_n_4-5.gat	mapflag	nopenalty
+pvp_n_5-1.gat	mapflag	nopenalty
+pvp_n_5-2.gat	mapflag	nopenalty
+pvp_n_5-3.gat	mapflag	nopenalty
+pvp_n_5-4.gat	mapflag	nopenalty
+pvp_n_5-5.gat	mapflag	nopenalty
+pvp_n_6-1.gat	mapflag	nopenalty
+pvp_n_6-2.gat	mapflag	nopenalty
+pvp_n_6-3.gat	mapflag	nopenalty
+pvp_n_6-4.gat	mapflag	nopenalty
+pvp_n_6-5.gat	mapflag	nopenalty
+pvp_n_7-1.gat	mapflag	nopenalty
+pvp_n_7-2.gat	mapflag	nopenalty
+pvp_n_7-3.gat	mapflag	nopenalty
+pvp_n_7-4.gat	mapflag	nopenalty
+pvp_n_7-5.gat	mapflag	nopenalty
+pvp_n_8-1.gat	mapflag	nopenalty
+pvp_n_8-2.gat	mapflag	nopenalty
+pvp_n_8-3.gat	mapflag	nopenalty
+pvp_n_8-4.gat	mapflag	nopenalty
+pvp_n_8-5.gat	mapflag	nopenalty
 pvp_2vs2.gat	mapflag	nopenalty
\ No newline at end of file
diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt
index cfb0d6490..a77fe9a02 100644
--- a/conf-tmpl/mapflag/nopvp.txt
+++ b/conf-tmpl/mapflag/nopvp.txt
@@ -1,78 +1,78 @@
-///===== Description: =============================================

-//= pvp	off: Disables Player versus Player mode.

-//= To disable PvP mode on a specific map add the mapname here.

-//= v 1.1

-//============================================================

-

-ayo_in01.gat	mapflag	pvp	off

-ayo_in02.gat	mapflag	pvp	off

-alberta_in.gat	mapflag	pvp	off

-alberta.gat	mapflag	pvp	off

-alde_alche.gat	mapflag	pvp	off

-aldeba_in.gat	mapflag	pvp	off

-aldebaran.gat	mapflag	pvp	off

-ama_in01.gat	mapflag	pvp	off

-ama_in02.gat	mapflag	pvp	off

-amatsu.gat	mapflag	pvp	off

-cmd_in01.gat	mapflag	pvp	off

-cmd_in02.gat	mapflag	pvp	off

-comodo.gat	mapflag	pvp	off

-gef_tower.gat	mapflag	pvp	off

-geffen.gat	mapflag	pvp	off

-geffen_in.gat	mapflag	pvp	off

-gon_in.gat	mapflag	pvp	off

-gonryun.gat	mapflag	pvp	off

-gon_test.gat	mapflag	pvp	off

-in_hunter.gat	mapflag	pvp	off

-in_moc_16.gat	mapflag	pvp	off

-in_orcs01.gat	mapflag	pvp	off

-izlude_in.gat	mapflag	pvp	off

-izlude.gat	mapflag	pvp	off

-hugel.gat	mapflag	pvp	off

-hu_in01.gat	mapflag	pvp	off

-lighthalzen.gat	mapflag	pvp	off

-lhz_airport.gat	mapflag	pvp	off

-lhz_in01.gat	mapflag	pvp	off

-lhz_in02.gat	mapflag	pvp	off

-lhz_in03.gat	mapflag	pvp	off

-louyang.gat	mapflag	pvp	off

-lou_in01.gat	mapflag	pvp	off

-lou_in02.gat	mapflag	pvp	off

-moc_castle.gat	mapflag	pvp	off

-monk_in.gat	mapflag	pvp	off

-morocc_in.gat	mapflag	pvp	off

-morocc.gat	mapflag	pvp	off

-nif_in.gat	mapflag	pvp	off

-payon_in01.gat	mapflag	pvp	off

-payon_in02.gat	mapflag	pvp	off

-payon_in03.gat	mapflag	pvp	off

-payon.gat	mapflag	pvp	off

-pay_arche.gat	mapflag	pvp	off

-prt_are_in.gat	mapflag	pvp	off

-prt_are01.gat	mapflag	pvp	off

-prt_castle.gat	mapflag	pvp	off

-prt_church.gat	mapflag	pvp	off

-prt_in.gat	mapflag	pvp	off

-prontera.gat	mapflag	pvp	off

-sec_in01.gat	mapflag	pvp	off

-job_sword1.gat	mapflag	pvp	off

-um_in.gat	mapflag	pvp	off

-umbala.gat	mapflag	pvp	off

-xmas_in.gat	mapflag	pvp	off

-xmas.gat	mapflag	pvp	off

-yuno_in01.gat	mapflag	pvp	off

-yuno_in03.gat	mapflag	pvp	off

-yuno_in04.gat	mapflag	pvp	off

-yuno_in05.gat	mapflag	pvp	off

-yuno.gat	mapflag	pvp	off

-yuno_pre.gat	mapflag	pvp	off

-y_airport.gat	mapflag	pvp	off

-rachel.gat	mapflag	pvp	off

-ra_in01.gat	mapflag	pvp	off

-ra_temin.gat	mapflag	pvp	off

-airplane.gat	mapflag	pvp	off

-airport.gat	mapflag	pvp	off

-einbech.gat	mapflag	pvp	off

-einbroch.gat	mapflag	pvp	off

-ein_in01.gat	mapflag	pvp	off

+///===== Description: =============================================
+//= pvp	off: Disables Player versus Player mode.
+//= To disable PvP mode on a specific map add the mapname here.
+//= v 1.1
+//============================================================
+
+ayo_in01.gat	mapflag	pvp	off
+ayo_in02.gat	mapflag	pvp	off
+alberta_in.gat	mapflag	pvp	off
+alberta.gat	mapflag	pvp	off
+alde_alche.gat	mapflag	pvp	off
+aldeba_in.gat	mapflag	pvp	off
+aldebaran.gat	mapflag	pvp	off
+ama_in01.gat	mapflag	pvp	off
+ama_in02.gat	mapflag	pvp	off
+amatsu.gat	mapflag	pvp	off
+cmd_in01.gat	mapflag	pvp	off
+cmd_in02.gat	mapflag	pvp	off
+comodo.gat	mapflag	pvp	off
+gef_tower.gat	mapflag	pvp	off
+geffen.gat	mapflag	pvp	off
+geffen_in.gat	mapflag	pvp	off
+gon_in.gat	mapflag	pvp	off
+gonryun.gat	mapflag	pvp	off
+gon_test.gat	mapflag	pvp	off
+in_hunter.gat	mapflag	pvp	off
+in_moc_16.gat	mapflag	pvp	off
+in_orcs01.gat	mapflag	pvp	off
+izlude_in.gat	mapflag	pvp	off
+izlude.gat	mapflag	pvp	off
+hugel.gat	mapflag	pvp	off
+hu_in01.gat	mapflag	pvp	off
+lighthalzen.gat	mapflag	pvp	off
+lhz_airport.gat	mapflag	pvp	off
+lhz_in01.gat	mapflag	pvp	off
+lhz_in02.gat	mapflag	pvp	off
+lhz_in03.gat	mapflag	pvp	off
+louyang.gat	mapflag	pvp	off
+lou_in01.gat	mapflag	pvp	off
+lou_in02.gat	mapflag	pvp	off
+moc_castle.gat	mapflag	pvp	off
+monk_in.gat	mapflag	pvp	off
+morocc_in.gat	mapflag	pvp	off
+morocc.gat	mapflag	pvp	off
+nif_in.gat	mapflag	pvp	off
+payon_in01.gat	mapflag	pvp	off
+payon_in02.gat	mapflag	pvp	off
+payon_in03.gat	mapflag	pvp	off
+payon.gat	mapflag	pvp	off
+pay_arche.gat	mapflag	pvp	off
+prt_are_in.gat	mapflag	pvp	off
+prt_are01.gat	mapflag	pvp	off
+prt_castle.gat	mapflag	pvp	off
+prt_church.gat	mapflag	pvp	off
+prt_in.gat	mapflag	pvp	off
+prontera.gat	mapflag	pvp	off
+sec_in01.gat	mapflag	pvp	off
+job_sword1.gat	mapflag	pvp	off
+um_in.gat	mapflag	pvp	off
+umbala.gat	mapflag	pvp	off
+xmas_in.gat	mapflag	pvp	off
+xmas.gat	mapflag	pvp	off
+yuno_in01.gat	mapflag	pvp	off
+yuno_in03.gat	mapflag	pvp	off
+yuno_in04.gat	mapflag	pvp	off
+yuno_in05.gat	mapflag	pvp	off
+yuno.gat	mapflag	pvp	off
+yuno_pre.gat	mapflag	pvp	off
+y_airport.gat	mapflag	pvp	off
+rachel.gat	mapflag	pvp	off
+ra_in01.gat	mapflag	pvp	off
+ra_temin.gat	mapflag	pvp	off
+airplane.gat	mapflag	pvp	off
+airport.gat	mapflag	pvp	off
+einbech.gat	mapflag	pvp	off
+einbroch.gat	mapflag	pvp	off
+ein_in01.gat	mapflag	pvp	off
 ayothaya.gat	mapflag	pvp	off
\ No newline at end of file
diff --git a/conf-tmpl/mapflag/noreturn.txt b/conf-tmpl/mapflag/noreturn.txt
index 1dd044fb4..fdb862381 100644
--- a/conf-tmpl/mapflag/noreturn.txt
+++ b/conf-tmpl/mapflag/noreturn.txt
@@ -1,226 +1,226 @@
-//===== eAthena Script =======================================

-//= Map flags that disable use of Butterfly wings

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.4 [Lupus]

-//===== Notes: ===============================================

-//= For disabling Fly wings use noteleport

-//= 1.3 According to the patch, enabled Butterfly wings in the Castles [Lupus]

-//= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]

-//===== Current Version: =====================================

-

-// Cities ========================

-ayo_in01.gat	mapflag	noreturn

-ayo_in02.gat	mapflag	noreturn

-alb_ship.gat	mapflag	noreturn

-alberta_in.gat	mapflag	noreturn

-aldeba_in.gat	mapflag	noreturn

-ama_in01.gat	mapflag	noreturn

-ama_in02.gat	mapflag	noreturn

-ama_test.gat	mapflag	noreturn

-cmd_in01.gat	mapflag	noreturn

-cmd_in02.gat	mapflag	noreturn

-gef_tower.gat	mapflag	noreturn

-geffen_in.gat	mapflag	noreturn

-gon_test.gat	mapflag	noreturn

-gon_in.gat	mapflag	noreturn

-in_orcs01.gat	mapflag	noreturn

-izlude_in.gat	mapflag	noreturn

-hu_in01.gat	mapflag	noreturn

-jawaii_in.gat	mapflag	noreturn

-lou_in01.gat	mapflag	noreturn

-lou_in02.gat	mapflag	noreturn

-moc_castle.gat	mapflag	noreturn

-morocc_in.gat	mapflag	noreturn

-new_zone01.gat	mapflag	noreturn

-new_zone02.gat	mapflag	noreturn

-new_zone03.gat	mapflag	noreturn

-new_zone04.gat	mapflag	noreturn

-nif_in.gat	mapflag	noreturn

-payon_in01.gat	mapflag	noreturn

-payon_in02.gat	mapflag	noreturn

-payon_in03.gat	mapflag	noreturn

-prt_are_in.gat	mapflag	noreturn

-prt_are01.gat	mapflag	noreturn

-prt_castle.gat	mapflag	noreturn

-prt_church.gat	mapflag	noreturn

-prt_in.gat	mapflag	noreturn

-um_in.gat	mapflag	noreturn

-xmas_in.gat	mapflag	noreturn

-yuno_in01.gat	mapflag	noreturn

-yuno_in03.gat	mapflag	noreturn

-yuno_in04.gat	mapflag	noreturn

-yuno_in05.gat	mapflag	noreturn

-que_sign01.gat	mapflag	noreturn

-ein_in01.gat	mapflag	noreturn

-airport.gat	mapflag	noreturn

-airplane.gat	mapflag	noreturn

-airplane_01.gat	mapflag	noreturn

-ra_in01.gat	mapflag	noreturn

-ra_temin.gat	mapflag	noreturn

-que_rachel.gat	mapflag	noreturn

-

-// New areas

-yuno_pre.gat	mapflag	noreturn

-y_airport.gat	mapflag	noreturn

-lhz_airport.gat	mapflag	noreturn

-lhz_in01.gat	mapflag	noreturn

-lhz_in02.gat	mapflag	noreturn

-lhz_in03.gat	mapflag	noreturn

-lhz_que01.gat	mapflag	noreturn

-kh_mansion.gat	mapflag	noreturn

-kh_rossi.gat	mapflag	noreturn

-kh_school.gat	mapflag	noreturn

-kh_vila.gat	mapflag	noreturn

-

-// Job Quests ====================

-job_sword1.gat	mapflag	noreturn

-job_thief1.gat	mapflag	noreturn

-// 2-1 -----------------------

-job_hunte.gat	mapflag	noreturn

-job_prist.gat	mapflag	noreturn

-job_wiz.gat	mapflag	noreturn

-in_hunter.gat	mapflag	noreturn

-in_moc_16.gat	mapflag	noreturn

-// 2-2 --------------------

-alde_alche.gat	mapflag	noreturn

-job_cru.gat	mapflag	noreturn

-job_duncer.gat	mapflag	noreturn

-job_monk.gat	mapflag	noreturn

-monk_test.gat	mapflag	noreturn

-monk_in.gat	mapflag	noreturn

-in_rogue.gat	mapflag	noreturn

-job_sage.gat	mapflag	noreturn

-que_ng.gat	mapflag	noreturn

-

-// Special Quests Places =========

-que_god01.gat	mapflag	noreturn

-que_god02.gat	mapflag	noreturn

-que_bingo.gat	mapflag	noreturn

-que_hugel.gat	mapflag	noreturn

-poring_c01.gat	mapflag	noreturn

-poring_c02.gat	mapflag	noreturn

-

-// Guild Castles =================

-//= 1.3 According to the kRO patch, enabled Butterfly wings in the Castles

-//aldeg_cas01.gat	mapflag	noreturn

-//aldeg_cas02.gat	mapflag	noreturn

-//aldeg_cas03.gat	mapflag	noreturn

-//aldeg_cas04.gat	mapflag	noreturn

-//aldeg_cas05.gat	mapflag	noreturn

-//gefg_cas01.gat	mapflag	noreturn

-//gefg_cas02.gat	mapflag	noreturn

-//gefg_cas03.gat	mapflag	noreturn

-//gefg_cas04.gat	mapflag	noreturn

-//gefg_cas05.gat	mapflag	noreturn

-//payg_cas01.gat	mapflag	noreturn

-//payg_cas02.gat	mapflag	noreturn

-//payg_cas03.gat	mapflag	noreturn

-//payg_cas04.gat	mapflag	noreturn

-//payg_cas05.gat	mapflag	noreturn

-//prtg_cas01.gat	mapflag	noreturn

-//prtg_cas02.gat	mapflag	noreturn

-//prtg_cas03.gat	mapflag	noreturn

-//prtg_cas04.gat	mapflag	noreturn

-//prtg_cas05.gat	mapflag	noreturn

-//nguild_alde.gat	mapflag	noreturn

-//nguild_gef.gat	mapflag	noreturn

-//nguild_pay.gat	mapflag	noreturn

-//nguild_prt.gat	mapflag	noreturn

-

-// GvG Arenas ===================

-guild_vs1.gat	mapflag	noreturn

-guild_vs2.gat	mapflag	noreturn

-guild_vs3.gat	mapflag	noreturn

-guild_vs4.gat	mapflag	noreturn

-guild_vs5.gat	mapflag	noreturn

-

-// Arenas =====================>\\

-arena_room.gat	mapflag	noreturn

-sec_in01.gat	mapflag	noreturn

-sec_in02.gat	mapflag	noreturn

-

-// PvP Arenas=======================

-pvp_y_room.gat	mapflag	noreturn

-//pvp_y_1-1.gat	mapflag	noreturn

-//pvp_y_1-2.gat	mapflag	noreturn

-//pvp_y_1-3.gat	mapflag	noreturn

-//pvp_y_1-4.gat	mapflag	noreturn

-//pvp_y_1-5.gat	mapflag	noreturn

-//pvp_y_2-1.gat	mapflag	noreturn

-//pvp_y_2-2.gat	mapflag	noreturn

-//pvp_y_2-3.gat	mapflag	noreturn

-//pvp_y_2-4.gat	mapflag	noreturn

-//pvp_y_2-5.gat	mapflag	noreturn

-//pvp_y_3-1.gat	mapflag	noreturn

-//pvp_y_3-2.gat	mapflag	noreturn

-//pvp_y_3-3.gat	mapflag	noreturn

-//pvp_y_3-4.gat	mapflag	noreturn

-//pvp_y_3-5.gat	mapflag	noreturn

-//pvp_y_4-1.gat	mapflag	noreturn

-//pvp_y_4-2.gat	mapflag	noreturn

-//pvp_y_4-3.gat	mapflag	noreturn

-//pvp_y_4-4.gat	mapflag	noreturn

-//pvp_y_4-5.gat	mapflag	noreturn

-//pvp_y_5-1.gat	mapflag	noreturn

-//pvp_y_5-2.gat	mapflag	noreturn

-//pvp_y_5-3.gat	mapflag	noreturn

-//pvp_y_5-4.gat	mapflag	noreturn

-//pvp_y_5-5.gat	mapflag	noreturn

-//pvp_y_6-1.gat	mapflag	noreturn

-//pvp_y_6-2.gat	mapflag	noreturn

-//pvp_y_6-3.gat	mapflag	noreturn

-//pvp_y_6-4.gat	mapflag	noreturn

-//pvp_y_6-5.gat	mapflag	noreturn

-//pvp_y_7-1.gat	mapflag	noreturn

-//pvp_y_7-2.gat	mapflag	noreturn

-//pvp_y_7-3.gat	mapflag	noreturn

-//pvp_y_7-4.gat	mapflag	noreturn

-//pvp_y_7-5.gat	mapflag	noreturn

-//pvp_y_8-1.gat	mapflag	noreturn

-//pvp_y_8-2.gat	mapflag	noreturn

-//pvp_y_8-3.gat	mapflag	noreturn

-//pvp_y_8-4.gat	mapflag	noreturn

-//pvp_y_8-5.gat	mapflag	noreturn

-pvp_n_room.gat	mapflag	noreturn

-//pvp_n_1-1.gat	mapflag	noreturn

-//pvp_n_1-2.gat	mapflag	noreturn

-//pvp_n_1-3.gat	mapflag	noreturn

-//pvp_n_1-4.gat	mapflag	noreturn

-//pvp_n_1-5.gat	mapflag	noreturn

-//pvp_n_2-1.gat	mapflag	noreturn

-//pvp_n_2-2.gat	mapflag	noreturn

-//pvp_n_2-3.gat	mapflag	noreturn

-//pvp_n_2-4.gat	mapflag	noreturn

-//pvp_n_2-5.gat	mapflag	noreturn

-//pvp_n_3-1.gat	mapflag	noreturn

-//pvp_n_3-2.gat	mapflag	noreturn

-//pvp_n_3-3.gat	mapflag	noreturn

-//pvp_n_3-4.gat	mapflag	noreturn

-//pvp_n_3-5.gat	mapflag	noreturn

-//pvp_n_4-1.gat	mapflag	noreturn

-//pvp_n_4-2.gat	mapflag	noreturn

-//pvp_n_4-3.gat	mapflag	noreturn

-//pvp_n_4-4.gat	mapflag	noreturn

-//pvp_n_4-5.gat	mapflag	noreturn

-//pvp_n_5-1.gat	mapflag	noreturn

-//pvp_n_5-2.gat	mapflag	noreturn

-//pvp_n_5-3.gat	mapflag	noreturn

-//pvp_n_5-4.gat	mapflag	noreturn

-//pvp_n_5-5.gat	mapflag	noreturn

-//pvp_n_6-1.gat	mapflag	noreturn

-//pvp_n_6-2.gat	mapflag	noreturn

-//pvp_n_6-3.gat	mapflag	noreturn

-//pvp_n_6-4.gat	mapflag	noreturn

-//pvp_n_6-5.gat	mapflag	noreturn

-//pvp_n_7-1.gat	mapflag	noreturn

-//pvp_n_7-2.gat	mapflag	noreturn

-//pvp_n_7-3.gat	mapflag	noreturn

-//pvp_n_7-4.gat	mapflag	noreturn

-//pvp_n_7-5.gat	mapflag	noreturn

-//pvp_n_8-1.gat	mapflag	noreturn

-//pvp_n_8-2.gat	mapflag	noreturn

-//pvp_n_8-3.gat	mapflag	noreturn

-//pvp_n_8-4.gat	mapflag	noreturn

-//pvp_n_8-5.gat	mapflag	noreturn

-//pvp_2vs2.gat	mapflag	noreturn

+//===== eAthena Script =======================================
+//= Map flags that disable use of Butterfly wings
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.4 [Lupus]
+//===== Notes: ===============================================
+//= For disabling Fly wings use noteleport
+//= 1.3 According to the patch, enabled Butterfly wings in the Castles [Lupus]
+//= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]
+//===== Current Version: =====================================
+
+// Cities ========================
+ayo_in01.gat	mapflag	noreturn
+ayo_in02.gat	mapflag	noreturn
+alb_ship.gat	mapflag	noreturn
+alberta_in.gat	mapflag	noreturn
+aldeba_in.gat	mapflag	noreturn
+ama_in01.gat	mapflag	noreturn
+ama_in02.gat	mapflag	noreturn
+ama_test.gat	mapflag	noreturn
+cmd_in01.gat	mapflag	noreturn
+cmd_in02.gat	mapflag	noreturn
+gef_tower.gat	mapflag	noreturn
+geffen_in.gat	mapflag	noreturn
+gon_test.gat	mapflag	noreturn
+gon_in.gat	mapflag	noreturn
+in_orcs01.gat	mapflag	noreturn
+izlude_in.gat	mapflag	noreturn
+hu_in01.gat	mapflag	noreturn
+jawaii_in.gat	mapflag	noreturn
+lou_in01.gat	mapflag	noreturn
+lou_in02.gat	mapflag	noreturn
+moc_castle.gat	mapflag	noreturn
+morocc_in.gat	mapflag	noreturn
+new_zone01.gat	mapflag	noreturn
+new_zone02.gat	mapflag	noreturn
+new_zone03.gat	mapflag	noreturn
+new_zone04.gat	mapflag	noreturn
+nif_in.gat	mapflag	noreturn
+payon_in01.gat	mapflag	noreturn
+payon_in02.gat	mapflag	noreturn
+payon_in03.gat	mapflag	noreturn
+prt_are_in.gat	mapflag	noreturn
+prt_are01.gat	mapflag	noreturn
+prt_castle.gat	mapflag	noreturn
+prt_church.gat	mapflag	noreturn
+prt_in.gat	mapflag	noreturn
+um_in.gat	mapflag	noreturn
+xmas_in.gat	mapflag	noreturn
+yuno_in01.gat	mapflag	noreturn
+yuno_in03.gat	mapflag	noreturn
+yuno_in04.gat	mapflag	noreturn
+yuno_in05.gat	mapflag	noreturn
+que_sign01.gat	mapflag	noreturn
+ein_in01.gat	mapflag	noreturn
+airport.gat	mapflag	noreturn
+airplane.gat	mapflag	noreturn
+airplane_01.gat	mapflag	noreturn
+ra_in01.gat	mapflag	noreturn
+ra_temin.gat	mapflag	noreturn
+que_rachel.gat	mapflag	noreturn
+
+// New areas
+yuno_pre.gat	mapflag	noreturn
+y_airport.gat	mapflag	noreturn
+lhz_airport.gat	mapflag	noreturn
+lhz_in01.gat	mapflag	noreturn
+lhz_in02.gat	mapflag	noreturn
+lhz_in03.gat	mapflag	noreturn
+lhz_que01.gat	mapflag	noreturn
+kh_mansion.gat	mapflag	noreturn
+kh_rossi.gat	mapflag	noreturn
+kh_school.gat	mapflag	noreturn
+kh_vila.gat	mapflag	noreturn
+
+// Job Quests ====================
+job_sword1.gat	mapflag	noreturn
+job_thief1.gat	mapflag	noreturn
+// 2-1 -----------------------
+job_hunte.gat	mapflag	noreturn
+job_prist.gat	mapflag	noreturn
+job_wiz.gat	mapflag	noreturn
+in_hunter.gat	mapflag	noreturn
+in_moc_16.gat	mapflag	noreturn
+// 2-2 --------------------
+alde_alche.gat	mapflag	noreturn
+job_cru.gat	mapflag	noreturn
+job_duncer.gat	mapflag	noreturn
+job_monk.gat	mapflag	noreturn
+monk_test.gat	mapflag	noreturn
+monk_in.gat	mapflag	noreturn
+in_rogue.gat	mapflag	noreturn
+job_sage.gat	mapflag	noreturn
+que_ng.gat	mapflag	noreturn
+
+// Special Quests Places =========
+que_god01.gat	mapflag	noreturn
+que_god02.gat	mapflag	noreturn
+que_bingo.gat	mapflag	noreturn
+que_hugel.gat	mapflag	noreturn
+poring_c01.gat	mapflag	noreturn
+poring_c02.gat	mapflag	noreturn
+
+// Guild Castles =================
+//= 1.3 According to the kRO patch, enabled Butterfly wings in the Castles
+//aldeg_cas01.gat	mapflag	noreturn
+//aldeg_cas02.gat	mapflag	noreturn
+//aldeg_cas03.gat	mapflag	noreturn
+//aldeg_cas04.gat	mapflag	noreturn
+//aldeg_cas05.gat	mapflag	noreturn
+//gefg_cas01.gat	mapflag	noreturn
+//gefg_cas02.gat	mapflag	noreturn
+//gefg_cas03.gat	mapflag	noreturn
+//gefg_cas04.gat	mapflag	noreturn
+//gefg_cas05.gat	mapflag	noreturn
+//payg_cas01.gat	mapflag	noreturn
+//payg_cas02.gat	mapflag	noreturn
+//payg_cas03.gat	mapflag	noreturn
+//payg_cas04.gat	mapflag	noreturn
+//payg_cas05.gat	mapflag	noreturn
+//prtg_cas01.gat	mapflag	noreturn
+//prtg_cas02.gat	mapflag	noreturn
+//prtg_cas03.gat	mapflag	noreturn
+//prtg_cas04.gat	mapflag	noreturn
+//prtg_cas05.gat	mapflag	noreturn
+//nguild_alde.gat	mapflag	noreturn
+//nguild_gef.gat	mapflag	noreturn
+//nguild_pay.gat	mapflag	noreturn
+//nguild_prt.gat	mapflag	noreturn
+
+// GvG Arenas ===================
+guild_vs1.gat	mapflag	noreturn
+guild_vs2.gat	mapflag	noreturn
+guild_vs3.gat	mapflag	noreturn
+guild_vs4.gat	mapflag	noreturn
+guild_vs5.gat	mapflag	noreturn
+
+// Arenas =====================>\\
+arena_room.gat	mapflag	noreturn
+sec_in01.gat	mapflag	noreturn
+sec_in02.gat	mapflag	noreturn
+
+// PvP Arenas=======================
+pvp_y_room.gat	mapflag	noreturn
+//pvp_y_1-1.gat	mapflag	noreturn
+//pvp_y_1-2.gat	mapflag	noreturn
+//pvp_y_1-3.gat	mapflag	noreturn
+//pvp_y_1-4.gat	mapflag	noreturn
+//pvp_y_1-5.gat	mapflag	noreturn
+//pvp_y_2-1.gat	mapflag	noreturn
+//pvp_y_2-2.gat	mapflag	noreturn
+//pvp_y_2-3.gat	mapflag	noreturn
+//pvp_y_2-4.gat	mapflag	noreturn
+//pvp_y_2-5.gat	mapflag	noreturn
+//pvp_y_3-1.gat	mapflag	noreturn
+//pvp_y_3-2.gat	mapflag	noreturn
+//pvp_y_3-3.gat	mapflag	noreturn
+//pvp_y_3-4.gat	mapflag	noreturn
+//pvp_y_3-5.gat	mapflag	noreturn
+//pvp_y_4-1.gat	mapflag	noreturn
+//pvp_y_4-2.gat	mapflag	noreturn
+//pvp_y_4-3.gat	mapflag	noreturn
+//pvp_y_4-4.gat	mapflag	noreturn
+//pvp_y_4-5.gat	mapflag	noreturn
+//pvp_y_5-1.gat	mapflag	noreturn
+//pvp_y_5-2.gat	mapflag	noreturn
+//pvp_y_5-3.gat	mapflag	noreturn
+//pvp_y_5-4.gat	mapflag	noreturn
+//pvp_y_5-5.gat	mapflag	noreturn
+//pvp_y_6-1.gat	mapflag	noreturn
+//pvp_y_6-2.gat	mapflag	noreturn
+//pvp_y_6-3.gat	mapflag	noreturn
+//pvp_y_6-4.gat	mapflag	noreturn
+//pvp_y_6-5.gat	mapflag	noreturn
+//pvp_y_7-1.gat	mapflag	noreturn
+//pvp_y_7-2.gat	mapflag	noreturn
+//pvp_y_7-3.gat	mapflag	noreturn
+//pvp_y_7-4.gat	mapflag	noreturn
+//pvp_y_7-5.gat	mapflag	noreturn
+//pvp_y_8-1.gat	mapflag	noreturn
+//pvp_y_8-2.gat	mapflag	noreturn
+//pvp_y_8-3.gat	mapflag	noreturn
+//pvp_y_8-4.gat	mapflag	noreturn
+//pvp_y_8-5.gat	mapflag	noreturn
+pvp_n_room.gat	mapflag	noreturn
+//pvp_n_1-1.gat	mapflag	noreturn
+//pvp_n_1-2.gat	mapflag	noreturn
+//pvp_n_1-3.gat	mapflag	noreturn
+//pvp_n_1-4.gat	mapflag	noreturn
+//pvp_n_1-5.gat	mapflag	noreturn
+//pvp_n_2-1.gat	mapflag	noreturn
+//pvp_n_2-2.gat	mapflag	noreturn
+//pvp_n_2-3.gat	mapflag	noreturn
+//pvp_n_2-4.gat	mapflag	noreturn
+//pvp_n_2-5.gat	mapflag	noreturn
+//pvp_n_3-1.gat	mapflag	noreturn
+//pvp_n_3-2.gat	mapflag	noreturn
+//pvp_n_3-3.gat	mapflag	noreturn
+//pvp_n_3-4.gat	mapflag	noreturn
+//pvp_n_3-5.gat	mapflag	noreturn
+//pvp_n_4-1.gat	mapflag	noreturn
+//pvp_n_4-2.gat	mapflag	noreturn
+//pvp_n_4-3.gat	mapflag	noreturn
+//pvp_n_4-4.gat	mapflag	noreturn
+//pvp_n_4-5.gat	mapflag	noreturn
+//pvp_n_5-1.gat	mapflag	noreturn
+//pvp_n_5-2.gat	mapflag	noreturn
+//pvp_n_5-3.gat	mapflag	noreturn
+//pvp_n_5-4.gat	mapflag	noreturn
+//pvp_n_5-5.gat	mapflag	noreturn
+//pvp_n_6-1.gat	mapflag	noreturn
+//pvp_n_6-2.gat	mapflag	noreturn
+//pvp_n_6-3.gat	mapflag	noreturn
+//pvp_n_6-4.gat	mapflag	noreturn
+//pvp_n_6-5.gat	mapflag	noreturn
+//pvp_n_7-1.gat	mapflag	noreturn
+//pvp_n_7-2.gat	mapflag	noreturn
+//pvp_n_7-3.gat	mapflag	noreturn
+//pvp_n_7-4.gat	mapflag	noreturn
+//pvp_n_7-5.gat	mapflag	noreturn
+//pvp_n_8-1.gat	mapflag	noreturn
+//pvp_n_8-2.gat	mapflag	noreturn
+//pvp_n_8-3.gat	mapflag	noreturn
+//pvp_n_8-4.gat	mapflag	noreturn
+//pvp_n_8-5.gat	mapflag	noreturn
+//pvp_2vs2.gat	mapflag	noreturn
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index a77cae3d8..549132090 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -1,186 +1,186 @@
-//===== eAthena Script =======================================

-//= Map flags that disable auto saving

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.7 [Lupus]

-//===== Current Version: =====================================

-

-// Job Quests ====================

-job_sword1.gat	mapflag	nosave	SavePoint

-//job_thief1.gat	mapflag	nosave	SavePoint

-// 2-1

-job_knt.gat	mapflag	nosave	SavePoint

-job_prist.gat	mapflag	nosave	SavePoint

-job_wiz.gat	mapflag	nosave	SavePoint

-in_moc_16.gat	mapflag	nosave	SavePoint

-job_hunte.gat	mapflag	nosave	SavePoint

-//in_hunter.gat	mapflag	nosave	SavePoint

-// 2-2

-alde_alche.gat	mapflag	nosave	SavePoint

-job_cru.gat	mapflag	nosave	SavePoint

-job_duncer.gat	mapflag	nosave	SavePoint

-job_monk.gat	mapflag	nosave	SavePoint

-monk_test.gat	mapflag	nosave	SavePoint

-monk_in.gat	mapflag	nosave	SavePoint

-in_rogue.gat	mapflag	nosave	SavePoint

-job_sage.gat	mapflag	nosave	SavePoint

-

-job_star.gat	mapflag	nosave	SavePoint

-job_soul.gat	mapflag	nosave	SavePoint

-

-// Special Quests Places =====

-ama_test.gat	mapflag	nosave	SavePoint

-gef_dun03.gat	mapflag	nosave	SavePoint

-que_god01.gat	mapflag	nosave	SavePoint

-que_god02.gat	mapflag	nosave	SavePoint

-que_sign01.gat	mapflag	nosave	SavePoint

-que_sign02.gat	mapflag	nosave	SavePoint

-que_rachel.gat	mapflag	nosave	SavePoint

-que_ng.gat	mapflag	nosave	SavePoint

-gon_test.gat	mapflag	nosave	SavePoint

-

-// GvG Arenas ==========================

-guild_vs1.gat	mapflag	nosave	SavePoint

-guild_vs2.gat	mapflag	nosave	SavePoint

-guild_vs3.gat	mapflag	nosave	SavePoint

-guild_vs4.gat	mapflag	nosave	SavePoint

-guild_vs5.gat	mapflag	nosave	SavePoint

-

-// Izlude Arena ========================

-force_1-1.gat	mapflag	nosave	SavePoint

-force_1-2.gat	mapflag	nosave	SavePoint

-force_1-3.gat	mapflag	nosave	SavePoint

-force_2-1.gat	mapflag	nosave	SavePoint

-force_2-2.gat	mapflag	nosave	SavePoint

-force_2-3.gat	mapflag	nosave	SavePoint

-force_3-1.gat	mapflag	nosave	SavePoint

-force_3-2.gat	mapflag	nosave	SavePoint

-force_3-3.gat	mapflag	nosave	SavePoint

-

-// Juperos =============================

-jupe_area1.gat	mapflag	nosave	SavePoint

-jupe_area2.gat	mapflag	nosave	SavePoint

-jupe_ele.gat	mapflag	nosave	SavePoint

-jupe_ele_r.gat	mapflag	nosave	SavePoint

-jupe_gate.gat	mapflag	nosave	SavePoint

-

-//PvP Arenas =================================

-pvp_y_room.gat	mapflag	nosave	SavePoint

-pvp_y_1-1.gat	mapflag	nosave	SavePoint

-pvp_y_1-2.gat	mapflag	nosave	SavePoint

-pvp_y_1-3.gat	mapflag	nosave	SavePoint

-pvp_y_1-4.gat	mapflag	nosave	SavePoint

-pvp_y_1-5.gat	mapflag	nosave	SavePoint

-pvp_y_2-1.gat	mapflag	nosave	SavePoint

-pvp_y_2-2.gat	mapflag	nosave	SavePoint

-pvp_y_2-3.gat	mapflag	nosave	SavePoint

-pvp_y_2-4.gat	mapflag	nosave	SavePoint

-pvp_y_2-5.gat	mapflag	nosave	SavePoint

-pvp_y_3-1.gat	mapflag	nosave	SavePoint

-pvp_y_3-2.gat	mapflag	nosave	SavePoint

-pvp_y_3-3.gat	mapflag	nosave	SavePoint

-pvp_y_3-4.gat	mapflag	nosave	SavePoint

-pvp_y_3-5.gat	mapflag	nosave	SavePoint

-pvp_y_4-1.gat	mapflag	nosave	SavePoint

-pvp_y_4-2.gat	mapflag	nosave	SavePoint

-pvp_y_4-3.gat	mapflag	nosave	SavePoint

-pvp_y_4-4.gat	mapflag	nosave	SavePoint

-pvp_y_4-5.gat	mapflag	nosave	SavePoint

-pvp_y_5-1.gat	mapflag	nosave	SavePoint

-pvp_y_5-2.gat	mapflag	nosave	SavePoint

-pvp_y_5-3.gat	mapflag	nosave	SavePoint

-pvp_y_5-4.gat	mapflag	nosave	SavePoint

-pvp_y_5-5.gat	mapflag	nosave	SavePoint

-pvp_y_6-1.gat	mapflag	nosave	SavePoint

-pvp_y_6-2.gat	mapflag	nosave	SavePoint

-pvp_y_6-3.gat	mapflag	nosave	SavePoint

-pvp_y_6-4.gat	mapflag	nosave	SavePoint

-pvp_y_6-5.gat	mapflag	nosave	SavePoint

-pvp_y_7-1.gat	mapflag	nosave	SavePoint

-pvp_y_7-2.gat	mapflag	nosave	SavePoint

-pvp_y_7-3.gat	mapflag	nosave	SavePoint

-pvp_y_7-4.gat	mapflag	nosave	SavePoint

-pvp_y_7-5.gat	mapflag	nosave	SavePoint

-pvp_y_8-1.gat	mapflag	nosave	SavePoint

-pvp_y_8-2.gat	mapflag	nosave	SavePoint

-pvp_y_8-3.gat	mapflag	nosave	SavePoint

-pvp_y_8-4.gat	mapflag	nosave	SavePoint

-pvp_y_8-5.gat	mapflag	nosave	SavePoint

-pvp_n_room.gat	mapflag	nosave	SavePoint

-pvp_n_1-1.gat	mapflag	nosave	SavePoint

-pvp_n_1-2.gat	mapflag	nosave	SavePoint

-pvp_n_1-3.gat	mapflag	nosave	SavePoint

-pvp_n_1-4.gat	mapflag	nosave	SavePoint

-pvp_n_1-5.gat	mapflag	nosave	SavePoint

-pvp_n_2-1.gat	mapflag	nosave	SavePoint

-pvp_n_2-2.gat	mapflag	nosave	SavePoint

-pvp_n_2-3.gat	mapflag	nosave	SavePoint

-pvp_n_2-4.gat	mapflag	nosave	SavePoint

-pvp_n_2-5.gat	mapflag	nosave	SavePoint

-pvp_n_3-1.gat	mapflag	nosave	SavePoint

-pvp_n_3-2.gat	mapflag	nosave	SavePoint

-pvp_n_3-3.gat	mapflag	nosave	SavePoint

-pvp_n_3-4.gat	mapflag	nosave	SavePoint

-pvp_n_3-5.gat	mapflag	nosave	SavePoint

-pvp_n_4-1.gat	mapflag	nosave	SavePoint

-pvp_n_4-2.gat	mapflag	nosave	SavePoint

-pvp_n_4-3.gat	mapflag	nosave	SavePoint

-pvp_n_4-4.gat	mapflag	nosave	SavePoint

-pvp_n_4-5.gat	mapflag	nosave	SavePoint

-pvp_n_5-1.gat	mapflag	nosave	SavePoint

-pvp_n_5-2.gat	mapflag	nosave	SavePoint

-pvp_n_5-3.gat	mapflag	nosave	SavePoint

-pvp_n_5-4.gat	mapflag	nosave	SavePoint

-pvp_n_5-5.gat	mapflag	nosave	SavePoint

-pvp_n_6-1.gat	mapflag	nosave	SavePoint

-pvp_n_6-2.gat	mapflag	nosave	SavePoint

-pvp_n_6-3.gat	mapflag	nosave	SavePoint

-pvp_n_6-4.gat	mapflag	nosave	SavePoint

-pvp_n_6-5.gat	mapflag	nosave	SavePoint

-pvp_n_7-1.gat	mapflag	nosave	SavePoint

-pvp_n_7-2.gat	mapflag	nosave	SavePoint

-pvp_n_7-3.gat	mapflag	nosave	SavePoint

-pvp_n_7-4.gat	mapflag	nosave	SavePoint

-pvp_n_7-5.gat	mapflag	nosave	SavePoint

-pvp_n_8-1.gat	mapflag	nosave	SavePoint

-pvp_n_8-2.gat	mapflag	nosave	SavePoint

-pvp_n_8-3.gat	mapflag	nosave	SavePoint

-pvp_n_8-4.gat	mapflag	nosave	SavePoint

-pvp_n_8-5.gat	mapflag	nosave	SavePoint

-pvp_2vs2.gat	mapflag	nosave	SavePoint

-

-//WoE Castles =================================

-aldeg_cas01.gat	mapflag	nosave	SavePoint

-aldeg_cas02.gat	mapflag	nosave	SavePoint

-aldeg_cas03.gat	mapflag	nosave	SavePoint

-aldeg_cas04.gat	mapflag	nosave	SavePoint

-aldeg_cas05.gat	mapflag	nosave	SavePoint

-gefg_cas01.gat	mapflag	nosave	SavePoint

-gefg_cas02.gat	mapflag	nosave	SavePoint

-gefg_cas03.gat	mapflag	nosave	SavePoint

-gefg_cas04.gat	mapflag	nosave	SavePoint

-gefg_cas05.gat	mapflag	nosave	SavePoint

-payg_cas01.gat	mapflag	nosave	SavePoint

-payg_cas02.gat	mapflag	nosave	SavePoint

-payg_cas03.gat	mapflag	nosave	SavePoint

-payg_cas04.gat	mapflag	nosave	SavePoint

-payg_cas05.gat	mapflag	nosave	SavePoint

-prtg_cas01.gat	mapflag	nosave	SavePoint

-prtg_cas02.gat	mapflag	nosave	SavePoint

-prtg_cas03.gat	mapflag	nosave	SavePoint

-prtg_cas04.gat	mapflag	nosave	SavePoint

-prtg_cas05.gat	mapflag	nosave	SavePoint

-nguild_alde.gat	mapflag	nosave	SavePoint

-nguild_gef.gat	mapflag	nosave	SavePoint

-nguild_pay.gat	mapflag	nosave	SavePoint

-nguild_prt.gat	mapflag	nosave	SavePoint

-

-//Guild Dungeons ==============================

-gld_dun01.gat	mapflag	nosave	SavePoint

-gld_dun02.gat	mapflag	nosave	SavePoint

-gld_dun03.gat	mapflag	nosave	SavePoint

-gld_dun04.gat	mapflag	nosave	SavePoint

-

-//Normal Maps =================================

-yggdrasil01.gat	mapflag	nosave	SavePoint

-thana_boss.gat	mapflag	nosave	SavePoint

+//===== eAthena Script =======================================
+//= Map flags that disable auto saving
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.7 [Lupus]
+//===== Current Version: =====================================
+
+// Job Quests ====================
+job_sword1.gat	mapflag	nosave	SavePoint
+//job_thief1.gat	mapflag	nosave	SavePoint
+// 2-1
+job_knt.gat	mapflag	nosave	SavePoint
+job_prist.gat	mapflag	nosave	SavePoint
+job_wiz.gat	mapflag	nosave	SavePoint
+in_moc_16.gat	mapflag	nosave	SavePoint
+job_hunte.gat	mapflag	nosave	SavePoint
+//in_hunter.gat	mapflag	nosave	SavePoint
+// 2-2
+alde_alche.gat	mapflag	nosave	SavePoint
+job_cru.gat	mapflag	nosave	SavePoint
+job_duncer.gat	mapflag	nosave	SavePoint
+job_monk.gat	mapflag	nosave	SavePoint
+monk_test.gat	mapflag	nosave	SavePoint
+monk_in.gat	mapflag	nosave	SavePoint
+in_rogue.gat	mapflag	nosave	SavePoint
+job_sage.gat	mapflag	nosave	SavePoint
+
+job_star.gat	mapflag	nosave	SavePoint
+job_soul.gat	mapflag	nosave	SavePoint
+
+// Special Quests Places =====
+ama_test.gat	mapflag	nosave	SavePoint
+gef_dun03.gat	mapflag	nosave	SavePoint
+que_god01.gat	mapflag	nosave	SavePoint
+que_god02.gat	mapflag	nosave	SavePoint
+que_sign01.gat	mapflag	nosave	SavePoint
+que_sign02.gat	mapflag	nosave	SavePoint
+que_rachel.gat	mapflag	nosave	SavePoint
+que_ng.gat	mapflag	nosave	SavePoint
+gon_test.gat	mapflag	nosave	SavePoint
+
+// GvG Arenas ==========================
+guild_vs1.gat	mapflag	nosave	SavePoint
+guild_vs2.gat	mapflag	nosave	SavePoint
+guild_vs3.gat	mapflag	nosave	SavePoint
+guild_vs4.gat	mapflag	nosave	SavePoint
+guild_vs5.gat	mapflag	nosave	SavePoint
+
+// Izlude Arena ========================
+force_1-1.gat	mapflag	nosave	SavePoint
+force_1-2.gat	mapflag	nosave	SavePoint
+force_1-3.gat	mapflag	nosave	SavePoint
+force_2-1.gat	mapflag	nosave	SavePoint
+force_2-2.gat	mapflag	nosave	SavePoint
+force_2-3.gat	mapflag	nosave	SavePoint
+force_3-1.gat	mapflag	nosave	SavePoint
+force_3-2.gat	mapflag	nosave	SavePoint
+force_3-3.gat	mapflag	nosave	SavePoint
+
+// Juperos =============================
+jupe_area1.gat	mapflag	nosave	SavePoint
+jupe_area2.gat	mapflag	nosave	SavePoint
+jupe_ele.gat	mapflag	nosave	SavePoint
+jupe_ele_r.gat	mapflag	nosave	SavePoint
+jupe_gate.gat	mapflag	nosave	SavePoint
+
+//PvP Arenas =================================
+pvp_y_room.gat	mapflag	nosave	SavePoint
+pvp_y_1-1.gat	mapflag	nosave	SavePoint
+pvp_y_1-2.gat	mapflag	nosave	SavePoint
+pvp_y_1-3.gat	mapflag	nosave	SavePoint
+pvp_y_1-4.gat	mapflag	nosave	SavePoint
+pvp_y_1-5.gat	mapflag	nosave	SavePoint
+pvp_y_2-1.gat	mapflag	nosave	SavePoint
+pvp_y_2-2.gat	mapflag	nosave	SavePoint
+pvp_y_2-3.gat	mapflag	nosave	SavePoint
+pvp_y_2-4.gat	mapflag	nosave	SavePoint
+pvp_y_2-5.gat	mapflag	nosave	SavePoint
+pvp_y_3-1.gat	mapflag	nosave	SavePoint
+pvp_y_3-2.gat	mapflag	nosave	SavePoint
+pvp_y_3-3.gat	mapflag	nosave	SavePoint
+pvp_y_3-4.gat	mapflag	nosave	SavePoint
+pvp_y_3-5.gat	mapflag	nosave	SavePoint
+pvp_y_4-1.gat	mapflag	nosave	SavePoint
+pvp_y_4-2.gat	mapflag	nosave	SavePoint
+pvp_y_4-3.gat	mapflag	nosave	SavePoint
+pvp_y_4-4.gat	mapflag	nosave	SavePoint
+pvp_y_4-5.gat	mapflag	nosave	SavePoint
+pvp_y_5-1.gat	mapflag	nosave	SavePoint
+pvp_y_5-2.gat	mapflag	nosave	SavePoint
+pvp_y_5-3.gat	mapflag	nosave	SavePoint
+pvp_y_5-4.gat	mapflag	nosave	SavePoint
+pvp_y_5-5.gat	mapflag	nosave	SavePoint
+pvp_y_6-1.gat	mapflag	nosave	SavePoint
+pvp_y_6-2.gat	mapflag	nosave	SavePoint
+pvp_y_6-3.gat	mapflag	nosave	SavePoint
+pvp_y_6-4.gat	mapflag	nosave	SavePoint
+pvp_y_6-5.gat	mapflag	nosave	SavePoint
+pvp_y_7-1.gat	mapflag	nosave	SavePoint
+pvp_y_7-2.gat	mapflag	nosave	SavePoint
+pvp_y_7-3.gat	mapflag	nosave	SavePoint
+pvp_y_7-4.gat	mapflag	nosave	SavePoint
+pvp_y_7-5.gat	mapflag	nosave	SavePoint
+pvp_y_8-1.gat	mapflag	nosave	SavePoint
+pvp_y_8-2.gat	mapflag	nosave	SavePoint
+pvp_y_8-3.gat	mapflag	nosave	SavePoint
+pvp_y_8-4.gat	mapflag	nosave	SavePoint
+pvp_y_8-5.gat	mapflag	nosave	SavePoint
+pvp_n_room.gat	mapflag	nosave	SavePoint
+pvp_n_1-1.gat	mapflag	nosave	SavePoint
+pvp_n_1-2.gat	mapflag	nosave	SavePoint
+pvp_n_1-3.gat	mapflag	nosave	SavePoint
+pvp_n_1-4.gat	mapflag	nosave	SavePoint
+pvp_n_1-5.gat	mapflag	nosave	SavePoint
+pvp_n_2-1.gat	mapflag	nosave	SavePoint
+pvp_n_2-2.gat	mapflag	nosave	SavePoint
+pvp_n_2-3.gat	mapflag	nosave	SavePoint
+pvp_n_2-4.gat	mapflag	nosave	SavePoint
+pvp_n_2-5.gat	mapflag	nosave	SavePoint
+pvp_n_3-1.gat	mapflag	nosave	SavePoint
+pvp_n_3-2.gat	mapflag	nosave	SavePoint
+pvp_n_3-3.gat	mapflag	nosave	SavePoint
+pvp_n_3-4.gat	mapflag	nosave	SavePoint
+pvp_n_3-5.gat	mapflag	nosave	SavePoint
+pvp_n_4-1.gat	mapflag	nosave	SavePoint
+pvp_n_4-2.gat	mapflag	nosave	SavePoint
+pvp_n_4-3.gat	mapflag	nosave	SavePoint
+pvp_n_4-4.gat	mapflag	nosave	SavePoint
+pvp_n_4-5.gat	mapflag	nosave	SavePoint
+pvp_n_5-1.gat	mapflag	nosave	SavePoint
+pvp_n_5-2.gat	mapflag	nosave	SavePoint
+pvp_n_5-3.gat	mapflag	nosave	SavePoint
+pvp_n_5-4.gat	mapflag	nosave	SavePoint
+pvp_n_5-5.gat	mapflag	nosave	SavePoint
+pvp_n_6-1.gat	mapflag	nosave	SavePoint
+pvp_n_6-2.gat	mapflag	nosave	SavePoint
+pvp_n_6-3.gat	mapflag	nosave	SavePoint
+pvp_n_6-4.gat	mapflag	nosave	SavePoint
+pvp_n_6-5.gat	mapflag	nosave	SavePoint
+pvp_n_7-1.gat	mapflag	nosave	SavePoint
+pvp_n_7-2.gat	mapflag	nosave	SavePoint
+pvp_n_7-3.gat	mapflag	nosave	SavePoint
+pvp_n_7-4.gat	mapflag	nosave	SavePoint
+pvp_n_7-5.gat	mapflag	nosave	SavePoint
+pvp_n_8-1.gat	mapflag	nosave	SavePoint
+pvp_n_8-2.gat	mapflag	nosave	SavePoint
+pvp_n_8-3.gat	mapflag	nosave	SavePoint
+pvp_n_8-4.gat	mapflag	nosave	SavePoint
+pvp_n_8-5.gat	mapflag	nosave	SavePoint
+pvp_2vs2.gat	mapflag	nosave	SavePoint
+
+//WoE Castles =================================
+aldeg_cas01.gat	mapflag	nosave	SavePoint
+aldeg_cas02.gat	mapflag	nosave	SavePoint
+aldeg_cas03.gat	mapflag	nosave	SavePoint
+aldeg_cas04.gat	mapflag	nosave	SavePoint
+aldeg_cas05.gat	mapflag	nosave	SavePoint
+gefg_cas01.gat	mapflag	nosave	SavePoint
+gefg_cas02.gat	mapflag	nosave	SavePoint
+gefg_cas03.gat	mapflag	nosave	SavePoint
+gefg_cas04.gat	mapflag	nosave	SavePoint
+gefg_cas05.gat	mapflag	nosave	SavePoint
+payg_cas01.gat	mapflag	nosave	SavePoint
+payg_cas02.gat	mapflag	nosave	SavePoint
+payg_cas03.gat	mapflag	nosave	SavePoint
+payg_cas04.gat	mapflag	nosave	SavePoint
+payg_cas05.gat	mapflag	nosave	SavePoint
+prtg_cas01.gat	mapflag	nosave	SavePoint
+prtg_cas02.gat	mapflag	nosave	SavePoint
+prtg_cas03.gat	mapflag	nosave	SavePoint
+prtg_cas04.gat	mapflag	nosave	SavePoint
+prtg_cas05.gat	mapflag	nosave	SavePoint
+nguild_alde.gat	mapflag	nosave	SavePoint
+nguild_gef.gat	mapflag	nosave	SavePoint
+nguild_pay.gat	mapflag	nosave	SavePoint
+nguild_prt.gat	mapflag	nosave	SavePoint
+
+//Guild Dungeons ==============================
+gld_dun01.gat	mapflag	nosave	SavePoint
+gld_dun02.gat	mapflag	nosave	SavePoint
+gld_dun03.gat	mapflag	nosave	SavePoint
+gld_dun04.gat	mapflag	nosave	SavePoint
+
+//Normal Maps =================================
+yggdrasil01.gat	mapflag	nosave	SavePoint
+thana_boss.gat	mapflag	nosave	SavePoint
diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt
index a6b9fbf18..a3df94568 100644
--- a/conf-tmpl/mapflag/noteleport.txt
+++ b/conf-tmpl/mapflag/noteleport.txt
@@ -1,249 +1,249 @@
-//===== eAthena Script =======================================

-//= Map flags that disable use of fly wings

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.6 [Lupus]

-//===== Notes: ===============================================

-//= For disabling Butterfly wings use noreturn

-//===== Current Version: =====================================

-

-// Cities ========================

-ayo_in01.gat	mapflag	noteleport

-ayo_in02.gat	mapflag	noteleport

-alb_ship.gat	mapflag	noteleport

-alberta_in.gat	mapflag	noteleport

-aldeba_in.gat	mapflag	noteleport

-ama_dun01.gat	mapflag	noteleport

-ama_in01.gat	mapflag	noteleport

-ama_in02.gat	mapflag	noteleport

-ama_test.gat	mapflag	noteleport

-cmd_in01.gat	mapflag	noteleport

-cmd_in02.gat	mapflag	noteleport

-gef_dun03.gat	mapflag	noteleport

-gef_tower.gat	mapflag	noteleport

-geffen_in.gat	mapflag	noteleport

-gon_test.gat	mapflag	noteleport

-gon_in.gat	mapflag	noteleport

-in_orcs01.gat	mapflag	noteleport

-izlude_in.gat	mapflag	noteleport

-jawaii_in.gat	mapflag	noteleport

-lou_in01.gat	mapflag	noteleport

-lou_in02.gat	mapflag	noteleport

-moc_castle.gat	mapflag	noteleport

-morocc_in.gat	mapflag	noteleport

-new_zone01.gat	mapflag	noteleport

-new_zone02.gat	mapflag	noteleport

-new_zone03.gat	mapflag	noteleport

-new_zone04.gat	mapflag	noteleport

-nif_in.gat	mapflag	noteleport

-payon_in01.gat	mapflag	noteleport

-payon_in02.gat	mapflag	noteleport

-payon_in03.gat	mapflag	noteleport

-prt_are_in.gat	mapflag	noteleport

-prt_are01.gat	mapflag	noteleport

-prt_castle.gat	mapflag	noteleport

-prt_church.gat	mapflag	noteleport

-prt_in.gat	mapflag	noteleport

-um_in.gat	mapflag	noteleport

-xmas_in.gat	mapflag	noteleport

-yuno_in01.gat	mapflag	noteleport

-yuno_in02.gat	mapflag	noteleport

-yuno_in03.gat	mapflag	noteleport

-yuno_in04.gat	mapflag	noteleport

-yuno_in05.gat	mapflag	noteleport

-que_sign01.gat	mapflag	noteleport

-que_sign02.gat	mapflag	noteleport

-ein_in01.gat	mapflag	noteleport

-airport.gat	mapflag	noteleport

-airplane.gat	mapflag	noteleport

-airplane_01.gat	mapflag	noteleport

-// New areas

-lighthalzen.gat	mapflag	noteleport

-yuno.gat	mapflag	noteleport

-yuno_pre.gat	mapflag	noteleport

-y_airport.gat	mapflag	noteleport

-lhz_airport.gat	mapflag	noteleport

-einbroch.gat	mapflag	noteleport

-einbech.gat	mapflag	noteleport

-lhz_que01.gat	mapflag	noteleport

-lhz_cube.gat	mapflag	noteleport

-lhz_in01.gat	mapflag	noteleport

-lhz_in02.gat	mapflag	noteleport

-lhz_in03.gat	mapflag	noteleport

-jupe_area1.gat	mapflag	noteleport

-jupe_area2.gat	mapflag	noteleport

-jupe_core.gat	mapflag	noteleport

-jupe_ele.gat	mapflag	noteleport

-jupe_ele_r.gat	mapflag	noteleport

-jupe_gate.gat	mapflag	noteleport

-tha_t07.gat	mapflag	noteleport

-tha_t08.gat	mapflag	noteleport

-tha_t09.gat	mapflag	noteleport

-tha_t10.gat	mapflag	noteleport

-tha_t11.gat	mapflag	noteleport

-tha_t12.gat	mapflag	noteleport

-thana_step.gat	mapflag	noteleport

-hu_in01.gat	mapflag	noteleport

-auction_01.gat	mapflag	noteleport

-auction_02.gat	mapflag	noteleport

-ra_in01.gat	mapflag	noteleport

-ra_temin.gat	mapflag	noteleport

-ra_temsky.gat	mapflag	noteleport

-que_rachel.gat	mapflag	noteleport

-kh_mansion.gat	mapflag	noteleport

-kh_rossi.gat	mapflag	noteleport

-kh_school.gat	mapflag	noteleport

-kh_vila.gat	mapflag	noteleport

-

-// Job Quests ====================

-job_sword1.gat	mapflag	noteleport

-job_thief1.gat	mapflag	noteleport

-// 2-1 -----------------------

-job_prist.gat	mapflag	noteleport

-job_wiz.gat	mapflag	noteleport

-job_hunte.gat	mapflag	noteleport

-in_hunter.gat	mapflag	noteleport

-in_moc_16.gat	mapflag	noteleport

-// 2-2 --------------------

-alde_alche.gat	mapflag	noteleport

-job_cru.gat	mapflag	noteleport

-job_duncer.gat	mapflag	noteleport

-job_monk.gat	mapflag	noteleport

-monk_test.gat	mapflag	noteleport

-monk_in.gat	mapflag	noteleport

-in_rogue.gat	mapflag	noteleport

-job_sage.gat	mapflag	noteleport

-job_star.gat	mapflag	noteleport

-job_soul.gat	mapflag	noteleport

-que_ng.gat	mapflag	noteleport

-

-// Special Quests Places =========

-que_god01.gat	mapflag	noteleport

-que_god02.gat	mapflag	noteleport

-que_bingo.gat	mapflag	noteleport

-que_hugel.gat	mapflag	noteleport

-poring_c01.gat	mapflag	noteleport

-poring_c02.gat	mapflag	noteleport

-

-// Guild Castles =================

-aldeg_cas01.gat	mapflag	noteleport

-aldeg_cas02.gat	mapflag	noteleport

-aldeg_cas03.gat	mapflag	noteleport

-aldeg_cas04.gat	mapflag	noteleport

-aldeg_cas05.gat	mapflag	noteleport

-gefg_cas01.gat	mapflag	noteleport

-gefg_cas02.gat	mapflag	noteleport

-gefg_cas03.gat	mapflag	noteleport

-gefg_cas04.gat	mapflag	noteleport

-gefg_cas05.gat	mapflag	noteleport

-payg_cas01.gat	mapflag	noteleport

-payg_cas02.gat	mapflag	noteleport

-payg_cas03.gat	mapflag	noteleport

-payg_cas04.gat	mapflag	noteleport

-payg_cas05.gat	mapflag	noteleport

-prtg_cas01.gat	mapflag	noteleport

-prtg_cas02.gat	mapflag	noteleport

-prtg_cas03.gat	mapflag	noteleport

-prtg_cas04.gat	mapflag	noteleport

-prtg_cas05.gat	mapflag	noteleport

-nguild_alde.gat	mapflag	noteleport

-nguild_gef.gat	mapflag	noteleport

-nguild_pay.gat	mapflag	noteleport

-nguild_prt.gat	mapflag	noteleport

-

-// GvG Arenas ===================

-guild_vs1.gat	mapflag	noteleport

-guild_vs2.gat	mapflag	noteleport

-guild_vs3.gat	mapflag	noteleport

-guild_vs4.gat	mapflag	noteleport

-guild_vs5.gat	mapflag	noteleport

-

-// Arenas =====================>\\

-arena_room.gat	mapflag	noteleport

-sec_in01.gat	mapflag	noteleport

-sec_in02.gat	mapflag	noteleport

-

-// PvP Arenas=======================

-pvp_y_room.gat	mapflag	noteleport

-pvp_y_1-1.gat	mapflag	noteleport

-pvp_y_1-2.gat	mapflag	noteleport

-pvp_y_1-3.gat	mapflag	noteleport

-pvp_y_1-4.gat	mapflag	noteleport

-pvp_y_1-5.gat	mapflag	noteleport

-pvp_y_2-1.gat	mapflag	noteleport

-pvp_y_2-2.gat	mapflag	noteleport

-pvp_y_2-3.gat	mapflag	noteleport

-pvp_y_2-4.gat	mapflag	noteleport

-pvp_y_2-5.gat	mapflag	noteleport

-pvp_y_3-1.gat	mapflag	noteleport

-pvp_y_3-2.gat	mapflag	noteleport

-pvp_y_3-3.gat	mapflag	noteleport

-pvp_y_3-4.gat	mapflag	noteleport

-pvp_y_3-5.gat	mapflag	noteleport

-pvp_y_4-1.gat	mapflag	noteleport

-pvp_y_4-2.gat	mapflag	noteleport

-pvp_y_4-3.gat	mapflag	noteleport

-pvp_y_4-4.gat	mapflag	noteleport

-pvp_y_4-5.gat	mapflag	noteleport

-pvp_y_5-1.gat	mapflag	noteleport

-pvp_y_5-2.gat	mapflag	noteleport

-pvp_y_5-3.gat	mapflag	noteleport

-pvp_y_5-4.gat	mapflag	noteleport

-pvp_y_5-5.gat	mapflag	noteleport

-pvp_y_6-1.gat	mapflag	noteleport

-pvp_y_6-2.gat	mapflag	noteleport

-pvp_y_6-3.gat	mapflag	noteleport

-pvp_y_6-4.gat	mapflag	noteleport

-pvp_y_6-5.gat	mapflag	noteleport

-pvp_y_7-1.gat	mapflag	noteleport

-pvp_y_7-2.gat	mapflag	noteleport

-pvp_y_7-3.gat	mapflag	noteleport

-pvp_y_7-4.gat	mapflag	noteleport

-pvp_y_7-5.gat	mapflag	noteleport

-pvp_y_8-1.gat	mapflag	noteleport

-pvp_y_8-2.gat	mapflag	noteleport

-pvp_y_8-3.gat	mapflag	noteleport

-pvp_y_8-4.gat	mapflag	noteleport

-pvp_y_8-5.gat	mapflag	noteleport

-pvp_n_room.gat	mapflag	noteleport

-pvp_n_1-1.gat	mapflag	noteleport

-pvp_n_1-2.gat	mapflag	noteleport

-pvp_n_1-3.gat	mapflag	noteleport

-pvp_n_1-4.gat	mapflag	noteleport

-pvp_n_1-5.gat	mapflag	noteleport

-pvp_n_2-1.gat	mapflag	noteleport

-pvp_n_2-2.gat	mapflag	noteleport

-pvp_n_2-3.gat	mapflag	noteleport

-pvp_n_2-4.gat	mapflag	noteleport

-pvp_n_2-5.gat	mapflag	noteleport

-pvp_n_3-1.gat	mapflag	noteleport

-pvp_n_3-2.gat	mapflag	noteleport

-pvp_n_3-3.gat	mapflag	noteleport

-pvp_n_3-4.gat	mapflag	noteleport

-pvp_n_3-5.gat	mapflag	noteleport

-pvp_n_4-1.gat	mapflag	noteleport

-pvp_n_4-2.gat	mapflag	noteleport

-pvp_n_4-3.gat	mapflag	noteleport

-pvp_n_4-4.gat	mapflag	noteleport

-pvp_n_4-5.gat	mapflag	noteleport

-pvp_n_5-1.gat	mapflag	noteleport

-pvp_n_5-2.gat	mapflag	noteleport

-pvp_n_5-3.gat	mapflag	noteleport

-pvp_n_5-4.gat	mapflag	noteleport

-pvp_n_5-5.gat	mapflag	noteleport

-pvp_n_6-1.gat	mapflag	noteleport

-pvp_n_6-2.gat	mapflag	noteleport

-pvp_n_6-3.gat	mapflag	noteleport

-pvp_n_6-4.gat	mapflag	noteleport

-pvp_n_6-5.gat	mapflag	noteleport

-pvp_n_7-1.gat	mapflag	noteleport

-pvp_n_7-2.gat	mapflag	noteleport

-pvp_n_7-3.gat	mapflag	noteleport

-pvp_n_7-4.gat	mapflag	noteleport

-pvp_n_7-5.gat	mapflag	noteleport

-pvp_n_8-1.gat	mapflag	noteleport

-pvp_n_8-2.gat	mapflag	noteleport

-pvp_n_8-3.gat	mapflag	noteleport

-pvp_n_8-4.gat	mapflag	noteleport

-pvp_n_8-5.gat	mapflag	noteleport

-pvp_2vs2.gat	mapflag	noteleport

+//===== eAthena Script =======================================
+//= Map flags that disable use of fly wings
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.6 [Lupus]
+//===== Notes: ===============================================
+//= For disabling Butterfly wings use noreturn
+//===== Current Version: =====================================
+
+// Cities ========================
+ayo_in01.gat	mapflag	noteleport
+ayo_in02.gat	mapflag	noteleport
+alb_ship.gat	mapflag	noteleport
+alberta_in.gat	mapflag	noteleport
+aldeba_in.gat	mapflag	noteleport
+ama_dun01.gat	mapflag	noteleport
+ama_in01.gat	mapflag	noteleport
+ama_in02.gat	mapflag	noteleport
+ama_test.gat	mapflag	noteleport
+cmd_in01.gat	mapflag	noteleport
+cmd_in02.gat	mapflag	noteleport
+gef_dun03.gat	mapflag	noteleport
+gef_tower.gat	mapflag	noteleport
+geffen_in.gat	mapflag	noteleport
+gon_test.gat	mapflag	noteleport
+gon_in.gat	mapflag	noteleport
+in_orcs01.gat	mapflag	noteleport
+izlude_in.gat	mapflag	noteleport
+jawaii_in.gat	mapflag	noteleport
+lou_in01.gat	mapflag	noteleport
+lou_in02.gat	mapflag	noteleport
+moc_castle.gat	mapflag	noteleport
+morocc_in.gat	mapflag	noteleport
+new_zone01.gat	mapflag	noteleport
+new_zone02.gat	mapflag	noteleport
+new_zone03.gat	mapflag	noteleport
+new_zone04.gat	mapflag	noteleport
+nif_in.gat	mapflag	noteleport
+payon_in01.gat	mapflag	noteleport
+payon_in02.gat	mapflag	noteleport
+payon_in03.gat	mapflag	noteleport
+prt_are_in.gat	mapflag	noteleport
+prt_are01.gat	mapflag	noteleport
+prt_castle.gat	mapflag	noteleport
+prt_church.gat	mapflag	noteleport
+prt_in.gat	mapflag	noteleport
+um_in.gat	mapflag	noteleport
+xmas_in.gat	mapflag	noteleport
+yuno_in01.gat	mapflag	noteleport
+yuno_in02.gat	mapflag	noteleport
+yuno_in03.gat	mapflag	noteleport
+yuno_in04.gat	mapflag	noteleport
+yuno_in05.gat	mapflag	noteleport
+que_sign01.gat	mapflag	noteleport
+que_sign02.gat	mapflag	noteleport
+ein_in01.gat	mapflag	noteleport
+airport.gat	mapflag	noteleport
+airplane.gat	mapflag	noteleport
+airplane_01.gat	mapflag	noteleport
+// New areas
+lighthalzen.gat	mapflag	noteleport
+yuno.gat	mapflag	noteleport
+yuno_pre.gat	mapflag	noteleport
+y_airport.gat	mapflag	noteleport
+lhz_airport.gat	mapflag	noteleport
+einbroch.gat	mapflag	noteleport
+einbech.gat	mapflag	noteleport
+lhz_que01.gat	mapflag	noteleport
+lhz_cube.gat	mapflag	noteleport
+lhz_in01.gat	mapflag	noteleport
+lhz_in02.gat	mapflag	noteleport
+lhz_in03.gat	mapflag	noteleport
+jupe_area1.gat	mapflag	noteleport
+jupe_area2.gat	mapflag	noteleport
+jupe_core.gat	mapflag	noteleport
+jupe_ele.gat	mapflag	noteleport
+jupe_ele_r.gat	mapflag	noteleport
+jupe_gate.gat	mapflag	noteleport
+tha_t07.gat	mapflag	noteleport
+tha_t08.gat	mapflag	noteleport
+tha_t09.gat	mapflag	noteleport
+tha_t10.gat	mapflag	noteleport
+tha_t11.gat	mapflag	noteleport
+tha_t12.gat	mapflag	noteleport
+thana_step.gat	mapflag	noteleport
+hu_in01.gat	mapflag	noteleport
+auction_01.gat	mapflag	noteleport
+auction_02.gat	mapflag	noteleport
+ra_in01.gat	mapflag	noteleport
+ra_temin.gat	mapflag	noteleport
+ra_temsky.gat	mapflag	noteleport
+que_rachel.gat	mapflag	noteleport
+kh_mansion.gat	mapflag	noteleport
+kh_rossi.gat	mapflag	noteleport
+kh_school.gat	mapflag	noteleport
+kh_vila.gat	mapflag	noteleport
+
+// Job Quests ====================
+job_sword1.gat	mapflag	noteleport
+job_thief1.gat	mapflag	noteleport
+// 2-1 -----------------------
+job_prist.gat	mapflag	noteleport
+job_wiz.gat	mapflag	noteleport
+job_hunte.gat	mapflag	noteleport
+in_hunter.gat	mapflag	noteleport
+in_moc_16.gat	mapflag	noteleport
+// 2-2 --------------------
+alde_alche.gat	mapflag	noteleport
+job_cru.gat	mapflag	noteleport
+job_duncer.gat	mapflag	noteleport
+job_monk.gat	mapflag	noteleport
+monk_test.gat	mapflag	noteleport
+monk_in.gat	mapflag	noteleport
+in_rogue.gat	mapflag	noteleport
+job_sage.gat	mapflag	noteleport
+job_star.gat	mapflag	noteleport
+job_soul.gat	mapflag	noteleport
+que_ng.gat	mapflag	noteleport
+
+// Special Quests Places =========
+que_god01.gat	mapflag	noteleport
+que_god02.gat	mapflag	noteleport
+que_bingo.gat	mapflag	noteleport
+que_hugel.gat	mapflag	noteleport
+poring_c01.gat	mapflag	noteleport
+poring_c02.gat	mapflag	noteleport
+
+// Guild Castles =================
+aldeg_cas01.gat	mapflag	noteleport
+aldeg_cas02.gat	mapflag	noteleport
+aldeg_cas03.gat	mapflag	noteleport
+aldeg_cas04.gat	mapflag	noteleport
+aldeg_cas05.gat	mapflag	noteleport
+gefg_cas01.gat	mapflag	noteleport
+gefg_cas02.gat	mapflag	noteleport
+gefg_cas03.gat	mapflag	noteleport
+gefg_cas04.gat	mapflag	noteleport
+gefg_cas05.gat	mapflag	noteleport
+payg_cas01.gat	mapflag	noteleport
+payg_cas02.gat	mapflag	noteleport
+payg_cas03.gat	mapflag	noteleport
+payg_cas04.gat	mapflag	noteleport
+payg_cas05.gat	mapflag	noteleport
+prtg_cas01.gat	mapflag	noteleport
+prtg_cas02.gat	mapflag	noteleport
+prtg_cas03.gat	mapflag	noteleport
+prtg_cas04.gat	mapflag	noteleport
+prtg_cas05.gat	mapflag	noteleport
+nguild_alde.gat	mapflag	noteleport
+nguild_gef.gat	mapflag	noteleport
+nguild_pay.gat	mapflag	noteleport
+nguild_prt.gat	mapflag	noteleport
+
+// GvG Arenas ===================
+guild_vs1.gat	mapflag	noteleport
+guild_vs2.gat	mapflag	noteleport
+guild_vs3.gat	mapflag	noteleport
+guild_vs4.gat	mapflag	noteleport
+guild_vs5.gat	mapflag	noteleport
+
+// Arenas =====================>\\
+arena_room.gat	mapflag	noteleport
+sec_in01.gat	mapflag	noteleport
+sec_in02.gat	mapflag	noteleport
+
+// PvP Arenas=======================
+pvp_y_room.gat	mapflag	noteleport
+pvp_y_1-1.gat	mapflag	noteleport
+pvp_y_1-2.gat	mapflag	noteleport
+pvp_y_1-3.gat	mapflag	noteleport
+pvp_y_1-4.gat	mapflag	noteleport
+pvp_y_1-5.gat	mapflag	noteleport
+pvp_y_2-1.gat	mapflag	noteleport
+pvp_y_2-2.gat	mapflag	noteleport
+pvp_y_2-3.gat	mapflag	noteleport
+pvp_y_2-4.gat	mapflag	noteleport
+pvp_y_2-5.gat	mapflag	noteleport
+pvp_y_3-1.gat	mapflag	noteleport
+pvp_y_3-2.gat	mapflag	noteleport
+pvp_y_3-3.gat	mapflag	noteleport
+pvp_y_3-4.gat	mapflag	noteleport
+pvp_y_3-5.gat	mapflag	noteleport
+pvp_y_4-1.gat	mapflag	noteleport
+pvp_y_4-2.gat	mapflag	noteleport
+pvp_y_4-3.gat	mapflag	noteleport
+pvp_y_4-4.gat	mapflag	noteleport
+pvp_y_4-5.gat	mapflag	noteleport
+pvp_y_5-1.gat	mapflag	noteleport
+pvp_y_5-2.gat	mapflag	noteleport
+pvp_y_5-3.gat	mapflag	noteleport
+pvp_y_5-4.gat	mapflag	noteleport
+pvp_y_5-5.gat	mapflag	noteleport
+pvp_y_6-1.gat	mapflag	noteleport
+pvp_y_6-2.gat	mapflag	noteleport
+pvp_y_6-3.gat	mapflag	noteleport
+pvp_y_6-4.gat	mapflag	noteleport
+pvp_y_6-5.gat	mapflag	noteleport
+pvp_y_7-1.gat	mapflag	noteleport
+pvp_y_7-2.gat	mapflag	noteleport
+pvp_y_7-3.gat	mapflag	noteleport
+pvp_y_7-4.gat	mapflag	noteleport
+pvp_y_7-5.gat	mapflag	noteleport
+pvp_y_8-1.gat	mapflag	noteleport
+pvp_y_8-2.gat	mapflag	noteleport
+pvp_y_8-3.gat	mapflag	noteleport
+pvp_y_8-4.gat	mapflag	noteleport
+pvp_y_8-5.gat	mapflag	noteleport
+pvp_n_room.gat	mapflag	noteleport
+pvp_n_1-1.gat	mapflag	noteleport
+pvp_n_1-2.gat	mapflag	noteleport
+pvp_n_1-3.gat	mapflag	noteleport
+pvp_n_1-4.gat	mapflag	noteleport
+pvp_n_1-5.gat	mapflag	noteleport
+pvp_n_2-1.gat	mapflag	noteleport
+pvp_n_2-2.gat	mapflag	noteleport
+pvp_n_2-3.gat	mapflag	noteleport
+pvp_n_2-4.gat	mapflag	noteleport
+pvp_n_2-5.gat	mapflag	noteleport
+pvp_n_3-1.gat	mapflag	noteleport
+pvp_n_3-2.gat	mapflag	noteleport
+pvp_n_3-3.gat	mapflag	noteleport
+pvp_n_3-4.gat	mapflag	noteleport
+pvp_n_3-5.gat	mapflag	noteleport
+pvp_n_4-1.gat	mapflag	noteleport
+pvp_n_4-2.gat	mapflag	noteleport
+pvp_n_4-3.gat	mapflag	noteleport
+pvp_n_4-4.gat	mapflag	noteleport
+pvp_n_4-5.gat	mapflag	noteleport
+pvp_n_5-1.gat	mapflag	noteleport
+pvp_n_5-2.gat	mapflag	noteleport
+pvp_n_5-3.gat	mapflag	noteleport
+pvp_n_5-4.gat	mapflag	noteleport
+pvp_n_5-5.gat	mapflag	noteleport
+pvp_n_6-1.gat	mapflag	noteleport
+pvp_n_6-2.gat	mapflag	noteleport
+pvp_n_6-3.gat	mapflag	noteleport
+pvp_n_6-4.gat	mapflag	noteleport
+pvp_n_6-5.gat	mapflag	noteleport
+pvp_n_7-1.gat	mapflag	noteleport
+pvp_n_7-2.gat	mapflag	noteleport
+pvp_n_7-3.gat	mapflag	noteleport
+pvp_n_7-4.gat	mapflag	noteleport
+pvp_n_7-5.gat	mapflag	noteleport
+pvp_n_8-1.gat	mapflag	noteleport
+pvp_n_8-2.gat	mapflag	noteleport
+pvp_n_8-3.gat	mapflag	noteleport
+pvp_n_8-4.gat	mapflag	noteleport
+pvp_n_8-5.gat	mapflag	noteleport
+pvp_2vs2.gat	mapflag	noteleport
diff --git a/conf-tmpl/mapflag/nowarp.txt b/conf-tmpl/mapflag/nowarp.txt
index 62dd7b29c..0c841b1de 100644
--- a/conf-tmpl/mapflag/nowarp.txt
+++ b/conf-tmpl/mapflag/nowarp.txt
@@ -1,37 +1,37 @@
-//===== eAthena Script =======================================

-//= Map flags that disable warp

-//===== By: ==================================================

-//= eAthena Dev Team

-//= v 1.2

-//===== Current Version: =====================================

-

-// Special Quests Places =====

-ama_test.gat	mapflag	nowarp

-gon_test.gat	mapflag	nowarp

-

-// Guild Castles =============

-aldeg_cas01.gat	mapflag	nowarp

-aldeg_cas02.gat	mapflag	nowarp

-aldeg_cas03.gat	mapflag	nowarp

-aldeg_cas04.gat	mapflag	nowarp

-aldeg_cas05.gat	mapflag	nowarp

-gefg_cas01.gat	mapflag	nowarp

-gefg_cas02.gat	mapflag	nowarp

-gefg_cas03.gat	mapflag	nowarp

-gefg_cas04.gat	mapflag	nowarp

-gefg_cas05.gat	mapflag	nowarp

-payg_cas01.gat	mapflag	nowarp

-payg_cas02.gat	mapflag	nowarp

-payg_cas03.gat	mapflag	nowarp

-payg_cas04.gat	mapflag	nowarp

-payg_cas05.gat	mapflag	nowarp

-prtg_cas01.gat	mapflag	nowarp

-prtg_cas02.gat	mapflag	nowarp

-prtg_cas03.gat	mapflag	nowarp

-prtg_cas04.gat	mapflag	nowarp

-prtg_cas05.gat	mapflag	nowarp

-n_castle.gat	mapflag	nowarp

-nguild_alde.gat	mapflag	nowarp

-nguild_gef.gat	mapflag	nowarp

-nguild_pay.gat	mapflag	nowarp

-nguild_prt.gat	mapflag	nowarp

+//===== eAthena Script =======================================
+//= Map flags that disable warp
+//===== By: ==================================================
+//= eAthena Dev Team
+//= v 1.2
+//===== Current Version: =====================================
+
+// Special Quests Places =====
+ama_test.gat	mapflag	nowarp
+gon_test.gat	mapflag	nowarp
+
+// Guild Castles =============
+aldeg_cas01.gat	mapflag	nowarp
+aldeg_cas02.gat	mapflag	nowarp
+aldeg_cas03.gat	mapflag	nowarp
+aldeg_cas04.gat	mapflag	nowarp
+aldeg_cas05.gat	mapflag	nowarp
+gefg_cas01.gat	mapflag	nowarp
+gefg_cas02.gat	mapflag	nowarp
+gefg_cas03.gat	mapflag	nowarp
+gefg_cas04.gat	mapflag	nowarp
+gefg_cas05.gat	mapflag	nowarp
+payg_cas01.gat	mapflag	nowarp
+payg_cas02.gat	mapflag	nowarp
+payg_cas03.gat	mapflag	nowarp
+payg_cas04.gat	mapflag	nowarp
+payg_cas05.gat	mapflag	nowarp
+prtg_cas01.gat	mapflag	nowarp
+prtg_cas02.gat	mapflag	nowarp
+prtg_cas03.gat	mapflag	nowarp
+prtg_cas04.gat	mapflag	nowarp
+prtg_cas05.gat	mapflag	nowarp
+n_castle.gat	mapflag	nowarp
+nguild_alde.gat	mapflag	nowarp
+nguild_gef.gat	mapflag	nowarp
+nguild_pay.gat	mapflag	nowarp
+nguild_prt.gat	mapflag	nowarp
diff --git a/conf-tmpl/mapflag/nowarpto.txt b/conf-tmpl/mapflag/nowarpto.txt
index 955f931eb..90ed5a70b 100644
--- a/conf-tmpl/mapflag/nowarpto.txt
+++ b/conf-tmpl/mapflag/nowarpto.txt
@@ -1,42 +1,42 @@
-//===== eAthena Script =======================================

-//= Map flags that disable warpto

-//===== By: ==================================================

-//= eAthena Dev Team

-//= v 1.3

-//===== Current Version: =====================================

-

-// Guild Castles ========================

-//alde_gld.gat	mapflag	nowarpto

-aldeg_cas01.gat	mapflag	nowarpto

-aldeg_cas02.gat	mapflag	nowarpto

-aldeg_cas03.gat	mapflag	nowarpto

-aldeg_cas04.gat	mapflag	nowarpto

-aldeg_cas05.gat	mapflag	nowarpto

-gefg_cas01.gat	mapflag	nowarpto

-gefg_cas02.gat	mapflag	nowarpto

-gefg_cas03.gat	mapflag	nowarpto

-gefg_cas04.gat	mapflag	nowarpto

-gefg_cas05.gat	mapflag	nowarpto

-//pay_gld.gat	mapflag	nowarpto

-payg_cas01.gat	mapflag	nowarpto

-payg_cas02.gat	mapflag	nowarpto

-payg_cas03.gat	mapflag	nowarpto

-payg_cas04.gat	mapflag	nowarpto

-payg_cas05.gat	mapflag	nowarpto

-//prt_gld.gat	mapflag	nowarpto

-prtg_cas01.gat	mapflag	nowarpto

-prtg_cas02.gat	mapflag	nowarpto

-prtg_cas03.gat	mapflag	nowarpto

-prtg_cas04.gat	mapflag	nowarpto

-prtg_cas05.gat	mapflag	nowarpto

-//Novice Guild

-n_castle.gat	mapflag	nowarpto

-nguild_alde.gat	mapflag	nowarpto

-nguild_gef.gat	mapflag	nowarpto

-nguild_pay.gat	mapflag	nowarpto

-nguild_prt.gat	mapflag	nowarpto

-//Lighthalzen Bio-Lab 3F

-lhz_dun03.gat	mapflag	nowarpto

-// Special Quests Places =======

-ama_test.gat	mapflag	nowarpto

+//===== eAthena Script =======================================
+//= Map flags that disable warpto
+//===== By: ==================================================
+//= eAthena Dev Team
+//= v 1.3
+//===== Current Version: =====================================
+
+// Guild Castles ========================
+//alde_gld.gat	mapflag	nowarpto
+aldeg_cas01.gat	mapflag	nowarpto
+aldeg_cas02.gat	mapflag	nowarpto
+aldeg_cas03.gat	mapflag	nowarpto
+aldeg_cas04.gat	mapflag	nowarpto
+aldeg_cas05.gat	mapflag	nowarpto
+gefg_cas01.gat	mapflag	nowarpto
+gefg_cas02.gat	mapflag	nowarpto
+gefg_cas03.gat	mapflag	nowarpto
+gefg_cas04.gat	mapflag	nowarpto
+gefg_cas05.gat	mapflag	nowarpto
+//pay_gld.gat	mapflag	nowarpto
+payg_cas01.gat	mapflag	nowarpto
+payg_cas02.gat	mapflag	nowarpto
+payg_cas03.gat	mapflag	nowarpto
+payg_cas04.gat	mapflag	nowarpto
+payg_cas05.gat	mapflag	nowarpto
+//prt_gld.gat	mapflag	nowarpto
+prtg_cas01.gat	mapflag	nowarpto
+prtg_cas02.gat	mapflag	nowarpto
+prtg_cas03.gat	mapflag	nowarpto
+prtg_cas04.gat	mapflag	nowarpto
+prtg_cas05.gat	mapflag	nowarpto
+//Novice Guild
+n_castle.gat	mapflag	nowarpto
+nguild_alde.gat	mapflag	nowarpto
+nguild_gef.gat	mapflag	nowarpto
+nguild_pay.gat	mapflag	nowarpto
+nguild_prt.gat	mapflag	nowarpto
+//Lighthalzen Bio-Lab 3F
+lhz_dun03.gat	mapflag	nowarpto
+// Special Quests Places =======
+ama_test.gat	mapflag	nowarpto
 gon_test.gat	mapflag	nowarpto
\ No newline at end of file
diff --git a/conf-tmpl/mapflag/pvp.txt b/conf-tmpl/mapflag/pvp.txt
index 4f1c34730..cf25c8e50 100644
--- a/conf-tmpl/mapflag/pvp.txt
+++ b/conf-tmpl/mapflag/pvp.txt
@@ -1,94 +1,94 @@
-//===== eAthena Script =======================================

-//= Map flags that enable pvp

-//===== By: ==================================================

-//= eAthena Dev Team

-//===== Current Version: =====================================

-//= 1.0

-//===== Description: =========================================

-//= pvp: Turns on PvP mode

-//===== Additional Comments: =================================

-//=

-//============================================================

-

-// PvP ========================

-pvp_y_1-1.gat	mapflag	pvp

-pvp_y_1-2.gat	mapflag	pvp

-pvp_y_1-3.gat	mapflag	pvp

-pvp_y_1-4.gat	mapflag	pvp

-pvp_y_1-5.gat	mapflag	pvp

-pvp_y_2-1.gat	mapflag	pvp

-pvp_y_2-2.gat	mapflag	pvp

-pvp_y_2-3.gat	mapflag	pvp

-pvp_y_2-4.gat	mapflag	pvp

-pvp_y_2-5.gat	mapflag	pvp

-pvp_y_3-1.gat	mapflag	pvp

-pvp_y_3-2.gat	mapflag	pvp

-pvp_y_3-3.gat	mapflag	pvp

-pvp_y_3-4.gat	mapflag	pvp

-pvp_y_3-5.gat	mapflag	pvp

-pvp_y_4-1.gat	mapflag	pvp

-pvp_y_4-2.gat	mapflag	pvp

-pvp_y_4-3.gat	mapflag	pvp

-pvp_y_4-4.gat	mapflag	pvp

-pvp_y_4-5.gat	mapflag	pvp

-pvp_y_5-1.gat	mapflag	pvp

-pvp_y_5-2.gat	mapflag	pvp

-pvp_y_5-3.gat	mapflag	pvp

-pvp_y_5-4.gat	mapflag	pvp

-pvp_y_5-5.gat	mapflag	pvp

-pvp_y_6-1.gat	mapflag	pvp

-pvp_y_6-2.gat	mapflag	pvp

-pvp_y_6-3.gat	mapflag	pvp

-pvp_y_6-4.gat	mapflag	pvp

-pvp_y_6-5.gat	mapflag	pvp

-pvp_y_7-1.gat	mapflag	pvp

-pvp_y_7-2.gat	mapflag	pvp

-pvp_y_7-3.gat	mapflag	pvp

-pvp_y_7-4.gat	mapflag	pvp

-pvp_y_7-5.gat	mapflag	pvp

-pvp_y_8-1.gat	mapflag	pvp

-pvp_y_8-2.gat	mapflag	pvp

-pvp_y_8-3.gat	mapflag	pvp

-pvp_y_8-4.gat	mapflag	pvp

-pvp_y_8-5.gat	mapflag	pvp

-pvp_n_1-1.gat	mapflag	pvp

-pvp_n_1-2.gat	mapflag	pvp

-pvp_n_1-3.gat	mapflag	pvp

-pvp_n_1-4.gat	mapflag	pvp

-pvp_n_1-5.gat	mapflag	pvp

-pvp_n_2-1.gat	mapflag	pvp

-pvp_n_2-2.gat	mapflag	pvp

-pvp_n_2-3.gat	mapflag	pvp

-pvp_n_2-4.gat	mapflag	pvp

-pvp_n_2-5.gat	mapflag	pvp

-pvp_n_3-1.gat	mapflag	pvp

-pvp_n_3-2.gat	mapflag	pvp

-pvp_n_3-3.gat	mapflag	pvp

-pvp_n_3-4.gat	mapflag	pvp

-pvp_n_3-5.gat	mapflag	pvp

-pvp_n_4-1.gat	mapflag	pvp

-pvp_n_4-2.gat	mapflag	pvp

-pvp_n_4-3.gat	mapflag	pvp

-pvp_n_4-4.gat	mapflag	pvp

-pvp_n_4-5.gat	mapflag	pvp

-pvp_n_5-1.gat	mapflag	pvp

-pvp_n_5-2.gat	mapflag	pvp

-pvp_n_5-3.gat	mapflag	pvp

-pvp_n_5-4.gat	mapflag	pvp

-pvp_n_5-5.gat	mapflag	pvp

-pvp_n_6-1.gat	mapflag	pvp

-pvp_n_6-2.gat	mapflag	pvp

-pvp_n_6-3.gat	mapflag	pvp

-pvp_n_6-4.gat	mapflag	pvp

-pvp_n_6-5.gat	mapflag	pvp

-pvp_n_7-1.gat	mapflag	pvp

-pvp_n_7-2.gat	mapflag	pvp

-pvp_n_7-3.gat	mapflag	pvp

-pvp_n_7-4.gat	mapflag	pvp

-pvp_n_7-5.gat	mapflag	pvp

-pvp_n_8-1.gat	mapflag	pvp

-pvp_n_8-2.gat	mapflag	pvp

-pvp_n_8-3.gat	mapflag	pvp

-pvp_n_8-4.gat	mapflag	pvp

-pvp_n_8-5.gat	mapflag	pvp

-pvp_2vs2.gat	mapflag	pvp

+//===== eAthena Script =======================================
+//= Map flags that enable pvp
+//===== By: ==================================================
+//= eAthena Dev Team
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= pvp: Turns on PvP mode
+//===== Additional Comments: =================================
+//=
+//============================================================
+
+// PvP ========================
+pvp_y_1-1.gat	mapflag	pvp
+pvp_y_1-2.gat	mapflag	pvp
+pvp_y_1-3.gat	mapflag	pvp
+pvp_y_1-4.gat	mapflag	pvp
+pvp_y_1-5.gat	mapflag	pvp
+pvp_y_2-1.gat	mapflag	pvp
+pvp_y_2-2.gat	mapflag	pvp
+pvp_y_2-3.gat	mapflag	pvp
+pvp_y_2-4.gat	mapflag	pvp
+pvp_y_2-5.gat	mapflag	pvp
+pvp_y_3-1.gat	mapflag	pvp
+pvp_y_3-2.gat	mapflag	pvp
+pvp_y_3-3.gat	mapflag	pvp
+pvp_y_3-4.gat	mapflag	pvp
+pvp_y_3-5.gat	mapflag	pvp
+pvp_y_4-1.gat	mapflag	pvp
+pvp_y_4-2.gat	mapflag	pvp
+pvp_y_4-3.gat	mapflag	pvp
+pvp_y_4-4.gat	mapflag	pvp
+pvp_y_4-5.gat	mapflag	pvp
+pvp_y_5-1.gat	mapflag	pvp
+pvp_y_5-2.gat	mapflag	pvp
+pvp_y_5-3.gat	mapflag	pvp
+pvp_y_5-4.gat	mapflag	pvp
+pvp_y_5-5.gat	mapflag	pvp
+pvp_y_6-1.gat	mapflag	pvp
+pvp_y_6-2.gat	mapflag	pvp
+pvp_y_6-3.gat	mapflag	pvp
+pvp_y_6-4.gat	mapflag	pvp
+pvp_y_6-5.gat	mapflag	pvp
+pvp_y_7-1.gat	mapflag	pvp
+pvp_y_7-2.gat	mapflag	pvp
+pvp_y_7-3.gat	mapflag	pvp
+pvp_y_7-4.gat	mapflag	pvp
+pvp_y_7-5.gat	mapflag	pvp
+pvp_y_8-1.gat	mapflag	pvp
+pvp_y_8-2.gat	mapflag	pvp
+pvp_y_8-3.gat	mapflag	pvp
+pvp_y_8-4.gat	mapflag	pvp
+pvp_y_8-5.gat	mapflag	pvp
+pvp_n_1-1.gat	mapflag	pvp
+pvp_n_1-2.gat	mapflag	pvp
+pvp_n_1-3.gat	mapflag	pvp
+pvp_n_1-4.gat	mapflag	pvp
+pvp_n_1-5.gat	mapflag	pvp
+pvp_n_2-1.gat	mapflag	pvp
+pvp_n_2-2.gat	mapflag	pvp
+pvp_n_2-3.gat	mapflag	pvp
+pvp_n_2-4.gat	mapflag	pvp
+pvp_n_2-5.gat	mapflag	pvp
+pvp_n_3-1.gat	mapflag	pvp
+pvp_n_3-2.gat	mapflag	pvp
+pvp_n_3-3.gat	mapflag	pvp
+pvp_n_3-4.gat	mapflag	pvp
+pvp_n_3-5.gat	mapflag	pvp
+pvp_n_4-1.gat	mapflag	pvp
+pvp_n_4-2.gat	mapflag	pvp
+pvp_n_4-3.gat	mapflag	pvp
+pvp_n_4-4.gat	mapflag	pvp
+pvp_n_4-5.gat	mapflag	pvp
+pvp_n_5-1.gat	mapflag	pvp
+pvp_n_5-2.gat	mapflag	pvp
+pvp_n_5-3.gat	mapflag	pvp
+pvp_n_5-4.gat	mapflag	pvp
+pvp_n_5-5.gat	mapflag	pvp
+pvp_n_6-1.gat	mapflag	pvp
+pvp_n_6-2.gat	mapflag	pvp
+pvp_n_6-3.gat	mapflag	pvp
+pvp_n_6-4.gat	mapflag	pvp
+pvp_n_6-5.gat	mapflag	pvp
+pvp_n_7-1.gat	mapflag	pvp
+pvp_n_7-2.gat	mapflag	pvp
+pvp_n_7-3.gat	mapflag	pvp
+pvp_n_7-4.gat	mapflag	pvp
+pvp_n_7-5.gat	mapflag	pvp
+pvp_n_8-1.gat	mapflag	pvp
+pvp_n_8-2.gat	mapflag	pvp
+pvp_n_8-3.gat	mapflag	pvp
+pvp_n_8-4.gat	mapflag	pvp
+pvp_n_8-5.gat	mapflag	pvp
+pvp_2vs2.gat	mapflag	pvp
diff --git a/conf-tmpl/mapflag/pvp_noguild.txt b/conf-tmpl/mapflag/pvp_noguild.txt
index f05f7b845..8c3167440 100644
--- a/conf-tmpl/mapflag/pvp_noguild.txt
+++ b/conf-tmpl/mapflag/pvp_noguild.txt
@@ -1,89 +1,89 @@
-//===== eAthena Script =======================================

-//= Map flags that disable guilds on pvp grounds. 

-//===== By: ==================================================

-//= eAthena Dev Team

-//= v 1.1

-//===== Current Version: =====================================

-

-// PvP Arenas =================

-pvp_y_1-1.gat	mapflag	pvp_noguild

-pvp_y_1-2.gat	mapflag	pvp_noguild

-pvp_y_1-3.gat	mapflag	pvp_noguild

-pvp_y_1-4.gat	mapflag	pvp_noguild

-pvp_y_1-5.gat	mapflag	pvp_noguild

-pvp_y_2-1.gat	mapflag	pvp_noguild

-pvp_y_2-2.gat	mapflag	pvp_noguild

-pvp_y_2-3.gat	mapflag	pvp_noguild

-pvp_y_2-4.gat	mapflag	pvp_noguild

-pvp_y_2-5.gat	mapflag	pvp_noguild

-pvp_y_3-1.gat	mapflag	pvp_noguild

-pvp_y_3-2.gat	mapflag	pvp_noguild

-pvp_y_3-3.gat	mapflag	pvp_noguild

-pvp_y_3-4.gat	mapflag	pvp_noguild

-pvp_y_3-5.gat	mapflag	pvp_noguild

-pvp_y_4-1.gat	mapflag	pvp_noguild

-pvp_y_4-2.gat	mapflag	pvp_noguild

-pvp_y_4-3.gat	mapflag	pvp_noguild

-pvp_y_4-4.gat	mapflag	pvp_noguild

-pvp_y_4-5.gat	mapflag	pvp_noguild

-pvp_y_5-1.gat	mapflag	pvp_noguild

-pvp_y_5-2.gat	mapflag	pvp_noguild

-pvp_y_5-3.gat	mapflag	pvp_noguild

-pvp_y_5-4.gat	mapflag	pvp_noguild

-pvp_y_5-5.gat	mapflag	pvp_noguild

-pvp_y_6-1.gat	mapflag	pvp_noguild

-pvp_y_6-2.gat	mapflag	pvp_noguild

-pvp_y_6-3.gat	mapflag	pvp_noguild

-pvp_y_6-4.gat	mapflag	pvp_noguild

-pvp_y_6-5.gat	mapflag	pvp_noguild

-pvp_y_7-1.gat	mapflag	pvp_noguild

-pvp_y_7-2.gat	mapflag	pvp_noguild

-pvp_y_7-3.gat	mapflag	pvp_noguild

-pvp_y_7-4.gat	mapflag	pvp_noguild

-pvp_y_7-5.gat	mapflag	pvp_noguild

-pvp_y_8-1.gat	mapflag	pvp_noguild

-pvp_y_8-2.gat	mapflag	pvp_noguild

-pvp_y_8-3.gat	mapflag	pvp_noguild

-pvp_y_8-4.gat	mapflag	pvp_noguild

-pvp_y_8-5.gat	mapflag	pvp_noguild

-pvp_n_1-1.gat	mapflag	pvp_noguild

-pvp_n_1-2.gat	mapflag	pvp_noguild

-pvp_n_1-3.gat	mapflag	pvp_noguild

-pvp_n_1-4.gat	mapflag	pvp_noguild

-pvp_n_1-5.gat	mapflag	pvp_noguild

-pvp_n_2-1.gat	mapflag	pvp_noguild

-pvp_n_2-2.gat	mapflag	pvp_noguild

-pvp_n_2-3.gat	mapflag	pvp_noguild

-pvp_n_2-4.gat	mapflag	pvp_noguild

-pvp_n_2-5.gat	mapflag	pvp_noguild

-pvp_n_3-1.gat	mapflag	pvp_noguild

-pvp_n_3-2.gat	mapflag	pvp_noguild

-pvp_n_3-3.gat	mapflag	pvp_noguild

-pvp_n_3-4.gat	mapflag	pvp_noguild

-pvp_n_3-5.gat	mapflag	pvp_noguild

-pvp_n_4-1.gat	mapflag	pvp_noguild

-pvp_n_4-2.gat	mapflag	pvp_noguild

-pvp_n_4-3.gat	mapflag	pvp_noguild

-pvp_n_4-4.gat	mapflag	pvp_noguild

-pvp_n_4-5.gat	mapflag	pvp_noguild

-pvp_n_5-1.gat	mapflag	pvp_noguild

-pvp_n_5-2.gat	mapflag	pvp_noguild

-pvp_n_5-3.gat	mapflag	pvp_noguild

-pvp_n_5-4.gat	mapflag	pvp_noguild

-pvp_n_5-5.gat	mapflag	pvp_noguild

-pvp_n_6-1.gat	mapflag	pvp_noguild

-pvp_n_6-2.gat	mapflag	pvp_noguild

-pvp_n_6-3.gat	mapflag	pvp_noguild

-pvp_n_6-4.gat	mapflag	pvp_noguild

-pvp_n_6-5.gat	mapflag	pvp_noguild

-pvp_n_7-1.gat	mapflag	pvp_noguild

-pvp_n_7-2.gat	mapflag	pvp_noguild

-pvp_n_7-3.gat	mapflag	pvp_noguild

-pvp_n_7-4.gat	mapflag	pvp_noguild

-pvp_n_7-5.gat	mapflag	pvp_noguild

-pvp_n_8-1.gat	mapflag	pvp_noguild

-pvp_n_8-2.gat	mapflag	pvp_noguild

-pvp_n_8-3.gat	mapflag	pvp_noguild

-pvp_n_8-4.gat	mapflag	pvp_noguild

-pvp_n_8-5.gat	mapflag	pvp_noguild

-pvp_2vs2.gat	mapflag	pvp_noguild

+//===== eAthena Script =======================================
+//= Map flags that disable guilds on pvp grounds. 
+//===== By: ==================================================
+//= eAthena Dev Team
+//= v 1.1
+//===== Current Version: =====================================
+
+// PvP Arenas =================
+pvp_y_1-1.gat	mapflag	pvp_noguild
+pvp_y_1-2.gat	mapflag	pvp_noguild
+pvp_y_1-3.gat	mapflag	pvp_noguild
+pvp_y_1-4.gat	mapflag	pvp_noguild
+pvp_y_1-5.gat	mapflag	pvp_noguild
+pvp_y_2-1.gat	mapflag	pvp_noguild
+pvp_y_2-2.gat	mapflag	pvp_noguild
+pvp_y_2-3.gat	mapflag	pvp_noguild
+pvp_y_2-4.gat	mapflag	pvp_noguild
+pvp_y_2-5.gat	mapflag	pvp_noguild
+pvp_y_3-1.gat	mapflag	pvp_noguild
+pvp_y_3-2.gat	mapflag	pvp_noguild
+pvp_y_3-3.gat	mapflag	pvp_noguild
+pvp_y_3-4.gat	mapflag	pvp_noguild
+pvp_y_3-5.gat	mapflag	pvp_noguild
+pvp_y_4-1.gat	mapflag	pvp_noguild
+pvp_y_4-2.gat	mapflag	pvp_noguild
+pvp_y_4-3.gat	mapflag	pvp_noguild
+pvp_y_4-4.gat	mapflag	pvp_noguild
+pvp_y_4-5.gat	mapflag	pvp_noguild
+pvp_y_5-1.gat	mapflag	pvp_noguild
+pvp_y_5-2.gat	mapflag	pvp_noguild
+pvp_y_5-3.gat	mapflag	pvp_noguild
+pvp_y_5-4.gat	mapflag	pvp_noguild
+pvp_y_5-5.gat	mapflag	pvp_noguild
+pvp_y_6-1.gat	mapflag	pvp_noguild
+pvp_y_6-2.gat	mapflag	pvp_noguild
+pvp_y_6-3.gat	mapflag	pvp_noguild
+pvp_y_6-4.gat	mapflag	pvp_noguild
+pvp_y_6-5.gat	mapflag	pvp_noguild
+pvp_y_7-1.gat	mapflag	pvp_noguild
+pvp_y_7-2.gat	mapflag	pvp_noguild
+pvp_y_7-3.gat	mapflag	pvp_noguild
+pvp_y_7-4.gat	mapflag	pvp_noguild
+pvp_y_7-5.gat	mapflag	pvp_noguild
+pvp_y_8-1.gat	mapflag	pvp_noguild
+pvp_y_8-2.gat	mapflag	pvp_noguild
+pvp_y_8-3.gat	mapflag	pvp_noguild
+pvp_y_8-4.gat	mapflag	pvp_noguild
+pvp_y_8-5.gat	mapflag	pvp_noguild
+pvp_n_1-1.gat	mapflag	pvp_noguild
+pvp_n_1-2.gat	mapflag	pvp_noguild
+pvp_n_1-3.gat	mapflag	pvp_noguild
+pvp_n_1-4.gat	mapflag	pvp_noguild
+pvp_n_1-5.gat	mapflag	pvp_noguild
+pvp_n_2-1.gat	mapflag	pvp_noguild
+pvp_n_2-2.gat	mapflag	pvp_noguild
+pvp_n_2-3.gat	mapflag	pvp_noguild
+pvp_n_2-4.gat	mapflag	pvp_noguild
+pvp_n_2-5.gat	mapflag	pvp_noguild
+pvp_n_3-1.gat	mapflag	pvp_noguild
+pvp_n_3-2.gat	mapflag	pvp_noguild
+pvp_n_3-3.gat	mapflag	pvp_noguild
+pvp_n_3-4.gat	mapflag	pvp_noguild
+pvp_n_3-5.gat	mapflag	pvp_noguild
+pvp_n_4-1.gat	mapflag	pvp_noguild
+pvp_n_4-2.gat	mapflag	pvp_noguild
+pvp_n_4-3.gat	mapflag	pvp_noguild
+pvp_n_4-4.gat	mapflag	pvp_noguild
+pvp_n_4-5.gat	mapflag	pvp_noguild
+pvp_n_5-1.gat	mapflag	pvp_noguild
+pvp_n_5-2.gat	mapflag	pvp_noguild
+pvp_n_5-3.gat	mapflag	pvp_noguild
+pvp_n_5-4.gat	mapflag	pvp_noguild
+pvp_n_5-5.gat	mapflag	pvp_noguild
+pvp_n_6-1.gat	mapflag	pvp_noguild
+pvp_n_6-2.gat	mapflag	pvp_noguild
+pvp_n_6-3.gat	mapflag	pvp_noguild
+pvp_n_6-4.gat	mapflag	pvp_noguild
+pvp_n_6-5.gat	mapflag	pvp_noguild
+pvp_n_7-1.gat	mapflag	pvp_noguild
+pvp_n_7-2.gat	mapflag	pvp_noguild
+pvp_n_7-3.gat	mapflag	pvp_noguild
+pvp_n_7-4.gat	mapflag	pvp_noguild
+pvp_n_7-5.gat	mapflag	pvp_noguild
+pvp_n_8-1.gat	mapflag	pvp_noguild
+pvp_n_8-2.gat	mapflag	pvp_noguild
+pvp_n_8-3.gat	mapflag	pvp_noguild
+pvp_n_8-4.gat	mapflag	pvp_noguild
+pvp_n_8-5.gat	mapflag	pvp_noguild
+pvp_2vs2.gat	mapflag	pvp_noguild
diff --git a/conf-tmpl/mapflag/pvp_noparty.txt b/conf-tmpl/mapflag/pvp_noparty.txt
index 2bff06ad0..a06178b24 100644
--- a/conf-tmpl/mapflag/pvp_noparty.txt
+++ b/conf-tmpl/mapflag/pvp_noparty.txt
@@ -1,13 +1,13 @@
-//===== eAthena Script =======================================

-//= Map flags that disable parties in pvp maps 

-//===== By: ==================================================

-//= eAthena Dev Team

-//= v 1.2

-//===== Current Version: =====================================

-

-// GvG Arenas =================

-guild_vs1.gat	mapflag	pvp_noparty

-guild_vs2.gat	mapflag	pvp_noparty

-guild_vs3.gat	mapflag	pvp_noparty

-guild_vs4.gat	mapflag	pvp_noparty

-guild_vs5.gat	mapflag	pvp_noparty

+//===== eAthena Script =======================================
+//= Map flags that disable parties in pvp maps 
+//===== By: ==================================================
+//= eAthena Dev Team
+//= v 1.2
+//===== Current Version: =====================================
+
+// GvG Arenas =================
+guild_vs1.gat	mapflag	pvp_noparty
+guild_vs2.gat	mapflag	pvp_noparty
+guild_vs3.gat	mapflag	pvp_noparty
+guild_vs4.gat	mapflag	pvp_noparty
+guild_vs5.gat	mapflag	pvp_noparty
diff --git a/conf-tmpl/mapflag/restricted.txt b/conf-tmpl/mapflag/restricted.txt
index e5e21a5d5..2545644d5 100644
--- a/conf-tmpl/mapflag/restricted.txt
+++ b/conf-tmpl/mapflag/restricted.txt
@@ -1,20 +1,20 @@
-//===== eAthena Script =======================================

-//= Map flags that disable certain items/skills configured in

-//= item_noequip.txt and skill_nocast_db.txt

-//===== By: ==================================================

-//= eAthena Dev Team

-//= 1.0 [Komurka]

-//===== Current Version: =====================================

-

-//Aldebaran Turbo Track

-alde_tt02.gat	mapflag	restricted	1

-turbo_n_1.gat	mapflag	restricted	1

-turbo_n_4.gat	mapflag	restricted	1

-turbo_n_8.gat	mapflag	restricted	1

-turbo_n_16.gat	mapflag	restricted	1

-turbo_e_4.gat	mapflag	restricted	1

-turbo_e_8.gat	mapflag	restricted	1

-turbo_e_16.gat	mapflag	restricted	1

-

-//Jail

-sec_pri.gat	mapflag	restricted	2

+//===== eAthena Script =======================================
+//= Map flags that disable certain items/skills configured in
+//= item_noequip.txt and skill_nocast_db.txt
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.0 [Komurka]
+//===== Current Version: =====================================
+
+//Aldebaran Turbo Track
+alde_tt02.gat	mapflag	restricted	1
+turbo_n_1.gat	mapflag	restricted	1
+turbo_n_4.gat	mapflag	restricted	1
+turbo_n_8.gat	mapflag	restricted	1
+turbo_n_16.gat	mapflag	restricted	1
+turbo_e_4.gat	mapflag	restricted	1
+turbo_e_8.gat	mapflag	restricted	1
+turbo_e_16.gat	mapflag	restricted	1
+
+//Jail
+sec_pri.gat	mapflag	restricted	2
diff --git a/conf-tmpl/maps_athena.conf b/conf-tmpl/maps_athena.conf
index 70735ab2f..49a5ad8f3 100644
--- a/conf-tmpl/maps_athena.conf
+++ b/conf-tmpl/maps_athena.conf
@@ -1,807 +1,807 @@
-//------------------------- Normal Maps ---------------------------

-map: alb_ship.gat

-map: alb2trea.gat

-map: alberta.gat

-map: alberta_in.gat

-map: alde_dun01.gat

-map: alde_dun02.gat

-map: alde_dun03.gat

-map: alde_dun04.gat

-map: aldeba_in.gat

-map: aldebaran.gat

-map: anthell01.gat

-map: anthell02.gat

-map: arena_room.gat

-map: c_tower1.gat

-map: c_tower2.gat

-map: c_tower3.gat

-map: c_tower4.gat

-//map: force_map1.gat

-//map: force_map2.gat

-//map: force_map3.gat

-map: force_1-1.gat

-map: force_1-2.gat

-map: force_1-3.gat

-map: force_2-1.gat

-map: force_2-2.gat

-map: force_2-3.gat

-map: force_3-1.gat

-map: force_3-2.gat

-map: force_3-3.gat

-map: gef_dun00.gat

-map: gef_dun01.gat

-map: gef_dun02.gat

-map: gef_dun03.gat

-map: gef_fild00.gat

-map: gef_fild01.gat

-map: gef_fild02.gat

-map: gef_fild03.gat

-map: gef_fild04.gat

-map: gef_fild05.gat

-map: gef_fild06.gat

-map: gef_fild07.gat

-map: gef_fild08.gat

-map: gef_fild09.gat

-map: gef_fild10.gat

-map: gef_fild11.gat

-map: gef_fild12.gat

-map: gef_fild13.gat

-map: gef_fild14.gat

-map: gef_tower.gat

-map: geffen.gat

-map: geffen_in.gat

-map: gl_cas01.gat

-map: gl_cas02.gat

-map: gl_church.gat

-map: gl_chyard.gat

-map: gl_dun01.gat

-map: gl_dun02.gat

-map: gl_in01.gat

-map: gl_knt01.gat

-map: gl_knt02.gat

-map: gl_prison.gat

-map: gl_prison1.gat

-map: gl_sew01.gat

-map: gl_sew02.gat

-map: gl_sew03.gat

-map: gl_sew04.gat

-map: gl_step.gat

-map: glast_01.gat

-//map: hunter_1-1.gat

-//map: hunter_2-1.gat

-//map: hunter_3-1.gat

-map: in_hunter.gat

-map: in_moc_16.gat

-map: in_orcs01.gat

-map: in_sphinx1.gat

-map: in_sphinx2.gat

-map: in_sphinx3.gat

-map: in_sphinx4.gat

-map: in_sphinx5.gat

-map: iz_dun00.gat

-map: iz_dun01.gat

-map: iz_dun02.gat

-map: iz_dun03.gat

-map: iz_dun04.gat

-map: izlu2dun.gat

-map: izlude.gat

-map: izlude_in.gat

-map: job_thief1.gat

-//map: knight_1-1.gat

-//map: knight_2-1.gat

-//map: knight_3-1.gat

-map: mjo_dun01.gat

-map: mjo_dun02.gat

-map: mjo_dun03.gat

-map: mjolnir_01.gat

-map: mjolnir_02.gat

-map: mjolnir_03.gat

-map: mjolnir_04.gat

-map: mjolnir_05.gat

-map: mjolnir_06.gat

-map: mjolnir_07.gat

-map: mjolnir_08.gat

-map: mjolnir_09.gat

-map: mjolnir_10.gat

-map: mjolnir_11.gat

-map: mjolnir_12.gat

-map: moc_castle.gat

-map: moc_fild01.gat

-map: moc_fild02.gat

-map: moc_fild03.gat

-map: moc_fild04.gat

-map: moc_fild05.gat

-map: moc_fild06.gat

-map: moc_fild07.gat

-map: moc_fild08.gat

-map: moc_fild09.gat

-map: moc_fild10.gat

-map: moc_fild11.gat

-map: moc_fild12.gat

-map: moc_fild13.gat

-map: moc_fild14.gat

-map: moc_fild15.gat

-map: moc_fild16.gat

-map: moc_fild17.gat

-map: moc_fild18.gat

-map: moc_fild19.gat

-map: moc_pryd01.gat

-map: moc_pryd02.gat

-map: moc_pryd03.gat

-map: moc_pryd04.gat

-map: moc_pryd05.gat

-map: moc_pryd06.gat

-map: moc_prydb1.gat

-map: moc_ruins.gat

-map: monk_in.gat

-map: morocc.gat

-map: morocc_in.gat

-map: new_zone01.gat

-map: new_zone02.gat

-map: new_zone03.gat

-map: new_zone04.gat

-//map: new_1-1.gat

-//map: new_1-2.gat

-//map: new_1-3.gat

-//map: new_1-4.gat

-//map: new_2-1.gat

-//map: new_2-2.gat

-//map: new_2-3.gat

-//map: new_2-4.gat

-//map: new_3-1.gat

-//map: new_3-2.gat

-//map: new_3-3.gat

-//map: new_3-4.gat

-//map: new_4-1.gat

-//map: new_4-2.gat

-//map: new_4-3.gat

-//map: new_4-4.gat

-//map: new_5-1.gat

-//map: new_5-2.gat

-//map: new_5-3.gat

-//map: new_5-4.gat

-map: orcsdun01.gat

-map: orcsdun02.gat

-//map: ordeal_a00.gat

-//map: ordeal_a02.gat

-map: ordeal_1-1.gat

-map: ordeal_1-2.gat

-//map: ordeal_1-3.gat

-//map: ordeal_1-4.gat

-map: ordeal_2-1.gat

-map: ordeal_2-2.gat

-//map: ordeal_2-3.gat

-//map: ordeal_2-4.gat

-map: ordeal_3-1.gat

-map: ordeal_3-2.gat

-//map: ordeal_3-3.gat

-//map: ordeal_3-4.gat

-map: pay_arche.gat

-map: pay_dun00.gat

-map: pay_dun01.gat

-map: pay_dun02.gat

-map: pay_dun03.gat

-map: pay_dun04.gat

-map: pay_fild01.gat

-map: pay_fild02.gat

-map: pay_fild03.gat

-map: pay_fild04.gat

-map: pay_fild05.gat

-map: pay_fild06.gat

-map: pay_fild07.gat

-map: pay_fild08.gat

-map: pay_fild09.gat

-map: pay_fild10.gat

-map: pay_fild11.gat

-//map: payon.gat	//moved down to new maps

-//map: payon_in01.gat	//moved down to new maps

-//map: payon_in02.gat	//moved down to new maps

-//map: priest_1-1.gat

-//map: priest_2-1.gat

-//map: priest_3-1.gat

-map: prontera.gat

-map: prt_are_in.gat

-map: prt_are01.gat

-map: prt_castle.gat

-map: prt_church.gat

-map: prt_fild00.gat

-map: prt_fild01.gat

-map: prt_fild02.gat

-map: prt_fild03.gat

-map: prt_fild04.gat

-map: prt_fild05.gat

-map: prt_fild06.gat

-map: prt_fild07.gat

-map: prt_fild08.gat

-map: prt_fild09.gat

-map: prt_fild10.gat

-map: prt_fild11.gat

-map: prt_in.gat

-map: prt_maze01.gat

-map: prt_maze02.gat

-map: prt_maze03.gat

-map: prt_monk.gat

-map: prt_sewb1.gat

-map: prt_sewb2.gat

-map: prt_sewb3.gat

-map: prt_sewb4.gat

-//map: pvp_room.gat

-map: pvp_2vs2.gat

-map: pvp_c_room.gat

-map: pvp_n_1-1.gat

-map: pvp_n_1-2.gat

-map: pvp_n_1-3.gat

-map: pvp_n_1-4.gat

-map: pvp_n_1-5.gat

-map: pvp_n_2-1.gat

-map: pvp_n_2-2.gat

-map: pvp_n_2-3.gat

-map: pvp_n_2-4.gat

-map: pvp_n_2-5.gat

-map: pvp_n_3-1.gat

-map: pvp_n_3-2.gat

-map: pvp_n_3-3.gat

-map: pvp_n_3-4.gat

-map: pvp_n_3-5.gat

-map: pvp_n_4-1.gat

-map: pvp_n_4-2.gat

-map: pvp_n_4-3.gat

-map: pvp_n_4-4.gat

-map: pvp_n_4-5.gat

-map: pvp_n_5-1.gat

-map: pvp_n_5-2.gat

-map: pvp_n_5-3.gat

-map: pvp_n_5-4.gat

-map: pvp_n_5-5.gat

-map: pvp_n_6-1.gat

-map: pvp_n_6-2.gat

-map: pvp_n_6-3.gat

-map: pvp_n_6-4.gat

-map: pvp_n_6-5.gat

-map: pvp_n_7-1.gat

-map: pvp_n_7-2.gat

-map: pvp_n_7-3.gat

-map: pvp_n_7-4.gat

-map: pvp_n_7-5.gat

-map: pvp_n_8-1.gat

-map: pvp_n_8-2.gat

-map: pvp_n_8-3.gat

-map: pvp_n_8-4.gat

-map: pvp_n_8-5.gat

-map: pvp_n_room.gat

-map: pvp_y_1-1.gat

-map: pvp_y_1-2.gat

-map: pvp_y_1-3.gat

-map: pvp_y_1-4.gat

-map: pvp_y_1-5.gat

-map: pvp_y_2-1.gat

-map: pvp_y_2-2.gat

-map: pvp_y_2-3.gat

-map: pvp_y_2-4.gat

-map: pvp_y_2-5.gat

-map: pvp_y_3-1.gat

-map: pvp_y_3-2.gat

-map: pvp_y_3-3.gat

-map: pvp_y_3-4.gat

-map: pvp_y_3-5.gat

-map: pvp_y_4-1.gat

-map: pvp_y_4-2.gat

-map: pvp_y_4-3.gat

-map: pvp_y_4-4.gat

-map: pvp_y_4-5.gat

-map: pvp_y_5-1.gat

-map: pvp_y_5-2.gat

-map: pvp_y_5-3.gat

-map: pvp_y_5-4.gat

-map: pvp_y_5-5.gat

-map: pvp_y_6-1.gat

-map: pvp_y_6-2.gat

-map: pvp_y_6-3.gat

-map: pvp_y_6-4.gat

-map: pvp_y_6-5.gat

-map: pvp_y_7-1.gat

-map: pvp_y_7-2.gat

-map: pvp_y_7-3.gat

-map: pvp_y_7-4.gat

-map: pvp_y_7-5.gat

-map: pvp_y_8-1.gat

-map: pvp_y_8-2.gat

-map: pvp_y_8-3.gat

-map: pvp_y_8-4.gat

-map: pvp_y_8-5.gat

-map: pvp_y_room.gat

-//map: sword_1-1.gat

-//map: sword_2-1.gat

-//map: sword_3-1.gat

-map: treasure01.gat

-map: treasure02.gat

-//map: wizard_1-1.gat

-//map: wizard_2-1.gat

-//map: wizard_3-1.gat

-map: xmas.gat

-map: xmas_dun01.gat

-map: xmas_dun02.gat

-map: xmas_fild01.gat

-map: xmas_in.gat

-

-//---Ep3.0 Comodo ---

-

-map: beach_dun.gat

-map: beach_dun2.gat

-map: beach_dun3.gat

-map: cmd_fild01.gat

-map: cmd_fild02.gat

-map: cmd_fild03.gat

-map: cmd_fild04.gat

-map: cmd_fild05.gat

-map: cmd_fild06.gat

-map: cmd_fild07.gat

-map: cmd_fild08.gat

-map: cmd_fild09.gat

-map: cmd_in01.gat

-map: cmd_in02.gat

-map: comodo.gat

-

-//---EP3.1 Quiz Revolution ---

-

-map: quiz_00.gat

-map: quiz_01.gat

-map: g_room1-1.gat

-map: g_room1-2.gat

-map: g_room1-3.gat

-map: g_room2.gat

-

-//--- Ep4.0 Turtle Island ---

-

-map: tur_dun01.gat

-map: tur_dun02.gat

-map: tur_dun03.gat

-map: tur_dun04.gat

-map: tur_dun05.gat

-map: tur_dun06.gat

-

-//--- Ep4.1 The War of Emperium ---

-

-map: alde_gld.gat

-map: aldeg_cas01.gat

-map: aldeg_cas02.gat

-map: aldeg_cas03.gat

-map: aldeg_cas04.gat

-map: aldeg_cas05.gat

-map: gefg_cas01.gat

-map: gefg_cas02.gat

-map: gefg_cas03.gat

-map: gefg_cas04.gat

-map: gefg_cas05.gat

-map: gld_dun01.gat

-map: gld_dun02.gat

-map: gld_dun03.gat

-map: gld_dun04.gat

-map: guild_room.gat

-map: guild_vs1.gat

-map: guild_vs2.gat

-map: guild_vs3.gat

-map: guild_vs4.gat

-map: guild_vs5.gat

-map: guild_vs1-1.gat

-map: guild_vs1-2.gat

-map: guild_vs1-3.gat

-map: guild_vs1-4.gat

-map: guild_vs2-1.gat

-map: guild_vs2-2.gat

-//map: job_hunter.gat

-map: job_hunte.gat

-//map: job_knight.gat

-map: job_knt.gat

-//map: job_priest.gat

-map: job_prist.gat

-map: job_sword1.gat

-//map: job_wizard.gat

-map: job_wiz.gat

-map: pay_gld.gat

-map: payg_cas01.gat

-map: payg_cas02.gat

-map: payg_cas03.gat

-map: payg_cas04.gat

-map: payg_cas05.gat

-map: prt_gld.gat

-map: prtg_cas01.gat

-map: prtg_cas02.gat

-map: prtg_cas03.gat

-map: prtg_cas04.gat

-map: prtg_cas05.gat

-

-

-//--- Ep5.0 Yuno ---

-

-map: alde_alche.gat

-map: in_rogue.gat

-map: job_cru.gat

-map: job_duncer.gat

-map: job_monk.gat

-map: job_sage.gat

-map: mag_dun01.gat

-map: mag_dun02.gat

-map: monk_test.gat

-map: quiz_test.gat

-map: yuno.gat

-map: yuno_fild01.gat

-map: yuno_fild02.gat

-map: yuno_fild03.gat

-map: yuno_fild04.gat

-map: yuno_in01.gat

-map: yuno_in02.gat

-map: yuno_in03.gat

-map: yuno_in04.gat

-map: yuno_in05.gat

-

-//--- Ep6.0 - Amatsu  ---

-// Requires: kRO 08-10-03 or newer

-// or kRO Sakray 09-09-03 or newer

-

-map: ama_dun01.gat

-map: ama_dun02.gat

-map: ama_dun03.gat

-map: ama_fild01.gat

-map: ama_in01.gat

-map: ama_in02.gat

-map: ama_test.gat

-map: amatsu.gat

-

-//--- Ep6.1 - Gon Ryun ---

-

-map: gon_dun01.gat

-map: gon_dun02.gat

-map: gon_dun03.gat

-map: gon_fild01.gat

-map: gon_in.gat

-map: gon_test.gat

-map: gonryun.gat

-map: sec_in01.gat

-map: sec_in02.gat

-map: sec_pri.gat

-

-//--- Ep6.2 - Umbala ---

-// Requires: kRO 01-27-04 or newer

-// or kRO Sakray 12-02-03 or newer

-// or Akaru's SuperGRF 1.22 or newer

-map: umbala.gat

-map: um_dun01.gat

-map: um_dun02.gat

-map: um_fild01.gat

-map: um_fild02.gat

-map: um_fild03.gat

-map: um_fild04.gat

-map: um_in.gat

-

-//--- Ep6.3 - Niflheim ---

-// Requires: kRO 02-23-04 or newer

-// or kRO Sakray 01-09-04 or newer

-// or Akaru's SuperGRF 1.32 or newer

-map: niflheim.gat

-map: nif_fild01.gat

-map: nif_fild02.gat

-map: nif_in.gat

-map: yggdrasil01.gat

-

-//--- Ep6.4 - Valkyrie ---

-// Requires: kRO ??-??-04 or newer

-// or kRO Sakray 02-03-04 or newer

-// or Akaru's SuperGRF 1.34 or newer

-map: valkyrie.gat

-map: himinn.gat

-

-//--- Ep6.5 - Castle of Dragon (LouYang) ---

-// Requires kRO Sakray 03-30 or newer

-//(Akaru's SuperGRF required version: 1.52)

-map: lou_in01.gat

-map: lou_in02.gat

-map: lou_dun03.gat

-map: lou_dun02.gat

-map: lou_dun01.gat

-map: lou_fild01.gat

-map: louyang.gat

-

-//--- Ep6.6 - Novice Guild Siege ---

-//Requires kRO Sakray 04-07 or newer

-//(Akaru's SuperGRF required version: 1.53)

-//map: siege_test.gat

-map: n_castle.gat

-map: nguild_gef.gat

-map: nguild_prt.gat

-map: nguild_pay.gat

-map: nguild_alde.gat

-

-//--- Ep6.7 - Jawaii ---

-//Requires kRO Sakray 06-22 or newer

-//(Akaru's SuperGRF required version: 1.63)

-map: jawaii.gat

-map: jawaii_in.gat

-

-// --- Ep6.8 - Geffenia ---

-// Requires kRO Sakray 07-13 or newer

-// (Akaru's SuperGRF required version: 1.64)

-map: gefenia01.gat

-map: gefenia02.gat

-map: gefenia03.gat

-map: gefenia04.gat

-

-// --- Ep6.9 - New Payon ---

-// Requires kRO Sakray 09-03

-// -- dunno --

-map: payon.gat

-map: payon_in01.gat

-map: payon_in02.gat

-map: payon_in03.gat

-//same names as old maps except that payon_in03.gat got added

-

-// --- Ep? - Ayothaya ---

-// Requires kRO Sakray 09-21

-// -- 2004-10-19sdata_k.gpf --

-map: ayothaya.gat

-map: ayo_in01.gat

-map: ayo_in02.gat

-map: ayo_fild01.gat

-map: ayo_fild02.gat

-map: ayo_dun01.gat

-map: ayo_dun02.gat

-

-// --- God item quests maps ---

-// -- 2004-10-12sdata_k3.gpf --

-map: que_god01.gat

-map: que_god02.gat

-

-// --- Ep? - Schwarzwald Republic ---

-// -- 2004-12-28sdata_k.gpf --

-map: yuno_fild05.gat

-map: yuno_fild07.gat

-map: yuno_fild08.gat

-map: yuno_fild09.gat

-map: yuno_fild11.gat

-map: yuno_fild12.gat

-

-// --- Turbo Track Arena ---

-// -- 2005-03-08sdata_k.gpf --

-map: alde_tt02.gat

-map: turbo_n_1.gat

-map: turbo_n_4.gat

-map: turbo_n_8.gat

-map: turbo_n_16.gat

-map: turbo_e_4.gat

-map: turbo_e_8.gat

-map: turbo_e_16.gat

-map: turbo_room.gat

-

-// --- Einbroch/Einbech ---

-// -- 2005-03-15sdata_k.gpf --

-map: airplane.gat

-map: airport.gat

-map: einbech.gat

-map: einbroch.gat

-map: ein_dun01.gat

-map: ein_dun02.gat

-map: ein_fild06.gat

-map: ein_fild07.gat

-map: ein_fild08.gat

-map: ein_fild09.gat

-map: ein_fild10.gat

-map: ein_in01.gat

-map: que_sign01.gat

-map: que_sign02.gat

-

-

-// --- Einbroch and Lightalzen ---

-// -- 2005-05-10sdata_k.gpf --

-map: ein_fild03.gat

-map: ein_fild04.gat

-map: lhz_fild02.gat

-map: lhz_fild03.gat

-

-// --- Lighthalzen and Juperos Dungeon ---

-// -- 2005-06-14sdata_k.gpf --

-map: yuno_pre.gat

-map: lhz_fild01.gat

-map: lighthalzen.gat

-map: lhz_in01.gat

-map: lhz_in02.gat

-map: lhz_in03.gat

-map: lhz_que01.gat

-map: lhz_dun01.gat

-map: lhz_dun02.gat

-map: lhz_dun03.gat

-map: lhz_cube.gat

-map: juperos_01.gat

-map: juperos_02.gat

-map: jupe_area1.gat

-map: jupe_area2.gat

-map: jupe_core.gat

-map: jupe_ele.gat

-map: jupe_ele_r.gat

-map: jupe_gate.gat

-

-// --- Lighthalzen & Juno Airport ---

-// -- resnametable clones of airport.gat and airplane.gat --

-map: y_airport.gat

-map: lhz_airport.gat

-map: airplane_01.gat

-

-// --- Juperos Dungeon ---

-// -- 2005-06-28sdata_k.gpf --

-map: jupe_cave.gat

-

-// --- Quiz Revolution ---

-// -- 2005-08-02sdata_k.gpf --

-map: quiz_02.gat

-

-// --- Hugel Field ---

-// -- 2005-08-23sdata_k.gpf --

-map: hu_fild07.gat

-map: hu_fild05.gat

-map: hu_fild04.gat

-map: hu_fild01.gat

-map: yuno_fild06.gat

-

-// --- Star Knight And Soul Linker Job Change Maps ---

-// -- 2005-08-23sdata_k.gpf --

-map: job_soul.gat

-map: job_star.gat

-

-// --- Abyss Lake, Thanatos Tower --

-// -- 2005-09-13sdata_k.gpf - 2005-09-13sdata_k6.gpf --

-map: que_job01.gat

-map: que_job02.gat

-map: que_job03.gat

-map: abyss_01.gat

-map: abyss_02.gat

-map: abyss_03.gat

-map: thana_step.gat

-map: thana_boss.gat

-map: tha_scene01.gat

-map: tha_t01.gat

-map: tha_t02.gat

-map: tha_t03.gat

-map: tha_t04.gat

-map: tha_t07.gat

-map: tha_t05.gat

-map: tha_t06.gat

-map: tha_t08.gat

-

-// --- Thanatos Tower ---

-// -- 2005-09-21sdata_k.gpf -- 

-map: tha_t09.gat

-map: tha_t10.gat

-map: tha_t11.gat

-map: tha_t12.gat

-

-// --- Auction Market ---

-// -- 2005-11-29sdata_k.gpf -- 

-map: auction_01.gat

-map: auction_02.gat

-

-// --- Garden City Hugel / Kiehl ---

-// -- 2005-12-20sdata_k.gpf -- 

-map: hugel.gat

-map: hu_in01.gat

-map: que_bingo.gat

-map: que_hugel.gat

-map: p_track01.gat

-map: p_track02.gat

-map: odin_tem01.gat

-map: odin_tem02.gat

-map: odin_tem03.gat

-map: hu_fild02.gat

-map: hu_fild03.gat

-map: hu_fild06.gat

-map: ein_fild01.gat

-map: ein_fild02.gat

-map: ein_fild05.gat

-map: yuno_fild10.gat

-map: kh_kiehl02.gat

-map: kh_kiehl01.gat

-map: kh_dun02.gat

-map: kh_dun01.gat

-map: kh_mansion.gat

-map: kh_rossi.gat

-map: kh_school.gat

-map: kh_vila.gat

-

-// --- Poring Arena (?) & Gunslinger/Ninja Job Map ---

-// -- 2006-03-28sdata_k.gpf --

-map: poring_c01.gat

-map: poring_c02.gat

-map: que_ng.gat

-

-// --- Arunafeltz & Ice Dungeon ---

-// -- 2006-05-30sdata_k.gpf --

-map: rachel.gat

-map: ra_in01.gat

-map: ra_fild01.gat

-map: ra_fild02.gat

-map: ra_fild03.gat

-map: ra_fild04.gat

-map: ra_fild05.gat

-map: ra_fild06.gat

-map: ra_fild07.gat

-map: ra_fild08.gat

-map: ra_fild09.gat

-map: ra_fild10.gat

-map: ra_fild11.gat

-map: ra_fild12.gat

-map: ra_fild13.gat

-map: ra_san01.gat

-map: ra_san02.gat

-map: ra_san03.gat

-map: ra_san04.gat

-map: ra_san05.gat

-map: ra_temin.gat

-map: ra_temple.gat

-map: ra_temsky.gat

-map: que_rachel.gat

-map: ice_dun01.gat

-map: ice_dun02.gat

-map: ice_dun03.gat

-map: ice_dun04.gat

-

-//------------------------- Clone Maps ---------------------------

-//------------------------- Extra Maps ---------------------------

-

-// Ragnarok World Championship 2004

-// Requires: RWC 2004 Client

-// or Akaru's SuperGRF 1.64 or newer

-//map: rwc01.gat

-//map: rwc02.gat

-//map: rwc03.gat

-

-//Christmas & Sakura Special

-//Requires Akaru's SuperGRF 1.1 or newer

-//map: prontera_x.gat

-//map: alberta_x.gat

-//map: aldebaran_x.gat

-//map: geffen_x.gat

-//map: izlude_x.gat

-//map: prt_church_x.gat

-//map: prontera_s.gat

-//map: pay_arche_s.gat

-

-//Fenced Lutie

-//Requires Akaru's SuperGRF 1.23 or newer

-//map: xmas_old.gat

-

-//Alpha Maps

-//Requires adata.grf containing alpha maps and data

-//map: fay_vilg00.gat

-//map: fay_vilg01.gat

-//map: gef_vilg00.gat

-//map: gef_vilg01.gat

-//map: moc_dugn01.gat

-//map: moc_dugn02.gat

-//map: moc_fild01.gat

-//map: moc_fild02.gat

-//map: moc_fild03.gat

-//map: moc_fild04.gat

-//map: moc_intr00.gat

-//map: moc_intr01.gat

-//map: moc_intr02.gat

-//map: moc_intr04.gat

-//map: moc_vilg00.gat

-//map: moc_vilg01.gat

-//map: moc_vilg02.gat

-//map: probemap.gat

-//map: probemap02.gat

-//map: prt_cstl01.gat

-//map: prt_dugn00.gat

-//map: prt_dugn01.gat

-//map: prt_fild00.gat

-//map: prt_fild01.gat

-//map: prt_fild03.gat

-//map: prt_fild04.gat

-//map: prt_fild05.gat

-//map: prt_intr01.gat

-//map: prt_intr01_a.gat

-//map: prt_intr02.gat

-//map: prt_vilg00.gat

-//map: prt_vilg01.gat

-//map: prt_vilg02.gat

-//map: tank_test.gat

-//map: tank_test2.gat

-//map: test.gat

+//------------------------- Normal Maps ---------------------------
+map: alb_ship.gat
+map: alb2trea.gat
+map: alberta.gat
+map: alberta_in.gat
+map: alde_dun01.gat
+map: alde_dun02.gat
+map: alde_dun03.gat
+map: alde_dun04.gat
+map: aldeba_in.gat
+map: aldebaran.gat
+map: anthell01.gat
+map: anthell02.gat
+map: arena_room.gat
+map: c_tower1.gat
+map: c_tower2.gat
+map: c_tower3.gat
+map: c_tower4.gat
+//map: force_map1.gat
+//map: force_map2.gat
+//map: force_map3.gat
+map: force_1-1.gat
+map: force_1-2.gat
+map: force_1-3.gat
+map: force_2-1.gat
+map: force_2-2.gat
+map: force_2-3.gat
+map: force_3-1.gat
+map: force_3-2.gat
+map: force_3-3.gat
+map: gef_dun00.gat
+map: gef_dun01.gat
+map: gef_dun02.gat
+map: gef_dun03.gat
+map: gef_fild00.gat
+map: gef_fild01.gat
+map: gef_fild02.gat
+map: gef_fild03.gat
+map: gef_fild04.gat
+map: gef_fild05.gat
+map: gef_fild06.gat
+map: gef_fild07.gat
+map: gef_fild08.gat
+map: gef_fild09.gat
+map: gef_fild10.gat
+map: gef_fild11.gat
+map: gef_fild12.gat
+map: gef_fild13.gat
+map: gef_fild14.gat
+map: gef_tower.gat
+map: geffen.gat
+map: geffen_in.gat
+map: gl_cas01.gat
+map: gl_cas02.gat
+map: gl_church.gat
+map: gl_chyard.gat
+map: gl_dun01.gat
+map: gl_dun02.gat
+map: gl_in01.gat
+map: gl_knt01.gat
+map: gl_knt02.gat
+map: gl_prison.gat
+map: gl_prison1.gat
+map: gl_sew01.gat
+map: gl_sew02.gat
+map: gl_sew03.gat
+map: gl_sew04.gat
+map: gl_step.gat
+map: glast_01.gat
+//map: hunter_1-1.gat
+//map: hunter_2-1.gat
+//map: hunter_3-1.gat
+map: in_hunter.gat
+map: in_moc_16.gat
+map: in_orcs01.gat
+map: in_sphinx1.gat
+map: in_sphinx2.gat
+map: in_sphinx3.gat
+map: in_sphinx4.gat
+map: in_sphinx5.gat
+map: iz_dun00.gat
+map: iz_dun01.gat
+map: iz_dun02.gat
+map: iz_dun03.gat
+map: iz_dun04.gat
+map: izlu2dun.gat
+map: izlude.gat
+map: izlude_in.gat
+map: job_thief1.gat
+//map: knight_1-1.gat
+//map: knight_2-1.gat
+//map: knight_3-1.gat
+map: mjo_dun01.gat
+map: mjo_dun02.gat
+map: mjo_dun03.gat
+map: mjolnir_01.gat
+map: mjolnir_02.gat
+map: mjolnir_03.gat
+map: mjolnir_04.gat
+map: mjolnir_05.gat
+map: mjolnir_06.gat
+map: mjolnir_07.gat
+map: mjolnir_08.gat
+map: mjolnir_09.gat
+map: mjolnir_10.gat
+map: mjolnir_11.gat
+map: mjolnir_12.gat
+map: moc_castle.gat
+map: moc_fild01.gat
+map: moc_fild02.gat
+map: moc_fild03.gat
+map: moc_fild04.gat
+map: moc_fild05.gat
+map: moc_fild06.gat
+map: moc_fild07.gat
+map: moc_fild08.gat
+map: moc_fild09.gat
+map: moc_fild10.gat
+map: moc_fild11.gat
+map: moc_fild12.gat
+map: moc_fild13.gat
+map: moc_fild14.gat
+map: moc_fild15.gat
+map: moc_fild16.gat
+map: moc_fild17.gat
+map: moc_fild18.gat
+map: moc_fild19.gat
+map: moc_pryd01.gat
+map: moc_pryd02.gat
+map: moc_pryd03.gat
+map: moc_pryd04.gat
+map: moc_pryd05.gat
+map: moc_pryd06.gat
+map: moc_prydb1.gat
+map: moc_ruins.gat
+map: monk_in.gat
+map: morocc.gat
+map: morocc_in.gat
+map: new_zone01.gat
+map: new_zone02.gat
+map: new_zone03.gat
+map: new_zone04.gat
+//map: new_1-1.gat
+//map: new_1-2.gat
+//map: new_1-3.gat
+//map: new_1-4.gat
+//map: new_2-1.gat
+//map: new_2-2.gat
+//map: new_2-3.gat
+//map: new_2-4.gat
+//map: new_3-1.gat
+//map: new_3-2.gat
+//map: new_3-3.gat
+//map: new_3-4.gat
+//map: new_4-1.gat
+//map: new_4-2.gat
+//map: new_4-3.gat
+//map: new_4-4.gat
+//map: new_5-1.gat
+//map: new_5-2.gat
+//map: new_5-3.gat
+//map: new_5-4.gat
+map: orcsdun01.gat
+map: orcsdun02.gat
+//map: ordeal_a00.gat
+//map: ordeal_a02.gat
+map: ordeal_1-1.gat
+map: ordeal_1-2.gat
+//map: ordeal_1-3.gat
+//map: ordeal_1-4.gat
+map: ordeal_2-1.gat
+map: ordeal_2-2.gat
+//map: ordeal_2-3.gat
+//map: ordeal_2-4.gat
+map: ordeal_3-1.gat
+map: ordeal_3-2.gat
+//map: ordeal_3-3.gat
+//map: ordeal_3-4.gat
+map: pay_arche.gat
+map: pay_dun00.gat
+map: pay_dun01.gat
+map: pay_dun02.gat
+map: pay_dun03.gat
+map: pay_dun04.gat
+map: pay_fild01.gat
+map: pay_fild02.gat
+map: pay_fild03.gat
+map: pay_fild04.gat
+map: pay_fild05.gat
+map: pay_fild06.gat
+map: pay_fild07.gat
+map: pay_fild08.gat
+map: pay_fild09.gat
+map: pay_fild10.gat
+map: pay_fild11.gat
+//map: payon.gat	//moved down to new maps
+//map: payon_in01.gat	//moved down to new maps
+//map: payon_in02.gat	//moved down to new maps
+//map: priest_1-1.gat
+//map: priest_2-1.gat
+//map: priest_3-1.gat
+map: prontera.gat
+map: prt_are_in.gat
+map: prt_are01.gat
+map: prt_castle.gat
+map: prt_church.gat
+map: prt_fild00.gat
+map: prt_fild01.gat
+map: prt_fild02.gat
+map: prt_fild03.gat
+map: prt_fild04.gat
+map: prt_fild05.gat
+map: prt_fild06.gat
+map: prt_fild07.gat
+map: prt_fild08.gat
+map: prt_fild09.gat
+map: prt_fild10.gat
+map: prt_fild11.gat
+map: prt_in.gat
+map: prt_maze01.gat
+map: prt_maze02.gat
+map: prt_maze03.gat
+map: prt_monk.gat
+map: prt_sewb1.gat
+map: prt_sewb2.gat
+map: prt_sewb3.gat
+map: prt_sewb4.gat
+//map: pvp_room.gat
+map: pvp_2vs2.gat
+map: pvp_c_room.gat
+map: pvp_n_1-1.gat
+map: pvp_n_1-2.gat
+map: pvp_n_1-3.gat
+map: pvp_n_1-4.gat
+map: pvp_n_1-5.gat
+map: pvp_n_2-1.gat
+map: pvp_n_2-2.gat
+map: pvp_n_2-3.gat
+map: pvp_n_2-4.gat
+map: pvp_n_2-5.gat
+map: pvp_n_3-1.gat
+map: pvp_n_3-2.gat
+map: pvp_n_3-3.gat
+map: pvp_n_3-4.gat
+map: pvp_n_3-5.gat
+map: pvp_n_4-1.gat
+map: pvp_n_4-2.gat
+map: pvp_n_4-3.gat
+map: pvp_n_4-4.gat
+map: pvp_n_4-5.gat
+map: pvp_n_5-1.gat
+map: pvp_n_5-2.gat
+map: pvp_n_5-3.gat
+map: pvp_n_5-4.gat
+map: pvp_n_5-5.gat
+map: pvp_n_6-1.gat
+map: pvp_n_6-2.gat
+map: pvp_n_6-3.gat
+map: pvp_n_6-4.gat
+map: pvp_n_6-5.gat
+map: pvp_n_7-1.gat
+map: pvp_n_7-2.gat
+map: pvp_n_7-3.gat
+map: pvp_n_7-4.gat
+map: pvp_n_7-5.gat
+map: pvp_n_8-1.gat
+map: pvp_n_8-2.gat
+map: pvp_n_8-3.gat
+map: pvp_n_8-4.gat
+map: pvp_n_8-5.gat
+map: pvp_n_room.gat
+map: pvp_y_1-1.gat
+map: pvp_y_1-2.gat
+map: pvp_y_1-3.gat
+map: pvp_y_1-4.gat
+map: pvp_y_1-5.gat
+map: pvp_y_2-1.gat
+map: pvp_y_2-2.gat
+map: pvp_y_2-3.gat
+map: pvp_y_2-4.gat
+map: pvp_y_2-5.gat
+map: pvp_y_3-1.gat
+map: pvp_y_3-2.gat
+map: pvp_y_3-3.gat
+map: pvp_y_3-4.gat
+map: pvp_y_3-5.gat
+map: pvp_y_4-1.gat
+map: pvp_y_4-2.gat
+map: pvp_y_4-3.gat
+map: pvp_y_4-4.gat
+map: pvp_y_4-5.gat
+map: pvp_y_5-1.gat
+map: pvp_y_5-2.gat
+map: pvp_y_5-3.gat
+map: pvp_y_5-4.gat
+map: pvp_y_5-5.gat
+map: pvp_y_6-1.gat
+map: pvp_y_6-2.gat
+map: pvp_y_6-3.gat
+map: pvp_y_6-4.gat
+map: pvp_y_6-5.gat
+map: pvp_y_7-1.gat
+map: pvp_y_7-2.gat
+map: pvp_y_7-3.gat
+map: pvp_y_7-4.gat
+map: pvp_y_7-5.gat
+map: pvp_y_8-1.gat
+map: pvp_y_8-2.gat
+map: pvp_y_8-3.gat
+map: pvp_y_8-4.gat
+map: pvp_y_8-5.gat
+map: pvp_y_room.gat
+//map: sword_1-1.gat
+//map: sword_2-1.gat
+//map: sword_3-1.gat
+map: treasure01.gat
+map: treasure02.gat
+//map: wizard_1-1.gat
+//map: wizard_2-1.gat
+//map: wizard_3-1.gat
+map: xmas.gat
+map: xmas_dun01.gat
+map: xmas_dun02.gat
+map: xmas_fild01.gat
+map: xmas_in.gat
+
+//---Ep3.0 Comodo ---
+
+map: beach_dun.gat
+map: beach_dun2.gat
+map: beach_dun3.gat
+map: cmd_fild01.gat
+map: cmd_fild02.gat
+map: cmd_fild03.gat
+map: cmd_fild04.gat
+map: cmd_fild05.gat
+map: cmd_fild06.gat
+map: cmd_fild07.gat
+map: cmd_fild08.gat
+map: cmd_fild09.gat
+map: cmd_in01.gat
+map: cmd_in02.gat
+map: comodo.gat
+
+//---EP3.1 Quiz Revolution ---
+
+map: quiz_00.gat
+map: quiz_01.gat
+map: g_room1-1.gat
+map: g_room1-2.gat
+map: g_room1-3.gat
+map: g_room2.gat
+
+//--- Ep4.0 Turtle Island ---
+
+map: tur_dun01.gat
+map: tur_dun02.gat
+map: tur_dun03.gat
+map: tur_dun04.gat
+map: tur_dun05.gat
+map: tur_dun06.gat
+
+//--- Ep4.1 The War of Emperium ---
+
+map: alde_gld.gat
+map: aldeg_cas01.gat
+map: aldeg_cas02.gat
+map: aldeg_cas03.gat
+map: aldeg_cas04.gat
+map: aldeg_cas05.gat
+map: gefg_cas01.gat
+map: gefg_cas02.gat
+map: gefg_cas03.gat
+map: gefg_cas04.gat
+map: gefg_cas05.gat
+map: gld_dun01.gat
+map: gld_dun02.gat
+map: gld_dun03.gat
+map: gld_dun04.gat
+map: guild_room.gat
+map: guild_vs1.gat
+map: guild_vs2.gat
+map: guild_vs3.gat
+map: guild_vs4.gat
+map: guild_vs5.gat
+map: guild_vs1-1.gat
+map: guild_vs1-2.gat
+map: guild_vs1-3.gat
+map: guild_vs1-4.gat
+map: guild_vs2-1.gat
+map: guild_vs2-2.gat
+//map: job_hunter.gat
+map: job_hunte.gat
+//map: job_knight.gat
+map: job_knt.gat
+//map: job_priest.gat
+map: job_prist.gat
+map: job_sword1.gat
+//map: job_wizard.gat
+map: job_wiz.gat
+map: pay_gld.gat
+map: payg_cas01.gat
+map: payg_cas02.gat
+map: payg_cas03.gat
+map: payg_cas04.gat
+map: payg_cas05.gat
+map: prt_gld.gat
+map: prtg_cas01.gat
+map: prtg_cas02.gat
+map: prtg_cas03.gat
+map: prtg_cas04.gat
+map: prtg_cas05.gat
+
+
+//--- Ep5.0 Yuno ---
+
+map: alde_alche.gat
+map: in_rogue.gat
+map: job_cru.gat
+map: job_duncer.gat
+map: job_monk.gat
+map: job_sage.gat
+map: mag_dun01.gat
+map: mag_dun02.gat
+map: monk_test.gat
+map: quiz_test.gat
+map: yuno.gat
+map: yuno_fild01.gat
+map: yuno_fild02.gat
+map: yuno_fild03.gat
+map: yuno_fild04.gat
+map: yuno_in01.gat
+map: yuno_in02.gat
+map: yuno_in03.gat
+map: yuno_in04.gat
+map: yuno_in05.gat
+
+//--- Ep6.0 - Amatsu  ---
+// Requires: kRO 08-10-03 or newer
+// or kRO Sakray 09-09-03 or newer
+
+map: ama_dun01.gat
+map: ama_dun02.gat
+map: ama_dun03.gat
+map: ama_fild01.gat
+map: ama_in01.gat
+map: ama_in02.gat
+map: ama_test.gat
+map: amatsu.gat
+
+//--- Ep6.1 - Gon Ryun ---
+
+map: gon_dun01.gat
+map: gon_dun02.gat
+map: gon_dun03.gat
+map: gon_fild01.gat
+map: gon_in.gat
+map: gon_test.gat
+map: gonryun.gat
+map: sec_in01.gat
+map: sec_in02.gat
+map: sec_pri.gat
+
+//--- Ep6.2 - Umbala ---
+// Requires: kRO 01-27-04 or newer
+// or kRO Sakray 12-02-03 or newer
+// or Akaru's SuperGRF 1.22 or newer
+map: umbala.gat
+map: um_dun01.gat
+map: um_dun02.gat
+map: um_fild01.gat
+map: um_fild02.gat
+map: um_fild03.gat
+map: um_fild04.gat
+map: um_in.gat
+
+//--- Ep6.3 - Niflheim ---
+// Requires: kRO 02-23-04 or newer
+// or kRO Sakray 01-09-04 or newer
+// or Akaru's SuperGRF 1.32 or newer
+map: niflheim.gat
+map: nif_fild01.gat
+map: nif_fild02.gat
+map: nif_in.gat
+map: yggdrasil01.gat
+
+//--- Ep6.4 - Valkyrie ---
+// Requires: kRO ??-??-04 or newer
+// or kRO Sakray 02-03-04 or newer
+// or Akaru's SuperGRF 1.34 or newer
+map: valkyrie.gat
+map: himinn.gat
+
+//--- Ep6.5 - Castle of Dragon (LouYang) ---
+// Requires kRO Sakray 03-30 or newer
+//(Akaru's SuperGRF required version: 1.52)
+map: lou_in01.gat
+map: lou_in02.gat
+map: lou_dun03.gat
+map: lou_dun02.gat
+map: lou_dun01.gat
+map: lou_fild01.gat
+map: louyang.gat
+
+//--- Ep6.6 - Novice Guild Siege ---
+//Requires kRO Sakray 04-07 or newer
+//(Akaru's SuperGRF required version: 1.53)
+//map: siege_test.gat
+map: n_castle.gat
+map: nguild_gef.gat
+map: nguild_prt.gat
+map: nguild_pay.gat
+map: nguild_alde.gat
+
+//--- Ep6.7 - Jawaii ---
+//Requires kRO Sakray 06-22 or newer
+//(Akaru's SuperGRF required version: 1.63)
+map: jawaii.gat
+map: jawaii_in.gat
+
+// --- Ep6.8 - Geffenia ---
+// Requires kRO Sakray 07-13 or newer
+// (Akaru's SuperGRF required version: 1.64)
+map: gefenia01.gat
+map: gefenia02.gat
+map: gefenia03.gat
+map: gefenia04.gat
+
+// --- Ep6.9 - New Payon ---
+// Requires kRO Sakray 09-03
+// -- dunno --
+map: payon.gat
+map: payon_in01.gat
+map: payon_in02.gat
+map: payon_in03.gat
+//same names as old maps except that payon_in03.gat got added
+
+// --- Ep? - Ayothaya ---
+// Requires kRO Sakray 09-21
+// -- 2004-10-19sdata_k.gpf --
+map: ayothaya.gat
+map: ayo_in01.gat
+map: ayo_in02.gat
+map: ayo_fild01.gat
+map: ayo_fild02.gat
+map: ayo_dun01.gat
+map: ayo_dun02.gat
+
+// --- God item quests maps ---
+// -- 2004-10-12sdata_k3.gpf --
+map: que_god01.gat
+map: que_god02.gat
+
+// --- Ep? - Schwarzwald Republic ---
+// -- 2004-12-28sdata_k.gpf --
+map: yuno_fild05.gat
+map: yuno_fild07.gat
+map: yuno_fild08.gat
+map: yuno_fild09.gat
+map: yuno_fild11.gat
+map: yuno_fild12.gat
+
+// --- Turbo Track Arena ---
+// -- 2005-03-08sdata_k.gpf --
+map: alde_tt02.gat
+map: turbo_n_1.gat
+map: turbo_n_4.gat
+map: turbo_n_8.gat
+map: turbo_n_16.gat
+map: turbo_e_4.gat
+map: turbo_e_8.gat
+map: turbo_e_16.gat
+map: turbo_room.gat
+
+// --- Einbroch/Einbech ---
+// -- 2005-03-15sdata_k.gpf --
+map: airplane.gat
+map: airport.gat
+map: einbech.gat
+map: einbroch.gat
+map: ein_dun01.gat
+map: ein_dun02.gat
+map: ein_fild06.gat
+map: ein_fild07.gat
+map: ein_fild08.gat
+map: ein_fild09.gat
+map: ein_fild10.gat
+map: ein_in01.gat
+map: que_sign01.gat
+map: que_sign02.gat
+
+
+// --- Einbroch and Lightalzen ---
+// -- 2005-05-10sdata_k.gpf --
+map: ein_fild03.gat
+map: ein_fild04.gat
+map: lhz_fild02.gat
+map: lhz_fild03.gat
+
+// --- Lighthalzen and Juperos Dungeon ---
+// -- 2005-06-14sdata_k.gpf --
+map: yuno_pre.gat
+map: lhz_fild01.gat
+map: lighthalzen.gat
+map: lhz_in01.gat
+map: lhz_in02.gat
+map: lhz_in03.gat
+map: lhz_que01.gat
+map: lhz_dun01.gat
+map: lhz_dun02.gat
+map: lhz_dun03.gat
+map: lhz_cube.gat
+map: juperos_01.gat
+map: juperos_02.gat
+map: jupe_area1.gat
+map: jupe_area2.gat
+map: jupe_core.gat
+map: jupe_ele.gat
+map: jupe_ele_r.gat
+map: jupe_gate.gat
+
+// --- Lighthalzen & Juno Airport ---
+// -- resnametable clones of airport.gat and airplane.gat --
+map: y_airport.gat
+map: lhz_airport.gat
+map: airplane_01.gat
+
+// --- Juperos Dungeon ---
+// -- 2005-06-28sdata_k.gpf --
+map: jupe_cave.gat
+
+// --- Quiz Revolution ---
+// -- 2005-08-02sdata_k.gpf --
+map: quiz_02.gat
+
+// --- Hugel Field ---
+// -- 2005-08-23sdata_k.gpf --
+map: hu_fild07.gat
+map: hu_fild05.gat
+map: hu_fild04.gat
+map: hu_fild01.gat
+map: yuno_fild06.gat
+
+// --- Star Knight And Soul Linker Job Change Maps ---
+// -- 2005-08-23sdata_k.gpf --
+map: job_soul.gat
+map: job_star.gat
+
+// --- Abyss Lake, Thanatos Tower --
+// -- 2005-09-13sdata_k.gpf - 2005-09-13sdata_k6.gpf --
+map: que_job01.gat
+map: que_job02.gat
+map: que_job03.gat
+map: abyss_01.gat
+map: abyss_02.gat
+map: abyss_03.gat
+map: thana_step.gat
+map: thana_boss.gat
+map: tha_scene01.gat
+map: tha_t01.gat
+map: tha_t02.gat
+map: tha_t03.gat
+map: tha_t04.gat
+map: tha_t07.gat
+map: tha_t05.gat
+map: tha_t06.gat
+map: tha_t08.gat
+
+// --- Thanatos Tower ---
+// -- 2005-09-21sdata_k.gpf -- 
+map: tha_t09.gat
+map: tha_t10.gat
+map: tha_t11.gat
+map: tha_t12.gat
+
+// --- Auction Market ---
+// -- 2005-11-29sdata_k.gpf -- 
+map: auction_01.gat
+map: auction_02.gat
+
+// --- Garden City Hugel / Kiehl ---
+// -- 2005-12-20sdata_k.gpf -- 
+map: hugel.gat
+map: hu_in01.gat
+map: que_bingo.gat
+map: que_hugel.gat
+map: p_track01.gat
+map: p_track02.gat
+map: odin_tem01.gat
+map: odin_tem02.gat
+map: odin_tem03.gat
+map: hu_fild02.gat
+map: hu_fild03.gat
+map: hu_fild06.gat
+map: ein_fild01.gat
+map: ein_fild02.gat
+map: ein_fild05.gat
+map: yuno_fild10.gat
+map: kh_kiehl02.gat
+map: kh_kiehl01.gat
+map: kh_dun02.gat
+map: kh_dun01.gat
+map: kh_mansion.gat
+map: kh_rossi.gat
+map: kh_school.gat
+map: kh_vila.gat
+
+// --- Poring Arena (?) & Gunslinger/Ninja Job Map ---
+// -- 2006-03-28sdata_k.gpf --
+map: poring_c01.gat
+map: poring_c02.gat
+map: que_ng.gat
+
+// --- Arunafeltz & Ice Dungeon ---
+// -- 2006-05-30sdata_k.gpf --
+map: rachel.gat
+map: ra_in01.gat
+map: ra_fild01.gat
+map: ra_fild02.gat
+map: ra_fild03.gat
+map: ra_fild04.gat
+map: ra_fild05.gat
+map: ra_fild06.gat
+map: ra_fild07.gat
+map: ra_fild08.gat
+map: ra_fild09.gat
+map: ra_fild10.gat
+map: ra_fild11.gat
+map: ra_fild12.gat
+map: ra_fild13.gat
+map: ra_san01.gat
+map: ra_san02.gat
+map: ra_san03.gat
+map: ra_san04.gat
+map: ra_san05.gat
+map: ra_temin.gat
+map: ra_temple.gat
+map: ra_temsky.gat
+map: que_rachel.gat
+map: ice_dun01.gat
+map: ice_dun02.gat
+map: ice_dun03.gat
+map: ice_dun04.gat
+
+//------------------------- Clone Maps ---------------------------
+//------------------------- Extra Maps ---------------------------
+
+// Ragnarok World Championship 2004
+// Requires: RWC 2004 Client
+// or Akaru's SuperGRF 1.64 or newer
+//map: rwc01.gat
+//map: rwc02.gat
+//map: rwc03.gat
+
+//Christmas & Sakura Special
+//Requires Akaru's SuperGRF 1.1 or newer
+//map: prontera_x.gat
+//map: alberta_x.gat
+//map: aldebaran_x.gat
+//map: geffen_x.gat
+//map: izlude_x.gat
+//map: prt_church_x.gat
+//map: prontera_s.gat
+//map: pay_arche_s.gat
+
+//Fenced Lutie
+//Requires Akaru's SuperGRF 1.23 or newer
+//map: xmas_old.gat
+
+//Alpha Maps
+//Requires adata.grf containing alpha maps and data
+//map: fay_vilg00.gat
+//map: fay_vilg01.gat
+//map: gef_vilg00.gat
+//map: gef_vilg01.gat
+//map: moc_dugn01.gat
+//map: moc_dugn02.gat
+//map: moc_fild01.gat
+//map: moc_fild02.gat
+//map: moc_fild03.gat
+//map: moc_fild04.gat
+//map: moc_intr00.gat
+//map: moc_intr01.gat
+//map: moc_intr02.gat
+//map: moc_intr04.gat
+//map: moc_vilg00.gat
+//map: moc_vilg01.gat
+//map: moc_vilg02.gat
+//map: probemap.gat
+//map: probemap02.gat
+//map: prt_cstl01.gat
+//map: prt_dugn00.gat
+//map: prt_dugn01.gat
+//map: prt_fild00.gat
+//map: prt_fild01.gat
+//map: prt_fild03.gat
+//map: prt_fild04.gat
+//map: prt_fild05.gat
+//map: prt_intr01.gat
+//map: prt_intr01_a.gat
+//map: prt_intr02.gat
+//map: prt_vilg00.gat
+//map: prt_vilg01.gat
+//map: prt_vilg02.gat
+//map: tank_test.gat
+//map: tank_test2.gat
+//map: test.gat
diff --git a/conf-tmpl/motd.txt b/conf-tmpl/motd.txt
index fe8587222..b4d040554 100644
--- a/conf-tmpl/motd.txt
+++ b/conf-tmpl/motd.txt
@@ -1,2 +1,2 @@
-// Internal default is limited to 128 lines.  If you need more, you will need to modify the MOTD_LINE_SIZE definition in pc.c

+// Internal default is limited to 128 lines.  If you need more, you will need to modify the MOTD_LINE_SIZE definition in pc.c
 Welcome to eAthena SVN Version! Enjoy! Please report any bugs you find in eAthena :).
\ No newline at end of file
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index 0b0c0cc42..f747f93f9 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -1,556 +1,556 @@
-// eAthena msg_athena.conf

-// Message Configuration

-// For translation, just change msg here (second line), no need to modify source code,

-// or alternatively, use conf/import/msg_conf.txt

-// Format:

-// // English message

-// msg_number: translated message

-

-//   0-499: reserved for GM commands

-// 500-999 reserved for others

-

-// To disable a string (%s) field, make it's max length 0:

-// eg:

-// 270: *%s %s* (@me format)

-// 270: *%.0s%s* (remove the character's name from it)

-

-// Messages of GM commands

-// -----------------------

-

-0: Warped.

-1: Map not found.

-2: Invalid coordinates, using random target cell.

-3: Character not found.

-4: Jump to %s

-5: Jump to %d %d

-6: Character data respawn point saved.

-7: Warping to respawn point.

-8: Speed changed.

-9: Options changed.

-10: Invisible: Off

-11: Invisible: On

-12: Your job has been changed.

-13: You've died.

-14: Character killed.

-15: Player warped (message sends to player too).

-16: You've been revived!

-17: HP, SP recovered.

-18: Item created.

-19: Invalid item ID or name.

-20: All of your items have been removed.

-21: Base level raised.

-22: Base level lowered.

-23: Job level can't go any higher.

-24: Job level raised.

-25: Job level lowered.

-26: Help commands:

-27: File help.txt not found.

-28: No player found.

-29: 1 player found.

-30: %d players found.

-31: PvP: Off.

-32: PvP: On.

-33: GvG: Off.

-34: GvG: On.

-35: You can't use this command with this class.

-36: Appearence changed.

-37: An invalid number was specified.

-38: Invalid location number or name.

-39: All monster summoned!

-40: Invalid monster ID or name.

-41: Impossible to decrease the number/value.

-42: Stat changed.

-43: You're not in a guild.

-44: You're not the master of your guild.

-45: Guild level change failed.

-46: %s recalled!

-47: Base level can't go any higher.

-48: Character's job changed.

-49: Invalid job ID.

-50: You already have some GM powers.

-51: Character revived.

-52: This option cannot be used in PK Mode.

-53: '%s' stats:

-54: No player found in map '%s'.

-55: 1 player found in map '%s'.

-56: %d players found in map '%s'.

-57: Character's respawn point changed.

-58: Character's options changed.

-59: Night Mode Activated.

-60: Day Mode Activated.

-61: The holy messenger has given judgement.

-62: Judgement was made.

-63: Mercy has been shown.

-64: Mercy has been granted.

-65: Character's base level raised.

-66: Character's base level lowered.

-67: Character's job level can't go any higher.

-68: character's job level raised.

-69: Character's job level lowered.

-70: You have learned the skill.

-71: You have forgotten the skill.

-72: Guild siege warfare start!

-73: Already it has started siege warfare.

-74: Guild siege warfare end!

-75: Siege warfare hasn't started yet.

-76: You have received all skills.

-77: The reference result of '%s' (name: id):

-78: %s: %d

-79: It is %d affair above.

-80: Give a display name and monster name/id please.

-81: Your GM level don't authorize you to do this action on this player.

-82: Please, use one of this number/name:

-83: Cannot spawn emperium.

-84: All stats changed!

-85: Invalid time for ban command.

-86: Sorry, but a player name have at least 4 characters.

-87: Sorry, but a player name have 23 characters maximum.

-88: Character name sends to char-server to ask it.

-89: Sorry, it's already the night. Impossible to execute the command.

-90: Sorry, it's already the day. Impossible to execute the command.

-91: Character's base level can't go any higher.

-92: All characters recalled!

-93: All online characters of the %s guild are near you.

-94: Incorrect name/ID, or no one from the guild is online.

-95: All online characters of the %s party are near you.

-96: Incorrect name or ID, or no one from the party is online.

-97: Item database reloaded.

-98: Monster database reloaded.

-99: Skill database reloaded.

-100: Scripts reloaded.

-101: Login-server asked to reload GM accounts and their level.

-102: Mounted Peco.

-103: No longer spying on the %s guild.

-104: Spying on the %s guild.

-105: No longer spying on the %s party.

-106: Spying on the %s party.

-107: All items have been repaired.

-108: No item need to be repaired.

-109: Player has been nuked!

-110: Npc Enabled.

-111: This NPC doesn't exist.

-112: Npc Disabled.

-113: %d item(s) removed by a GM.

-114: %d item(s) removed from the player.

-115: %d item(s) removed. Player had only %d on %d items.

-116: Character does not have the item.

-117: GM has send you in jails.

-118: Player warped in jails.

-119: This player is not in jails.

-120: GM has discharge you.

-121: Player unjailed.

-122: Disguise applied.

-123: Monster/NPC name/id hasn't been found.

-124: Undisguise applied.

-125: You're not disguised.

-//Clone Messages

-126: Cannot clone a player of higher GM level than yourself.

-127: You've reached your slave clones limit.

-128: Evil Clone spawned.

-129: Unable to spawn evil clone.

-130: Clone spawned.

-131: Unable to spawn clone.

-132: Slave clone spawned.

-133: Unable to spawn slave clone.

-//Messages 134-139 are no longer used, available for future reuse (preferrable for more variations of @clone)

-140: Character's disguise applied.

-141: Character's undisguise applied.

-142: Character is not disguised.

-143: Commands are disabled on this map.

-144: Invalid actual E-mail. If you have default E-mail, type a@a.com.

-145: Invalid new E-mail. Please enter a real E-mail.

-146: New E-mail must be a real E-mail.

-147: New E-mail must be different of the actual E-mail.

-148: Information sended to login-server via char-server.

-149: Impossible to increase the number/value.

-150: No GM found.

-151: 1 GM found.

-152: %d GMs found.

-153: %s is Unknown Command.

-154: %s failed.

-155: Impossible to change your job.

-156: HP or/and SP modified.

-157: HP and SP are already with the good value.

-158: Base level can't go any lower.

-159: Job level can't go any lower.

-160: PvP is already Off.

-161: PvP is already On.

-162: GvG is already Off.

-163: GvG is already On.

-164: Your memo point #%d doesn't exist.

-165: All monsters killed!

-166: No item has been refined!

-167: 1 item has been refined!

-168: %d items have been refined!

-169: This item (%d: '%s') is not an equipment.

-170: This item is not an equipment.

-171: %d - void

-172: You replace previous memo position %d - %s (%d,%d).

-173: Note: you don't have the 'Warp' skill level to use it.

-174: Number of status points changed!

-175: Number of skill points changed!

-176: Number of zenys changed!

-177: Impossible to decrease a stat.

-178: Impossible to increase a stat.

-179: Guild level changed.

-180: The monter/egg name/id doesn't exist.

-181: You already have a pet.

-182: Pet friendly value changed!

-183: Pet friendly is already the good value.

-184: Sorry, but you have no pet.

-185: Pet hungry value changed!

-186: Pet hungry is already the good value.

-187: You can now rename your pet.

-188: You can already rename your pet.

-189: This player can now rename his/her pet.

-190: This player can already rename his/her pet.

-191: Sorry, but this player has no pet.

-192: Impossible to change the character's job.

-193: Character's base level can't go any lower.

-194: Character's job level can't go any lower.

-195: All players have been kicked!

-196: You already have this quest skill.

-197: This skill number doesn't exist or isn't a quest skill.

-198: This skill number doesn't exist.

-199: This player has learned the skill.

-200: This player already has this quest skill.

-201: You don't have this quest skill.

-202: This player has forgotten the skill.

-203: This player doesn't have this quest skill.

-204: WARNING: more than 1000 spiritballs can CRASH your server and/or client!

-205: You already have this number of spiritballs.

-206: '%s' skill points reseted!

-207: '%s' stats points reseted!

-208: '%s' skill and stats points reseted!

-209: Character's number of skill points changed!

-210: Character's number of status points changed!

-211: Character's number of zenys changed!

-212: Cannot mount a Peco while in disguise.

-213: You can not mount a peco with your job.

-214: Unmounted Peco.

-215: This player cannot mount a Peco while in disguise.

-216: Now, this player mounts a peco.

-217: This player can not mount a peco with his/her job.

-218: Now, this player has not more peco.

-219: %d day

-220: %d days

-221: %s %d hour

-222: %s %d hours

-223: %s %d minute

-224: %s %d minutes

-225: %s and %d second

-226: %s and %d seconds

-227: Party modification is disabled on this map.

-228: Guild modification is disabled on this map.

-229: Your Effect Has Changed.

-230: Server time (normal time): %A, %B %d %Y %X.

-231: Game time: The game is in permanent daylight.

-232: Game time: The game is in permanent night.

-233: Game time: The game is actualy in night for %s.

-234: Game time: After, the game will be in permanent daylight.

-235: Game time: The game is actualy in daylight for %s.

-236: Game time: After, the game will be in permanent night.

-237: Game time: After, the game will be in night for %s.

-238: Game time: A day cycle has a normal duration of %s.

-239: Game time: After, the game will be in daylight for %s.

-240: %d monster(s) summoned!

-241: You can now kill anybody

-242: You are now killable by anyone

-243: Map skills are off

-244: Map skills are on

-245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.

-246: Your GM level don't authorize you to do this action.

-247: You are not authorized to warp to this map.

-248: You are not authorized to warp from your current map.

-249: You are not authorized to warp to your save map.

-250: You have already opened your storage. Close it first.

-251: You have already opened your guild storage. Close it first.

-252: You are not in a guild.

-253: You are not authorized to memo this map.

-254: GM commands configuration reloaded.

-255: Battle configuration reloaded.

-256: Status database reloaded.

-257: Player database reloaded.

-258: Sent packet 0x%x (%d)

-259: Invalid packet

-260: This item cannot be traded.

-261: Script could not be loaded.

-262: Script loaded.

-263: This item cannot be dropped.

-264: This item cannot be stored.

-265: %s has bought your item(s).

-266: Some of your items cannot be vended and were removed from the shop.

-267: '%s' designated maps reseted!

-268: Reloaded the Message of the Day.

-269: Displaying first %d out of %d matches

-//@me output format

-270: *%s %s*

-271: You can't drop items on this map

-272: You can't trade on this map

-273: Commands available:

-274: %d commands found.

-275: No commands found.

-276: You can't open shop on this map

-277: Usage: @request <petition/message to online GMs>.

-278: (@request): %s

-279: @request sent.

-280: Invalid pet name.

-281: You can't create chat rooms on this map

-//Party-related

-282: You need to be a party leader to use this command.

-283: Target character must be online and be in your party.

-284: Leadership transferred.

-285: You've become the party leader.

-286: There's been no change in the setting.

-//Missing stuff for @killer related commands.

-287: Killer state reset

-288: You are no longer killable

-289: The player is now killable

-290: The player is no longer killable

-291: Weather effects will dispell on warp/refresh

-// Guild Castles Number

-// --------------------

-299: ?? Castles

-300: None Taken

-301: One Castle

-302: Two Castles

-303: Three Castles

-304: Four Castles

-305: Five Castles

-306: Six Castles

-307: Seven Castles

-308: Eight Castles

-309: Nine Castles

-310: Ten Castles

-311: Eleven Castles

-312: Twelve Castles

-313: Thirteen Castles

-314: Fourteen Castles

-315: Fifteen Castles

-316: Sixteen Castles

-317: Seventeen Castles

-318: Eighteen Castles

-319: Nineteen Castles

-320: Twenty Castles

-321: Twenty One Castles

-322: Twenty Two Castles

-323: Twenty Three Castles

-324: Total Domination

-//alternative

-//324: Twenty Four Castles

-

-// Players Titles (for @who, etc commands, check battle_athena.conf for titles level setting)

-// Useful note: you may remove ':%d' from the line, then you will see only player title, w/o his level

-325: Super player:%d

-326: Super player+:%d

-327: Mediator:%d

-328: Sub-GM:%d

-329: Sub-GM+:%d

-330: GM:%d

-331: GM Chief:%d

-332: Administrator:%d

-// Templates for @who output

-333: Name: %s 

-334: (%s) 

-335: | Party: '%s' 

-336: | Guild: '%s'

-//You may ommit the last %s, then you won't see players job name

-337: | L:%d/%d | Job: %s

-//You may ommit 2 last %d, then you won't see players coords, just map name

-338: | Location: %s %d %d

-

-// @duel (part 1)

-350: Duel: You can't use @invite. You aren't a duellist.

-351: Duel: The limit of players is reached.

-352: Duel: Player name not found.

-353: Duel: The Player is in the duel already.

-354: Duel: Duel invitation has been sent.

-355: Duel: You can't use @duel without @reject.

-356: Duel: You can take part in duel once per %d minutes.

-357: Duel: Invalid value.

-358: Duel: You can't use @leave. You aren't a duellist.

-359: Duel: You've left the duel.

-360: Duel: You can't use @accept without a duel invitation.

-361: Duel: The duel invitation has been accepted.

-362: Duel: You can't use @reject without a duel invitation.

-363: Duel: The duel invitation has been rejected.

-364: Duel: You can't invite %s because he isn't on the same map. 

-// @duel (part 2)

-370:  -- Duels: %d/%d, Members: %d/%d, Max players: %d --

-371:  -- Duels: %d/%d, Members: %d/%d --

-372:  -- Duel has been created (Use @invite/@leave) --

-373:  -- Player %s invites %s to duel --

-374: Blue -- Player %s invites you to PVP duel (Use @accept/@reject) --

-375:  <- Player %s has left the duel --

-376:  -> Player %s has accepted the duel --

-377:  -- Player %s has rejected the duel --

-// Main chat

-380: Main chat has been activated.

-381: Main chat already activated.

-382: Main chat has been disabled.

-383: Main chat already disabled.

-384: Main chat is currently enabled. Usage: @main <on|off>, @main <message>.

-385: Main chat is currently disabled. Usage: @main <on|off>, @main <message>.

-386: Main@%s: %s

-387: You cannot use Main chat while muted.

-388: You should enable main chat with "@main on" command.

-//NoAsk

-390: Autorejecting is activated.

-391: Autorejecting is deactivated.

-392: You request has been rejected by autoreject option.

-393: Autorejected trade request from %s.

-394: Autorejected party invite from %s.

-395: Autorejected guild invite from %s.

-396: Autorejected alliance request from %s.

-397: Autorejected opposition request from %s.

-398: Autorejected friend request from %s.

-400: Usage: @jailfor <time> <character name>

-401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes

-402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes

-

-// Homunculus messages

-450: You already have an homunculus

-

-// Messages of others (not for GM commands)

-// ----------------------------------------

-

-500: Night Mode is already active

-501: Your account time limit is: %d-%m-%Y %H:%M:%S.

-502: Day Mode is Activated

-503: Night Mode is Activated

-

-//Supernovice's Guardian Angel

-//actually.. new client msgtxt file contains these 3 lines... [Lupus]

-//----------------------------

-504: Guardian Angel, can you hear my voice? ^^;

-505: My name is %s, and I'm a Super Novice~

-506: Please help me~ T.T

-

-// Trade Spoof Messages

-507: This player has been banned for %d minute(s).

-508: This player hasn't been banned (Ban option is disabled).

-//509 Available....

-

-//mail system

-//----------------------

-510: You have no messages.

-511: %d - From : %s (New - Priority)

-512: %d - From : %s (New)

-513: %d - From : %s

-514: You have %d new messages.

-515: You have %d unread priority messages.

-516: You have no new messages.

-517: Message not found.

-518: Reading message from %s.

-519: Cannot delete unread priority mail.

-520: You have recieved new mail, use @listmail before deleting.

-521: Message deleted.

-522: You must wait 10 minutes before sending another message.

-523: Access Denied.

-524: Character does not exist.

-525: Mail has been sent.

-526: You have new mail.

-

-// Bot detect messages (currently unused)

-535: Possible use of BOT (99%% of chance) or modified client by '%s' (account: %d, char_id: %d). This player ask your name when you are hidden.

-

-536: Character '%s' (account: %d) try to use a bot (it tries to detect a fake player).

-537: Character '%s' (account: %d) try to use a bot (it tries to detect a fake mob).

-// Trade Spoof Messages

-538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.

-539: This player has %d of a kind of item (id: %d), and try to trade %d of them.

-540: This player has been definitivly blocked.

-// Rare Items Drop/Steal announce

-541: '%s' won %s's %s (chance: %0.02f%%)

-//541: %.0s%.0sSomeone won %s

-542: '%s' stole %s's %s (chance: %0.02f%%)

-//542: %.0s%.0sSomeone stole %s

-// @Away message bits

-543: (Automessage has been sent)

-544: Away [AT] - "%s"

-545: Away - "%s"

-546: Away automessage has been activated.

-547: Away automessage has been disabled.

-548: Usage: @away,@aw <message>. Enter empty message for disable it.

-// @Autotrade

-549: You should be vending to use @Autotrade.

-

-//550 -> 650: Job Names

-550: Novice

-551: Swordsman

-552: Mage

-553: Archer

-554: Acolyte

-555: Merchant

-556: Thief

-557: Knight

-558: Priest

-559: Wizard

-560: Blacksmith

-561: Hunter

-562: Assassin

-563: Crusader

-564: Monk

-565: Sage

-566: Rogue

-567: Alchemist

-568: Bard

-569: Dancer

-570: Wedding

-571: Super Novice

-572: Gunslinger

-573: Ninja

-574: Christmas

-575: High Novice

-576: High Swordsman

-577: High Mage

-578: High Archer

-579: High Acolyte

-580: High Merchant

-581: High Thief

-582: Lord Knight

-583: High Priest

-584: High Wizard

-585: Whitesmith

-//585: Mastersmith //IRO name

-586: Sniper

-587: Assassin Cross

-588: Paladin

-589: Champion

-590: Professor

-//590: Scholar //IRO name

-591: Stalker

-592: Creator

-//592: Biochemist //IRO Name

-593: Clown

-//593: Minstrel //IRO Name

-594: Gypsy

-595: Baby Novice

-596: Baby Swordsman

-597: Baby Mage

-598: Baby Archer

-599: Baby Acolyte

-600: Baby Merchant

-601: Baby Thief

-602: Baby Knight

-603: Baby Priest

-604: Baby Wizard

-605: Baby Blacksmith

-606: Baby Hunter

-607: Baby Assassin

-608: Baby Crusader

-609: Baby Monk

-610: Baby Sage

-611: Baby Rogue

-612: Baby Alchemist

-613: Baby Bard

-614: Baby Dancer

-615: Super Baby

-616: Taekwon

-617: Star Gladiator

-618: Soul Linker

-//...

-650: Unknown Job

-

-//Custom translations

-import: conf/import/msg_conf.txt

+// eAthena msg_athena.conf
+// Message Configuration
+// For translation, just change msg here (second line), no need to modify source code,
+// or alternatively, use conf/import/msg_conf.txt
+// Format:
+// // English message
+// msg_number: translated message
+
+//   0-499: reserved for GM commands
+// 500-999 reserved for others
+
+// To disable a string (%s) field, make it's max length 0:
+// eg:
+// 270: *%s %s* (@me format)
+// 270: *%.0s%s* (remove the character's name from it)
+
+// Messages of GM commands
+// -----------------------
+
+0: Warped.
+1: Map not found.
+2: Invalid coordinates, using random target cell.
+3: Character not found.
+4: Jump to %s
+5: Jump to %d %d
+6: Character data respawn point saved.
+7: Warping to respawn point.
+8: Speed changed.
+9: Options changed.
+10: Invisible: Off
+11: Invisible: On
+12: Your job has been changed.
+13: You've died.
+14: Character killed.
+15: Player warped (message sends to player too).
+16: You've been revived!
+17: HP, SP recovered.
+18: Item created.
+19: Invalid item ID or name.
+20: All of your items have been removed.
+21: Base level raised.
+22: Base level lowered.
+23: Job level can't go any higher.
+24: Job level raised.
+25: Job level lowered.
+26: Help commands:
+27: File help.txt not found.
+28: No player found.
+29: 1 player found.
+30: %d players found.
+31: PvP: Off.
+32: PvP: On.
+33: GvG: Off.
+34: GvG: On.
+35: You can't use this command with this class.
+36: Appearence changed.
+37: An invalid number was specified.
+38: Invalid location number or name.
+39: All monster summoned!
+40: Invalid monster ID or name.
+41: Impossible to decrease the number/value.
+42: Stat changed.
+43: You're not in a guild.
+44: You're not the master of your guild.
+45: Guild level change failed.
+46: %s recalled!
+47: Base level can't go any higher.
+48: Character's job changed.
+49: Invalid job ID.
+50: You already have some GM powers.
+51: Character revived.
+52: This option cannot be used in PK Mode.
+53: '%s' stats:
+54: No player found in map '%s'.
+55: 1 player found in map '%s'.
+56: %d players found in map '%s'.
+57: Character's respawn point changed.
+58: Character's options changed.
+59: Night Mode Activated.
+60: Day Mode Activated.
+61: The holy messenger has given judgement.
+62: Judgement was made.
+63: Mercy has been shown.
+64: Mercy has been granted.
+65: Character's base level raised.
+66: Character's base level lowered.
+67: Character's job level can't go any higher.
+68: character's job level raised.
+69: Character's job level lowered.
+70: You have learned the skill.
+71: You have forgotten the skill.
+72: Guild siege warfare start!
+73: Already it has started siege warfare.
+74: Guild siege warfare end!
+75: Siege warfare hasn't started yet.
+76: You have received all skills.
+77: The reference result of '%s' (name: id):
+78: %s: %d
+79: It is %d affair above.
+80: Give a display name and monster name/id please.
+81: Your GM level don't authorize you to do this action on this player.
+82: Please, use one of this number/name:
+83: Cannot spawn emperium.
+84: All stats changed!
+85: Invalid time for ban command.
+86: Sorry, but a player name have at least 4 characters.
+87: Sorry, but a player name have 23 characters maximum.
+88: Character name sends to char-server to ask it.
+89: Sorry, it's already the night. Impossible to execute the command.
+90: Sorry, it's already the day. Impossible to execute the command.
+91: Character's base level can't go any higher.
+92: All characters recalled!
+93: All online characters of the %s guild are near you.
+94: Incorrect name/ID, or no one from the guild is online.
+95: All online characters of the %s party are near you.
+96: Incorrect name or ID, or no one from the party is online.
+97: Item database reloaded.
+98: Monster database reloaded.
+99: Skill database reloaded.
+100: Scripts reloaded.
+101: Login-server asked to reload GM accounts and their level.
+102: Mounted Peco.
+103: No longer spying on the %s guild.
+104: Spying on the %s guild.
+105: No longer spying on the %s party.
+106: Spying on the %s party.
+107: All items have been repaired.
+108: No item need to be repaired.
+109: Player has been nuked!
+110: Npc Enabled.
+111: This NPC doesn't exist.
+112: Npc Disabled.
+113: %d item(s) removed by a GM.
+114: %d item(s) removed from the player.
+115: %d item(s) removed. Player had only %d on %d items.
+116: Character does not have the item.
+117: GM has send you in jails.
+118: Player warped in jails.
+119: This player is not in jails.
+120: GM has discharge you.
+121: Player unjailed.
+122: Disguise applied.
+123: Monster/NPC name/id hasn't been found.
+124: Undisguise applied.
+125: You're not disguised.
+//Clone Messages
+126: Cannot clone a player of higher GM level than yourself.
+127: You've reached your slave clones limit.
+128: Evil Clone spawned.
+129: Unable to spawn evil clone.
+130: Clone spawned.
+131: Unable to spawn clone.
+132: Slave clone spawned.
+133: Unable to spawn slave clone.
+//Messages 134-139 are no longer used, available for future reuse (preferrable for more variations of @clone)
+140: Character's disguise applied.
+141: Character's undisguise applied.
+142: Character is not disguised.
+143: Commands are disabled on this map.
+144: Invalid actual E-mail. If you have default E-mail, type a@a.com.
+145: Invalid new E-mail. Please enter a real E-mail.
+146: New E-mail must be a real E-mail.
+147: New E-mail must be different of the actual E-mail.
+148: Information sended to login-server via char-server.
+149: Impossible to increase the number/value.
+150: No GM found.
+151: 1 GM found.
+152: %d GMs found.
+153: %s is Unknown Command.
+154: %s failed.
+155: Impossible to change your job.
+156: HP or/and SP modified.
+157: HP and SP are already with the good value.
+158: Base level can't go any lower.
+159: Job level can't go any lower.
+160: PvP is already Off.
+161: PvP is already On.
+162: GvG is already Off.
+163: GvG is already On.
+164: Your memo point #%d doesn't exist.
+165: All monsters killed!
+166: No item has been refined!
+167: 1 item has been refined!
+168: %d items have been refined!
+169: This item (%d: '%s') is not an equipment.
+170: This item is not an equipment.
+171: %d - void
+172: You replace previous memo position %d - %s (%d,%d).
+173: Note: you don't have the 'Warp' skill level to use it.
+174: Number of status points changed!
+175: Number of skill points changed!
+176: Number of zenys changed!
+177: Impossible to decrease a stat.
+178: Impossible to increase a stat.
+179: Guild level changed.
+180: The monter/egg name/id doesn't exist.
+181: You already have a pet.
+182: Pet friendly value changed!
+183: Pet friendly is already the good value.
+184: Sorry, but you have no pet.
+185: Pet hungry value changed!
+186: Pet hungry is already the good value.
+187: You can now rename your pet.
+188: You can already rename your pet.
+189: This player can now rename his/her pet.
+190: This player can already rename his/her pet.
+191: Sorry, but this player has no pet.
+192: Impossible to change the character's job.
+193: Character's base level can't go any lower.
+194: Character's job level can't go any lower.
+195: All players have been kicked!
+196: You already have this quest skill.
+197: This skill number doesn't exist or isn't a quest skill.
+198: This skill number doesn't exist.
+199: This player has learned the skill.
+200: This player already has this quest skill.
+201: You don't have this quest skill.
+202: This player has forgotten the skill.
+203: This player doesn't have this quest skill.
+204: WARNING: more than 1000 spiritballs can CRASH your server and/or client!
+205: You already have this number of spiritballs.
+206: '%s' skill points reseted!
+207: '%s' stats points reseted!
+208: '%s' skill and stats points reseted!
+209: Character's number of skill points changed!
+210: Character's number of status points changed!
+211: Character's number of zenys changed!
+212: Cannot mount a Peco while in disguise.
+213: You can not mount a peco with your job.
+214: Unmounted Peco.
+215: This player cannot mount a Peco while in disguise.
+216: Now, this player mounts a peco.
+217: This player can not mount a peco with his/her job.
+218: Now, this player has not more peco.
+219: %d day
+220: %d days
+221: %s %d hour
+222: %s %d hours
+223: %s %d minute
+224: %s %d minutes
+225: %s and %d second
+226: %s and %d seconds
+227: Party modification is disabled on this map.
+228: Guild modification is disabled on this map.
+229: Your Effect Has Changed.
+230: Server time (normal time): %A, %B %d %Y %X.
+231: Game time: The game is in permanent daylight.
+232: Game time: The game is in permanent night.
+233: Game time: The game is actualy in night for %s.
+234: Game time: After, the game will be in permanent daylight.
+235: Game time: The game is actualy in daylight for %s.
+236: Game time: After, the game will be in permanent night.
+237: Game time: After, the game will be in night for %s.
+238: Game time: A day cycle has a normal duration of %s.
+239: Game time: After, the game will be in daylight for %s.
+240: %d monster(s) summoned!
+241: You can now kill anybody
+242: You are now killable by anyone
+243: Map skills are off
+244: Map skills are on
+245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.
+246: Your GM level don't authorize you to do this action.
+247: You are not authorized to warp to this map.
+248: You are not authorized to warp from your current map.
+249: You are not authorized to warp to your save map.
+250: You have already opened your storage. Close it first.
+251: You have already opened your guild storage. Close it first.
+252: You are not in a guild.
+253: You are not authorized to memo this map.
+254: GM commands configuration reloaded.
+255: Battle configuration reloaded.
+256: Status database reloaded.
+257: Player database reloaded.
+258: Sent packet 0x%x (%d)
+259: Invalid packet
+260: This item cannot be traded.
+261: Script could not be loaded.
+262: Script loaded.
+263: This item cannot be dropped.
+264: This item cannot be stored.
+265: %s has bought your item(s).
+266: Some of your items cannot be vended and were removed from the shop.
+267: '%s' designated maps reseted!
+268: Reloaded the Message of the Day.
+269: Displaying first %d out of %d matches
+//@me output format
+270: *%s %s*
+271: You can't drop items on this map
+272: You can't trade on this map
+273: Commands available:
+274: %d commands found.
+275: No commands found.
+276: You can't open shop on this map
+277: Usage: @request <petition/message to online GMs>.
+278: (@request): %s
+279: @request sent.
+280: Invalid pet name.
+281: You can't create chat rooms on this map
+//Party-related
+282: You need to be a party leader to use this command.
+283: Target character must be online and be in your party.
+284: Leadership transferred.
+285: You've become the party leader.
+286: There's been no change in the setting.
+//Missing stuff for @killer related commands.
+287: Killer state reset
+288: You are no longer killable
+289: The player is now killable
+290: The player is no longer killable
+291: Weather effects will dispell on warp/refresh
+// Guild Castles Number
+// --------------------
+299: ?? Castles
+300: None Taken
+301: One Castle
+302: Two Castles
+303: Three Castles
+304: Four Castles
+305: Five Castles
+306: Six Castles
+307: Seven Castles
+308: Eight Castles
+309: Nine Castles
+310: Ten Castles
+311: Eleven Castles
+312: Twelve Castles
+313: Thirteen Castles
+314: Fourteen Castles
+315: Fifteen Castles
+316: Sixteen Castles
+317: Seventeen Castles
+318: Eighteen Castles
+319: Nineteen Castles
+320: Twenty Castles
+321: Twenty One Castles
+322: Twenty Two Castles
+323: Twenty Three Castles
+324: Total Domination
+//alternative
+//324: Twenty Four Castles
+
+// Players Titles (for @who, etc commands, check battle_athena.conf for titles level setting)
+// Useful note: you may remove ':%d' from the line, then you will see only player title, w/o his level
+325: Super player:%d
+326: Super player+:%d
+327: Mediator:%d
+328: Sub-GM:%d
+329: Sub-GM+:%d
+330: GM:%d
+331: GM Chief:%d
+332: Administrator:%d
+// Templates for @who output
+333: Name: %s 
+334: (%s) 
+335: | Party: '%s' 
+336: | Guild: '%s'
+//You may ommit the last %s, then you won't see players job name
+337: | L:%d/%d | Job: %s
+//You may ommit 2 last %d, then you won't see players coords, just map name
+338: | Location: %s %d %d
+
+// @duel (part 1)
+350: Duel: You can't use @invite. You aren't a duellist.
+351: Duel: The limit of players is reached.
+352: Duel: Player name not found.
+353: Duel: The Player is in the duel already.
+354: Duel: Duel invitation has been sent.
+355: Duel: You can't use @duel without @reject.
+356: Duel: You can take part in duel once per %d minutes.
+357: Duel: Invalid value.
+358: Duel: You can't use @leave. You aren't a duellist.
+359: Duel: You've left the duel.
+360: Duel: You can't use @accept without a duel invitation.
+361: Duel: The duel invitation has been accepted.
+362: Duel: You can't use @reject without a duel invitation.
+363: Duel: The duel invitation has been rejected.
+364: Duel: You can't invite %s because he isn't on the same map. 
+// @duel (part 2)
+370:  -- Duels: %d/%d, Members: %d/%d, Max players: %d --
+371:  -- Duels: %d/%d, Members: %d/%d --
+372:  -- Duel has been created (Use @invite/@leave) --
+373:  -- Player %s invites %s to duel --
+374: Blue -- Player %s invites you to PVP duel (Use @accept/@reject) --
+375:  <- Player %s has left the duel --
+376:  -> Player %s has accepted the duel --
+377:  -- Player %s has rejected the duel --
+// Main chat
+380: Main chat has been activated.
+381: Main chat already activated.
+382: Main chat has been disabled.
+383: Main chat already disabled.
+384: Main chat is currently enabled. Usage: @main <on|off>, @main <message>.
+385: Main chat is currently disabled. Usage: @main <on|off>, @main <message>.
+386: Main@%s: %s
+387: You cannot use Main chat while muted.
+388: You should enable main chat with "@main on" command.
+//NoAsk
+390: Autorejecting is activated.
+391: Autorejecting is deactivated.
+392: You request has been rejected by autoreject option.
+393: Autorejected trade request from %s.
+394: Autorejected party invite from %s.
+395: Autorejected guild invite from %s.
+396: Autorejected alliance request from %s.
+397: Autorejected opposition request from %s.
+398: Autorejected friend request from %s.
+400: Usage: @jailfor <time> <character name>
+401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes
+402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
+
+// Homunculus messages
+450: You already have an homunculus
+
+// Messages of others (not for GM commands)
+// ----------------------------------------
+
+500: Night Mode is already active
+501: Your account time limit is: %d-%m-%Y %H:%M:%S.
+502: Day Mode is Activated
+503: Night Mode is Activated
+
+//Supernovice's Guardian Angel
+//actually.. new client msgtxt file contains these 3 lines... [Lupus]
+//----------------------------
+504: Guardian Angel, can you hear my voice? ^^;
+505: My name is %s, and I'm a Super Novice~
+506: Please help me~ T.T
+
+// Trade Spoof Messages
+507: This player has been banned for %d minute(s).
+508: This player hasn't been banned (Ban option is disabled).
+//509 Available....
+
+//mail system
+//----------------------
+510: You have no messages.
+511: %d - From : %s (New - Priority)
+512: %d - From : %s (New)
+513: %d - From : %s
+514: You have %d new messages.
+515: You have %d unread priority messages.
+516: You have no new messages.
+517: Message not found.
+518: Reading message from %s.
+519: Cannot delete unread priority mail.
+520: You have recieved new mail, use @listmail before deleting.
+521: Message deleted.
+522: You must wait 10 minutes before sending another message.
+523: Access Denied.
+524: Character does not exist.
+525: Mail has been sent.
+526: You have new mail.
+
+// Bot detect messages (currently unused)
+535: Possible use of BOT (99%% of chance) or modified client by '%s' (account: %d, char_id: %d). This player ask your name when you are hidden.
+
+536: Character '%s' (account: %d) try to use a bot (it tries to detect a fake player).
+537: Character '%s' (account: %d) try to use a bot (it tries to detect a fake mob).
+// Trade Spoof Messages
+538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
+539: This player has %d of a kind of item (id: %d), and try to trade %d of them.
+540: This player has been definitivly blocked.
+// Rare Items Drop/Steal announce
+541: '%s' won %s's %s (chance: %0.02f%%)
+//541: %.0s%.0sSomeone won %s
+542: '%s' stole %s's %s (chance: %0.02f%%)
+//542: %.0s%.0sSomeone stole %s
+// @Away message bits
+543: (Automessage has been sent)
+544: Away [AT] - "%s"
+545: Away - "%s"
+546: Away automessage has been activated.
+547: Away automessage has been disabled.
+548: Usage: @away,@aw <message>. Enter empty message for disable it.
+// @Autotrade
+549: You should be vending to use @Autotrade.
+
+//550 -> 650: Job Names
+550: Novice
+551: Swordsman
+552: Mage
+553: Archer
+554: Acolyte
+555: Merchant
+556: Thief
+557: Knight
+558: Priest
+559: Wizard
+560: Blacksmith
+561: Hunter
+562: Assassin
+563: Crusader
+564: Monk
+565: Sage
+566: Rogue
+567: Alchemist
+568: Bard
+569: Dancer
+570: Wedding
+571: Super Novice
+572: Gunslinger
+573: Ninja
+574: Christmas
+575: High Novice
+576: High Swordsman
+577: High Mage
+578: High Archer
+579: High Acolyte
+580: High Merchant
+581: High Thief
+582: Lord Knight
+583: High Priest
+584: High Wizard
+585: Whitesmith
+//585: Mastersmith //IRO name
+586: Sniper
+587: Assassin Cross
+588: Paladin
+589: Champion
+590: Professor
+//590: Scholar //IRO name
+591: Stalker
+592: Creator
+//592: Biochemist //IRO Name
+593: Clown
+//593: Minstrel //IRO Name
+594: Gypsy
+595: Baby Novice
+596: Baby Swordsman
+597: Baby Mage
+598: Baby Archer
+599: Baby Acolyte
+600: Baby Merchant
+601: Baby Thief
+602: Baby Knight
+603: Baby Priest
+604: Baby Wizard
+605: Baby Blacksmith
+606: Baby Hunter
+607: Baby Assassin
+608: Baby Crusader
+609: Baby Monk
+610: Baby Sage
+611: Baby Rogue
+612: Baby Alchemist
+613: Baby Bard
+614: Baby Dancer
+615: Super Baby
+616: Taekwon
+617: Star Gladiator
+618: Soul Linker
+//...
+650: Unknown Job
+
+//Custom translations
+import: conf/import/msg_conf.txt
diff --git a/conf-tmpl/packet_athena.conf b/conf-tmpl/packet_athena.conf
index 6f5a1ac2f..d654a0e35 100644
--- a/conf-tmpl/packet_athena.conf
+++ b/conf-tmpl/packet_athena.conf
@@ -1,57 +1,57 @@
-// Athena sockets Configuration file

-// translated (davidsiaw)

-

-

-// Display debug reports (iWhen something goes wrong during the report, the report is saved.)

-debug: no

-

-// How long can a socket stall before closing the connection (in seconds)

-stall_time: 60

-

-// When enabled, sets TCP_NODELAY (disable nagel Algorythm) on all connections

-mode_neg: yes

-

-// frame packet size as considered by the server (when there's enough

-// information in queue to fill the frame_size, a "send" is forced)

-//frame_size: 1054

-

-//----- IP Rules Settings -----

-

-// Do we check IP's before allowing incoming connections?

-enable_ip_rules: yes

-

-// Decide the order of access restriction (Same as apache?)

-// deny,allow Is the standard

-

-order: deny,allow

-// order: allow,deny

-// order: mutual-failture

-

-// The IP list which it uses to access controls

-//   allow    : Allows access regardless of permissions

-//   deny     : Completely disallow

-//   指定無し : If the permission check encounters mutual-failure(whatever that means) it will disallow access

-

-// allow: 127.0.0.1

-// allow: 192.168.0.0/16

-// allow: 10.0.0.0/255.0.0.0

-allow: all

-

-// deny: 127.0.0.1

-

-

-//---- Ddos Protection Settings ----

-//     If there is a connection request within ddos_interval msec for ddos_count number of times, it will assume it is a ddos attack

-

-// Consecutive intervals(msec)

-ddos_interval: 3000

-

-// Connection frequency

-ddos_count: 5

-

-// The time interval after which the threat of ddos is assumed to be gone

-// After this amount of time, the ddos restrictions are lifted.

-ddos_autoreset: 600000

-

-

-//import: conf/import/packet_conf.txt

+// Athena sockets Configuration file
+// translated (davidsiaw)
+
+
+// Display debug reports (iWhen something goes wrong during the report, the report is saved.)
+debug: no
+
+// How long can a socket stall before closing the connection (in seconds)
+stall_time: 60
+
+// When enabled, sets TCP_NODELAY (disable nagel Algorythm) on all connections
+mode_neg: yes
+
+// frame packet size as considered by the server (when there's enough
+// information in queue to fill the frame_size, a "send" is forced)
+//frame_size: 1054
+
+//----- IP Rules Settings -----
+
+// Do we check IP's before allowing incoming connections?
+enable_ip_rules: yes
+
+// Decide the order of access restriction (Same as apache?)
+// deny,allow Is the standard
+
+order: deny,allow
+// order: allow,deny
+// order: mutual-failture
+
+// The IP list which it uses to access controls
+//   allow    : Allows access regardless of permissions
+//   deny     : Completely disallow
+//   指定無し : If the permission check encounters mutual-failure(whatever that means) it will disallow access
+
+// allow: 127.0.0.1
+// allow: 192.168.0.0/16
+// allow: 10.0.0.0/255.0.0.0
+allow: all
+
+// deny: 127.0.0.1
+
+
+//---- Ddos Protection Settings ----
+//     If there is a connection request within ddos_interval msec for ddos_count number of times, it will assume it is a ddos attack
+
+// Consecutive intervals(msec)
+ddos_interval: 3000
+
+// Connection frequency
+ddos_count: 5
+
+// The time interval after which the threat of ddos is assumed to be gone
+// After this amount of time, the ddos restrictions are lifted.
+ddos_autoreset: 600000
+
+
+//import: conf/import/packet_conf.txt
diff --git a/conf-tmpl/plugin_athena.conf b/conf-tmpl/plugin_athena.conf
index 1d7cbbd62..c4b889da8 100644
--- a/conf-tmpl/plugin_athena.conf
+++ b/conf-tmpl/plugin_athena.conf
@@ -1,29 +1,29 @@
-// Athena Plugins Configuration file

-

-// Should we auto search for plugin files and load them?

-// If set to 'yes' you will not need to set 'plugin:' commands

-// in this conf file to load them

-auto_search: no

-

-//------Plugins List -----------

-

-// Just a sample plugin

-//plugin: sample

-

-// UPnP core plugin

-plugin: upnp

-

-// GUI core plugin

-//plugin: gui

-

-// Crash and Uptime reporting for CygWin/Linux

-//plugin: sig

-

-// Crash reporting for Windows

-//plugin: exchndl

-

-// Process id logging

-//plugin: pid

-

-// Built-in webserver

+// Athena Plugins Configuration file
+
+// Should we auto search for plugin files and load them?
+// If set to 'yes' you will not need to set 'plugin:' commands
+// in this conf file to load them
+auto_search: no
+
+//------Plugins List -----------
+
+// Just a sample plugin
+//plugin: sample
+
+// UPnP core plugin
+plugin: upnp
+
+// GUI core plugin
+//plugin: gui
+
+// Crash and Uptime reporting for CygWin/Linux
+//plugin: sig
+
+// Crash reporting for Windows
+//plugin: exchndl
+
+// Process id logging
+//plugin: pid
+
+// Built-in webserver
 //plugin: httpd
\ No newline at end of file
diff --git a/conf-tmpl/readme.txt b/conf-tmpl/readme.txt
index 6b0ddd2ac..db8777680 100644
--- a/conf-tmpl/readme.txt
+++ b/conf-tmpl/readme.txt
@@ -1,33 +1,33 @@
-What is the import folder for?

-

-Most people don't know the real use of the import folder. After you do, you will wonder 

-what you ever did without it.

-

-The main thing it does, is provide a way for you to change your config settings without

-having to update the files every time you update your server. You store your changes, and 

-the rest are updated with eA (usually though SVN).

-

-How does this work?

-

-Well, you place only the settings you have changed in the import files. I'll use 

-battle_athena.conf and battle_conf.txt for my example. Everytime you update you conf 

-folder, using the normal method, you have to go and edit the configs again. So, you have to

-redo your rates, redo your ip addresses, you have to redo it all. Well, not with the import

-system.

-

-Say you want to change your base experience rate from the default (100)to 7x (700). Well 

-then you would place this in your import/battle_conf.txt:

-

-// Rate at which exp. is given. (Note 2)

-base_exp_rate: 700

-

-You don't need the comment (duh, it's a commnet), but I usually leave them for clarity 

-sake.

-

-So, now this new setting take place over the setting in battle_athena.conf. You just keep 

-this file everytime you update, and your setting will always be there. Neat, isn't it?

-

-So, yeah, that's what the import folder is for. I hope to see a lot more people use it, to 

-make my life as a managed server runer better.

-

+What is the import folder for?
+
+Most people don't know the real use of the import folder. After you do, you will wonder 
+what you ever did without it.
+
+The main thing it does, is provide a way for you to change your config settings without
+having to update the files every time you update your server. You store your changes, and 
+the rest are updated with eA (usually though SVN).
+
+How does this work?
+
+Well, you place only the settings you have changed in the import files. I'll use 
+battle_athena.conf and battle_conf.txt for my example. Everytime you update you conf 
+folder, using the normal method, you have to go and edit the configs again. So, you have to
+redo your rates, redo your ip addresses, you have to redo it all. Well, not with the import
+system.
+
+Say you want to change your base experience rate from the default (100)to 7x (700). Well 
+then you would place this in your import/battle_conf.txt:
+
+// Rate at which exp. is given. (Note 2)
+base_exp_rate: 700
+
+You don't need the comment (duh, it's a commnet), but I usually leave them for clarity 
+sake.
+
+So, now this new setting take place over the setting in battle_athena.conf. You just keep 
+this file everytime you update, and your setting will always be there. Neat, isn't it?
+
+So, yeah, that's what the import folder is for. I hope to see a lot more people use it, to 
+make my life as a managed server runer better.
+
 Semi-guide by Ajarn
\ No newline at end of file
diff --git a/conf-tmpl/script_athena.conf b/conf-tmpl/script_athena.conf
index f0582c401..939d04e11 100644
--- a/conf-tmpl/script_athena.conf
+++ b/conf-tmpl/script_athena.conf
@@ -1,74 +1,74 @@
-//      ______  __    __                                 

-//     /\  _  \/\ \__/\ \                                

-//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     

-// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   

-///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 

-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\

-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/

-//  _   _   _   _   _   _   _     _   _   _   _   _   _

-// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 

-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )

-// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/

-//

-//--------------------------------------------------------

-// eAthena Script Configuration File

-//--------------------------------------------------------

-

-

-// When choosing those which it refines setting the letter which is indicated. (Those for word use other than Japanese?)

-refine_posword: Head,Body,Left hand,Right hand,Robe,Shoes,Accessory 1,Accessory 2,Head 2,Head 3,Not Equipped

-

-//If you are getting crashes during script loading, you can set this to yes 

-//to find out which script causes it. Otherwise leave it as no since the amount

-//of extra console output is staggering.

-verbose_mode: no

-

-warn_func_no_comma: yes

-

-warn_cmd_no_comma: yes

-

-warn_func_mismatch_paramnum: yes

-

-warn_cmd_mismatch_paramnum: yes

-

-check_cmdcount: 655360

-

-check_gotocount: 2048

-

-

-//---- Custom script functions ----

-

-// 0 - Event script is defined as an NPC by itself

-// 1 - Event script can be called by script label

-event_script_type: 0

-

-// For events to be activated do we require

-// a 'set [EventName],1;' to be called first?

-event_requires_trigger: no

-

-// Name of event when a player has died

-die_event_name: OnPCDieEvent

-

-// Name of event when a player kills a player

-kill_pc_event_name: OnPCKillEvent

-

-// Name of event when a player kills a monster

-kill_mob_event_name: OnNPCKillEvent

-

-// Name of event when a player logs out

-logout_event_name: OnPCLogoutEvent

-

-// Name of event when a player logs in

-login_event_name: OnPCLoginEvent

-

-// Name of event when a player changes map

-// NOTE: This event will only trigger on maps with the "loadevent" flag active.

-loadmap_event_name: OnPCLoadMapEvent

-

-// Name of event when a player levels up (base lv)

-baselvup_event_name: OnPCBaseLvUpEvent

-

-// Name of event when a player levels up (job lv)

-joblvup_event_name: OnPCJobLvUpEvent

-

-import: conf/import/script_conf.txt

+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------
+// eAthena Script Configuration File
+//--------------------------------------------------------
+
+
+// When choosing those which it refines setting the letter which is indicated. (Those for word use other than Japanese?)
+refine_posword: Head,Body,Left hand,Right hand,Robe,Shoes,Accessory 1,Accessory 2,Head 2,Head 3,Not Equipped
+
+//If you are getting crashes during script loading, you can set this to yes 
+//to find out which script causes it. Otherwise leave it as no since the amount
+//of extra console output is staggering.
+verbose_mode: no
+
+warn_func_no_comma: yes
+
+warn_cmd_no_comma: yes
+
+warn_func_mismatch_paramnum: yes
+
+warn_cmd_mismatch_paramnum: yes
+
+check_cmdcount: 655360
+
+check_gotocount: 2048
+
+
+//---- Custom script functions ----
+
+// 0 - Event script is defined as an NPC by itself
+// 1 - Event script can be called by script label
+event_script_type: 0
+
+// For events to be activated do we require
+// a 'set [EventName],1;' to be called first?
+event_requires_trigger: no
+
+// Name of event when a player has died
+die_event_name: OnPCDieEvent
+
+// Name of event when a player kills a player
+kill_pc_event_name: OnPCKillEvent
+
+// Name of event when a player kills a monster
+kill_mob_event_name: OnNPCKillEvent
+
+// Name of event when a player logs out
+logout_event_name: OnPCLogoutEvent
+
+// Name of event when a player logs in
+login_event_name: OnPCLoginEvent
+
+// Name of event when a player changes map
+// NOTE: This event will only trigger on maps with the "loadevent" flag active.
+loadmap_event_name: OnPCLoadMapEvent
+
+// Name of event when a player levels up (base lv)
+baselvup_event_name: OnPCBaseLvUpEvent
+
+// Name of event when a player levels up (job lv)
+joblvup_event_name: OnPCJobLvUpEvent
+
+import: conf/import/script_conf.txt
diff --git a/conf-tmpl/subnet_athena.conf b/conf-tmpl/subnet_athena.conf
index 5308ffbda..e91fb7376 100644
--- a/conf-tmpl/subnet_athena.conf
+++ b/conf-tmpl/subnet_athena.conf
@@ -1,6 +1,6 @@
-// Subnet support file

-// Format is:

-// subnet: net-submask:char_ip:map_ip

-// you can add more than one subnet 

-

-subnet: 255.0.0.0:127.0.0.1:127.0.0.1

+// Subnet support file
+// Format is:
+// subnet: net-submask:char_ip:map_ip
+// you can add more than one subnet 
+
+subnet: 255.0.0.0:127.0.0.1:127.0.0.1