* Limited manual detection of data truncation to string/enum/blob columns.

* Renamed conf-tmpl to conf.

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

72 files changed, 8922 insertions, 0 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
new file mode 100644
index 000000000..6ce0bcd9e
--- /dev/null
+++ b/conf/Changelog.txt
@@ -0,0 +1,375 @@
+Date	Added
+
+2007/09/18
+	* Rev. 11241 Added new maps to maps_athena.conf, and corresponding mapflags. [L0ne_W0lf]
+	- Also added several missing maps, and cloned maps.
+2007/09/17
+	* Added missing force_4-1 and force_5-1 maps to the map list [ultramage]
+2007/09/13
+	* Trigger rate Miracle of the Sun, Moon and Stars is now 0.02% [Skotlex]
+2007/09/10
+	* Added 'quest_exp_rate', adjusts exp gained by 'getexp' [ultramage]
+2007/09/05
+	* Added 'nomemo' mapflags to some Cursed Abbey maps [Playtester]
+2007/08/19
+	* Added 'noteleport' mapflags to Dandelion's request maps. [SinSloth]
+	* Fixed small mistake in confs causing some confusion [Paradox924X]
+2007/08/15
+	* Removed useless 'party_skill_penalty' config option
+	* Removed 'Note 3' & 'Other information' since it doesn't apply anymore
+2007/07/28
+	* Removed useless refine_posword setting from script_athena.conf
+2007/07/25
+	* Adjusted motd.txt to not crash new clients
+	* Removed backup_txt code since it's not needed anymore
+2007/07/20
+	* Adjusted client.conf's packetver table (latest now uses new value)
+2007/07/18
+	* Added delay_dependon_agi, both options are available now [ultramage]
+2007/06/10
+	* Rev. 10744 Fixed nopvp mapflag entry for mosk_in. [L0ne_W0lf]
+2007/06/08
+	* Added Moscovia maps into mapflags [Lupus]
+2007/06/06
+	* Added Moscovia maps in the map index [Lupus]
+2007/06/01
+	* Rev. 10701 Updated nowarpto map flags for Rachel quest maps. [L0ne_W0lf]
+2007/06/01
+	* Rev. 10663 Updated map flags for Rachel quest maps. [L0ne_W0lf]
+2007/05/23
+	* Reverted delay_dependon_agi -> delay_dependon_dex
+2007/05/19
+	* Enhanced log_athena.conf with global/main chat support [ultramage]
+	- also changed the filter bit values, please reconfigure this option
+2007/04/27
+	* Can't teleport in kh_dun01 [Playtester]
+	* You can now teleport in jupe_core [Playtester]
+2007/04/24
+	* monster_ai&0x400 disables all mob-casted skills having a range of 9
+	  (monster.conf) [Skotlex]
+2007/04/23
+	* Debuff on logout&2 is again set to default, instead of removing food
+	  bonuses now it removes Maximize Power, Maximum Overthrust and Steel Body.
+2007/04/16
+	* Changed the default setting for emergency_call to 11 (usable all the
+	  time, but only in Gvg Maps) as described by Tharis (skill.conf). [Skotlex]
+2007/04/13
+	* Added some Kiel quest mapflags [Playtester]
+	* Added debug command @displayskill. Should be used only by people
+	  searching for new skill IDs. [Skotlex]
+2007/04/12
+	* Updated various mapflags with 11.2 maps [Playtester]
+2007/04/11
+	* The pc_max_status_def and mob_max_status_def configs are now set on a
+	  1-100 scale instead of 1-10000 (status.conf)
+2007/04/03
+	* Added hom_setting&0x40, when set it clears the "can't reuse" skill delay
+	  when you vaporize a homunculus (set by default). [Skotlex]
+2007/04/02
+	* Set the default vending tax to 2% as it is in kRO Sakray [Playtester]
+2007/03/28
+	* Added config "vending_tax" to apply a tax to all vending requests, as it
+	  was in kRO Sakray some time ago (items.conf).
+2007/03/22
+	* Made packet_ver_flag's description use hexadecimal values for the packet
+	  versions, and changed the default to 0xFFFF. [Skotlex]
+2007/03/19
+	* Removed the 'charsave_method' setting from inter_athena.conf
+2007/03/17
+	* Cleaned up the login & char config [ultramage]
+	- removed check_ip_flag
+	- changed date_format to input the format string directly
+	- changed many settings to allow yes/no instead of just 1/0
+	* Removed .gat from configs [Lupus]
+2007/03/14
+	* Changed the default of debuff_on_logout to 1 since food items shouldn't
+	  dispell on logout. [Skotlex]
+2007/03/08
+	* Adjustments for the new mapcache [DracoRPG]
+	- Removed ".gat" from map names in maps_athena.conf
+	- Removed read_map_from_cache option as there's no more choice to do
+	- Removed afm_dir option as there's no more need for AFM/AF2 support
+2007/03/06
+	* Added the two new packet versions to battle/client.conf [Zephiris]
+2007/03/05
+	* Removed mode_neg and frame_size from packet_athena.conf [ultramage]
+2007/02/16
+	* Collapsed config settings "sg_miracle_skill_min_duration" and
+	  "sg_miracle_skill_max_duration" into "sg_miracle_skill_duration", which
+	  defaults to an hour (skill.conf).
+2007/02/12
+	* Corrected the meaning of "skill_display_fail&2", made 2 the default
+	  setting. [Skotlex]
+2007/02/08
+	* Since the mysql ping interval is now autoconfigured, removed
+	the connection_ping_interval config setting in inter_athena.conf
+2007/02/01
+	* Improved a bit the description of the mvp item get time config settings.
+2007/01/29
+	* Collapsed config settings produce_item_name_input,
+	  produce_potion_name_input, making_arrow_name_input, holywater_name_input,
+	  cdp_name_input into a single config produce_item_name_input which uses
+	  bitmasks to determine what it affects. See battle/item.conf for details.
+	* Updated arrow_decrement to have 3 possible values: Disabled, Enabled, and
+	  Enabled + Autoguess (gives arrow consumption as appropiate to
+	  plagiarized/acquired skills). eA previously had a hardcoded '2' setting,
+	  now it's 1 by default as it should be. [Skotlex]
+2007/01/28
+	* Fixed the description of @summon
+	* Fixed @nuke's position (I edited the wrong file by accident)
+2007/01/27
+	* Atcommand fixup [ultramage]
+	- removed atcommands @w, @server_date/time, @red, @happyhappyjoyjoy, @shuffle
+	- synced gm level of @jailfor, @charjailtime, @npcmove, @chardropall,
+	  @charstoreall, @send, @mute, @changelook, @exp and @nuke
+	- added conf entries for @whozeny, @kamic, @tonpc, @petid, @identify, @adopt,
+	  @trade, @changelook, @send
+	- reorganized the atcommands a bit
+2007/01/26
+	* Added battle config hom_rename (homunc.txt) to enable renaming the
+	  homunculus multiple times. Defaults to no.
+2007/01/22
+	* Moved the homunculus setting from pet.conf to homunc.conf [Skotlex]
+2007/01/12
+	* Updated the information about ip rules and DDoS protection in 
+	  packet_athena.conf and commented out the line "allow: all" so 
+	  connections are rejected when a DDoS is detected. [FlavioJS]
+2007/01/08
+	* Added the console plugin to plugin_athena.conf commented out. [FlavioJS]
+2007/01/05
+	* Updated noicewall mapflags (to allow them in cities), thanks to Au{R}oN
+2007/01/03
+	* Changed friend_auto_add to 'yes' (closer to official, except for one detail)
+	* Changed monster_class_change_full_recover to 'yes' (official) [ultramage]
+2006/12/20
+	* Fixed the meaning of stdout_with_ansisequence and changed the default 
+	  value to no. [FlavioJS]
+2006/12/18
+	* Added hom_setting to specify which homunculus 'quirks' are in effect. The
+	  default activates all of them, if you set them to 0 then homuncs will not
+	  be treated in any special matter, pretty much like standard mobs. if I
+	  missed any 'quirky' homunc behaviour from it, report it so it can be added
+	  to the list (This setting was added to pet.conf).
+	* flooritem_lifetime now accepts a much higher max value (previously it was
+	  65k when the default was 60k)
+	* Removed monster_ai 0x80 since it's now handled by hom_setting.
+2006/12/12
+	* Added monster_ai&0x400 to use the previous 'smart' criteria that prevents
+	  mobs from fighting each another, since now they are all natural enemies
+	  of each another. [Skotlex]
+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/GM_account.txt b/conf/GM_account.txt
new file mode 100644
index 000000000..e49f9df16
--- /dev/null
+++ b/conf/GM_account.txt
@@ -0,0 +1,10 @@
+// eAthena's GM Accounts File (for TXT servers only)
+// 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
+// 2000001 30
diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
new file mode 100644
index 000000000..183278246
--- /dev/null
+++ b/conf/atcommand_athena.conf
@@ -0,0 +1,764 @@
+// 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
+
+// Enables/disables autolooting from killed mobs.
+autoloot: 1
+
+// Allows you continue vending offline.
+autotrade: 1
+at: 1
+
+// Away messsage
+away: 1
+aw: 1
+
+// Change Guild Master of your Guild
+changegm: 1
+
+// Change the leader of your party.
+changeleader: 1
+
+//Displays a list of @ commands available to the player.
+commands: 1
+
+// Duel organizing commands
+duel: 1
+invite: 1
+accept: 1
+reject: 1
+leave: 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
+
+//Displays current levels and % progress.
+exp: 1
+
+//Homunculus commands for players
+homtalk: 1
+hominfo: 1
+
+// Show Item info (type, price, etc)
+iteminfo: 1
+ii: 1
+
+// Displays remaining jail time
+jailtime: 1
+
+// Main chat
+main: 1
+
+// Displays the text as a normal message with the format "*name message*" 
+// instead of "name : message" (Like the /me command in IRC)
+me: 1
+
+// Saves a warp point.
+memo: 1
+
+// Show Monster info (rates, stats, drops, MVP stuff)
+mobinfo: 1
+monsterinfo: 1
+mi: 1
+
+// Autorejecting Deals/Invites
+noask: 1
+
+//Create a party
+party: 1
+
+// Change the party item share rules.
+partyoption: 1
+
+// Enables you to rename your pet.
+petrename: 1
+
+// Command what the player's pet will say.
+pettalk: 1
+
+//Displays the server rates.
+rates: 1
+
+// Syncs the position of the player on the client with the one stored in the server.
+refresh: 1
+
+// Sends a request to all connected GMs (via the gm whisper system)
+request: 1
+
+//Shows/Hides the "there is a delay after a skill" message.
+showdelay: 1
+
+//Displays/Hides Experience gained
+showexp: 1
+
+//Displays/Hides Zeny gained
+showzeny: 1
+
+// Give server time. (6 same commands)
+time: 1
+date: 1
+server_date: 1
+serverdate: 1
+server_time: 1
+servertime: 1
+
+// Show server uptime
+uptime: 1
+
+// Displays SVN version of the server.
+version: 1
+
+// Show who drops an item (mobs with highest drop rate)
+whodrops: 1
+
+//---------------------------------------------------------------
+// 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
+
+//---------------------------
+// 10: Super player+ commands
+
+// Suicide your character.
+die: 10
+
+// Spawns you to set points in major cities.
+go: 10
+
+// Brings up your guild storage wherever you are.
+gstorage: 10
+
+// Create a guild
+guild: 10
+
+// Brings up your personal storage wherever you are.
+storage: 10
+
+// Locate someone on a map, returns your coordinates if the person isn't on.
+where: 10
+
+// Locates and displays the position of a certain mob on the current map.
+mobsearch: 10
+
+// Changes your apperance.
+model: 10
+
+// Locates and displays the position of a certain mob on your mini-map
+showmobs: 10
+
+// Prints out in which maps a monster normally spawns at (does not count script-invoked mobs)
+whereis: 10
+
+// Changes your size.
+size: 10
+
+//----------------------
+// 20: Mediator commands
+
+// Change your appearence to other players to a mob.
+disguise: 20
+
+// Changes GM clothes color (2 same commands)
+dye: 20
+ccolor: 20
+
+// Do some visual effect on your character
+effect: 20
+
+// Changes your name to your choice temporarly.
+fakename: 20
+
+// follow a player (including warping to them)
+follow: 20
+
+// Displays the motd file to all players
+gmotd: 20
+
+// Displays helpfile in Athena base directory (2 same commands).
+help: 20
+h: 20
+help2: 20
+h2: 20
+
+// Changes GM hair color (2 same commands)
+haircolor: 20
+hcolor: 20
+
+// Changes GM hair style (2 same commands)
+hairstyle: 20
+hstyle: 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)
+jumptoid2: 20
+gotoid2: 20
+warptoid2: 20
+
+// allow other players to hit you out of pvp
+killable: 20
+
+// To get a peco to (un)ride
+mountpeco: 20
+
+// Can command what other npcs (by name) can say.
+npctalk: 20
+
+// Sets the speed you can walk/attack at. Default is 150.
+speed: 20
+
+//Restore your normal appearance.
+undisguise: 20
+
+// Displays distribution of players on the server per map (% on each map which has players)
+users: 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
+
+// Displays GMs online. For those who are higher GM level than yourself,
+// only the name is shown, for the rest, it displays the same info of
+// @who+@who2+who3
+whogm: 20
+
+//--------------------
+// 40: Sub-GM commands
+
+
+// Resurects yourself.
+alive: 40
+
+// Levels your character to specified level (adds to your level) (3 same commands).
+blvl: 40
+blevel: 40
+baselvl: 40
+baselevel: 40
+
+// Broadcast to the whole server. Using (1 command + /nb, /b).
+broadcast: 40
+
+// Changes the sex of yourself
+changesex: 40
+
+// Deletes floor items in your range of sight
+cleanmap: 40
+
+// drop all your items
+dropall: 40
+
+//Hatches an egg
+hatch: 60
+
+// Heals yourself to full HP/SP.
+heal: 40
+
+// GM Hide (enables you to be invisible to characters, and most monsters) (1 command + /hide).
+hide: 40
+
+//Homunculus commands for gms
+homlvup: 40
+homevolution: 40
+makehomun: 40
+homfriendly: 40
+homhungry: 40
+
+// Deletes all your items.
+itemreset: 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
+
+// Broadcast (with or without name).
+kami: 40
+kamib: 40
+
+// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
+kick: 40
+
+// Disconnects a user from the server using their PID.
+kickid2: 40
+
+// Kill all monsters in map (without drops)
+killmonster2: 40
+
+// Warps you to your last save point (2 same commands).
+load: 40
+return: 40
+
+// Broadcast to the map you are on (1 command + /lb, /nlb).
+localbroadcast: 40
+
+// To send specified character in jails
+jail: 40
+
+// To discharge a prisoner (2 same commands)
+unjail: 40
+discharge: 40
+
+// Timed jailing
+jailfor: 40
+
+// Raises your job level (3 same commands).
+jlvl: 40
+jlevel: 40
+joblvl: 40
+joblevel: 40
+
+// Creates yourself a pet egg, have to use Pet ID.
+makeegg: 60
+
+// Warp yourself to a certain map, at (x,y) coordinates (2 same commands). /mm or /mapmove
+mapmove: 40
+rura: 40
+warp: 40
+
+// Marriage skills
+marry: 40
+divorce: 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
+
+// Permanently adds/removes a quest skill
+questskill: 40
+lostskill: 40
+
+// Does a skill/stat reset.
+reset: 40
+
+// Sets your spawn point (aka save point).
+save: 40
+
+// look up a skill by name
+skillid: 40
+
+// What skills are required to get this skill
+skilltree: 40
+
+// Play a Sound!
+sound: 40
+
+// Enables spirit sphere balls.
+spiritball: 40
+
+// Change Status of your character
+str: 40
+agi: 40
+vit: 40
+int: 40
+dex: 40
+luk: 40
+
+// Gets all skills (4 same commands)
+allskill: 40
+allskills: 40
+skillall: 40
+skillsall: 40
+
+// sets GM stats to maximum (4 same commands)
+statall: 40
+statsall: 40
+allstats: 40
+allstat: 40
+
+// Gives you job points.
+stpoint: 40
+
+// Gives you skill points of desired amount.
+skpoint: 40
+
+// store all your items
+storeall: 40
+
+// use a skill by id
+useskill: 40
+
+//---------------------
+// 50: Sub-GM+ commands
+
+// Spawns a monster, and a certain amount (3 same commands + /monster).
+spawn: 50
+monster: 50
+summon: 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
+
+// Create a static warp portal that lasts until the next reboot
+addwarp: 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
+
+// Levels your guild to specified level (2 same commands).
+guildlvup: 60
+guildlvlup: 60
+
+// Warps all online character of a guild to you. (at least one member of that guild must be on.)
+guildrecall: 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
+
+// Find an itemID based on item name
+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.
+killid2: 60
+
+// Kill all monsters in map (with drops)
+killmonster: 60
+
+// Enable hitting a player even when not in pvp
+killer: 60
+
+// Mute a player (prevents talking, usage of skills and commands)
+mute: 80
+
+// 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 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
+
+// Creates weapon of desired element.
+produce: 60
+
+// Turns PVP (Person v. Person) off on a map.
+pvpoff: 60
+
+// Enables PVP on a map.
+pvpon: 60
+
+// Warps a character to you (1 command + /recall).
+recall: 60
+
+// Warps a character to you using their PID.
+recallid2: 60
+
+// Refines all weapons in your items list.
+refine: 60
+
+// Will repair all broken items in inventory.
+repairall: 60
+
+// Revives a character using their PID.
+reviveid2: 60
+
+// Unmute a player
+unmute: 60
+
+// Gives you money (zeny) of desired amount.
+zeny: 60
+
+//----------------------
+// 80: GM Chief commands
+
+// Starts Guild Wars
+agitstart: 60
+
+// Ends Guild Wars
+agitend: 60
+
+// Set the map you are on to day.
+day: 80
+
+// [Un]Disguise All Players (admin command)
+disguiseall: 99
+undisguiseall: 99
+
+// Kills everyone on the server.
+doom: 80
+
+// Kills everyone on the map you are on.
+doommap: 80
+
+// 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
+
+// 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
+
+//---------------------------
+// 99: Administrator commands
+
+// Changes the required GM level of an @ command
+// (effect lasts until restart or command reload)
+adjcmdlvl: 99
+
+// Changes the GM level of another character
+// (lasts until reboot, or gm list reload)
+adjgmlvl: 99
+
+// Give information about terrain/area (debug function)
+gat: 99
+
+// Disconnect all users from the server
+kickall: 99
+
+// Closes Map-Server
+mapexit: 99
+
+// Displays a status change without really applying it (debug function)
+displaystatus: 99
+
+// Displays the animation of a skill without really using it (debug function)
+displayskill: 99
+
+// Shows information about the map
+mapinfo: 99
+
+// Set Map Flags (WIP)
+mapflag: 99
+
+// Mutes every player on screen (admin command)
+mutearea: 99
+stfu: 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
+
+// Refresh online status of players - SQL Only
+refreshonline: 99
+
+// Re-load gm command config (admin command)
+reloadatcommand: 99
+
+// Re-load battle config (admin command)
+// Note that some player config settings won't take effect until relog
+// (display exp, display zeny, display skill delay fail, ...)
+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
+
+// Used for testing packet sends from the client (debug function)
+send: 99
+
+// change a battle_config flag without rebooting server
+setbattleflag: 99
+
+// Makes you immune 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
+
+//---------------------------------------------------------------
+// 100: Disabled commands
+gm: 100
+nuke: 100
+
+
+//---------------------
+// OTHER: not a command
+
+import: conf/import/atcommand_conf.txt
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf
new file mode 100644
index 000000000..9c0f708fd
--- /dev/null
+++ b/conf/battle/battle.conf
@@ -0,0 +1,164 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// Who should have a baseatk value (makes str affect damage)? (Note 3)
+enable_baseatk: 9
+
+// Who can have perfect flee? (Note 3)
+enable_perfect_flee: 1
+
+// Who can have critical attacks? (Note 3)
+// (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
+
+// Should race or element be used to consider someone undead?
+// 0 = element undead
+// 1 = race undead
+// 2 = both (either one works)
+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 3)
+// 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 3)
+// 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‚same as above....(MDEF*value)
+magic_defense_type: 0
+
+// How to count the number of attackers when applying agi penalty ? (choose one)
+// 1-: Count every attack attempt (even those that were dodged/lucky-dodged)
+// 2 : Count every non-lucky-dodged attack attempt
+// 3 : Count only attacks that actually connect
+// 4+: None of the above, count will always be 0
+agi_penalty_count_lv: 2
+
+// How to count the number of attackers when applying vit penalty ? (choose one)
+// 1-: Count every attack attempt (even those that were dodged/lucky-dodged)
+// 2 : Count every non-lucky-dodged attack attempt
+// 3 : Count only attacks that actually connect
+// 4+: None of the above, count will always be 0
+vit_penalty_count_lv: 3
+
+// Change attacker's direction to face opponent on every attack? (Note 3)
+attack_direction_change: 15
+
+// For those who is set, attacks of Neutral element will not get any elemental
+// adjustment (100% versus on all defense-elements) (Note 3)
+// NOTE: This is the setting that makes it so non-players can hit for full
+// damage against Ghost-type targets (eg: Ghostring wearing players).
+attack_attr_none: 14
+
+// 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/ammo consumed when used on a bow/gun?
+// 0 = No
+// 1 = Yes
+// 2 = Yes even for skills that do not specify arrow consumption when said 
+//     skill is weapon-based and used with ranged weapons (auto-guesses which 
+//     skills should consume ammo when it's acquired via a card or plagiarize)
+arrow_decrement: 1
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
new file mode 100644
index 000000000..756083f85
--- /dev/null
+++ b/conf/battle/client.conf
@@ -0,0 +1,106 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+//--------------------------------------------------------------
+
+// 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
+// 0x0001: Clients older than 2004-09-06aSakray (packet versions 5-9)
+// 0x0002: 2004-09-06aSakexe (version 10)
+// 0x0004: 2004-09-20aSakexe (version 11)
+// 0x0008: 2004-10-05aSakexe (version 12)
+// 0x0010: 2004-10-25aSakexe (version 13)
+// 0x0020: 2004-11-29aSakexe (version 14)
+// 0x0040: 2005-01-10bSakexe (version 15)
+// 0x0080: 2005-05-09aSakexe (version 16)
+// 0x0100: 2005-06-28aSakexe (version 17)
+// 0x0200: 2005-07-18aSakexe (version 18)
+// 0x0400: 2005-07-19bSakexe (version 19)
+// 0x0800: 2006-03-27aSakexe (version 20)
+// 0x1000: 2007-01-08aSakexe (version 21)
+// 0x2000: 2007-02-12aSakexe (version 22)
+// default value: 0xFFFF (all clients)
+packet_ver_flag: 0xFFFF
+
+// 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)
+// NOTE: You also need to adjust the client if you want this to work.
+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/battle/drops.conf b/conf/battle/drops.conf
new file mode 100644
index 000000000..c46de1c85
--- /dev/null
+++ b/conf/battle/drops.conf
@@ -0,0 +1,148 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+//--------------------------------------------------------------
+
+// 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)
+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)
+// (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)
+// (Takes effect after the item_second_get_time elapses)
+item_third_get_time: 1000
+
+// Grace time to apply to MvP reward items when the Most Valuable Player can't get the prize item and it drops on the ground? (in milliseconds)
+mvp_item_first_get_time: 10000
+
+// Grace time for the first and second MvP so they can get the item? (in milliseconds)
+// (Takes effect after mvp_item_first_get_time elapses)
+mvp_item_second_get_time: 10000
+
+// Grace time for the first, second and third MvP so they can get the item? (in milliseconds)
+// (Takes effect after mvp_item_second_get_time elapses)
+mvp_item_third_get_time: 2000
+
+// Item drop rates (Note 2)
+
+// The rate the common items are dropped (Items that are in the ETC tab, besides card)
+item_rate_common: 100
+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)
+// Default: no (as in official servers).
+drop_rate0item: no
+
+// Makes your LUK value affect 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
+
+// Makes your LUK value affect 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 drop items?
+// This setting has three available values:
+// 0: Nothing drops.
+// 1: 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/battle/exp.conf b/conf/battle/exp.conf
new file mode 100644
index 000000000..f3d438ea2
--- /dev/null
+++ b/conf/battle/exp.conf
@@ -0,0 +1,103 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: The max level of classes is stored in the exp table.
+//         See files db/exp.txt and db/exp2.txt to change them.
+//--------------------------------------------------------------
+
+// Rate at which exp. is given. (Note 2)
+base_exp_rate: 100
+
+// Rate at which job exp. is given. (Note 2)
+job_exp_rate: 100
+
+// Turn this on to allow a player to level up more than once from a kill. (Note 1)
+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 = uses damage given / total damage as damage ratio
+// 1 = uses damage given / max_hp as damage ratio
+// NOTE: Using type 1 disables the bonus where the first attacker gets 
+//       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)
+mvp_exp_rate: 100
+
+// Rate of base/job exp given by NPCs. (Note 2)
+quest_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 received * 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: 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/battle/gm.conf b/conf/battle/gm.conf
new file mode 100644
index 000000000..040a91ef7
--- /dev/null
+++ b/conf/battle/gm.conf
@@ -0,0 +1,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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+//--------------------------------------------------------------
+
+// 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 (items, etc...)?
+// '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
+
+// At what GM level can you see GMs and Account/Char IDs in the @who command?
+who_display_aid: 40
+
+// Ban people that try trade dupe.
+// Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
+ban_hack_trade: 5
+
+// Set here minimum level of a (online) GM that can receive all informations about any player that try to hack, spoof a name, etc.
+// 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
+
+// The minimum GM level to bypass nowarp and nowarpto mapflags.
+// This option is mainly used in commands which modify a character's
+// map/coordinates (like @memo, @warp, @charwarp, @go, @jump, etc...).
+// 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 distribute items.
+// You should set this to the same level @item is set to in the atcommand.conf
+// NEVER SET THIS VALUE TO 0, or you will block drop/trade for normal players
+gm_cant_drop_min_lv: 1
+
+//The trust level for your GMs. Any GMs ABOVE this level will be able to distribute items
+//ie: Use Storage/Guild Storage, Drop Items, Use Vend, Trade items. 
+gm_cant_drop_max_lv: 0
+
+// Minimum GM level to see the hp of every player? (Default: 60)
+// no/0 can be used to disable it.
+disp_hpmeter: 0
+
+// 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/battle/guild.conf b/conf/battle/guild.conf
new file mode 100644
index 000000000..2c474552e
--- /dev/null
+++ b/conf/battle/guild.conf
@@ -0,0 +1,60 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+//--------------------------------------------------------------
+
+// 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 during WoE, how long before the removal
+// of monsters/players from the castle? (in miliseconds)
+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 skill is not implemented on official servers
+require_glory_guild: no
diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf
new file mode 100644
index 000000000..5e9e627ef
--- /dev/null
+++ b/conf/battle/homunc.conf
@@ -0,0 +1,46 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// Homunculus setting (Note 3)
+// Activates various 'quirks' that makes them behave unlike normal characters.
+// 0x001: Can't be targetted by support skills (except for their master)
+
+// 0x004: Mobs will always go after them instead of players until attacked
+// 0x008: Copy their master's speed on spawn/map-change
+// 0x010: They display luk/3+1 instead of their actual critical in the
+//        stat window (by default they don't crit)
+// 0x020: Their Min-Matk is always the same as their max
+// 0x040: Skill re-use delay is reset when they are vaporized.
+hom_setting: 0xFFFF
+
+// The rate a homunculus will get friendly by feeding it. (Note 2)
+homunculus_friendly_rate: 100
+
+// Can you name a homunculus more then once? (Note 1)
+hom_rename: no
+
+// 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: no
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
new file mode 100644
index 000000000..8ef1aac3e
--- /dev/null
+++ b/conf/battle/items.conf
@@ -0,0 +1,80 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// The highest value at which an item can be sold via the merchant vend skill. (in zeny)
+vending_max_value: 1000000000
+
+// Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
+// When a tax is applied, the item's full price is charged to the buyer, but
+// the vender will not get the whole price paid (they get 100% - this tax).
+vending_tax: 200
+
+// 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 3)
+// 0x01: Produced Weapons
+// 0x02: Produced Potions
+// 0x04: Produced Arrows
+// 0x08: Produced Holy Water
+// 0x10: Produced Deadly Potions
+// 0x80: Other produced items.
+produce_item_name_input: 0x03
+
+// 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/battle/misc.conf b/conf/battle/misc.conf
new file mode 100644
index 000000000..3fa7b34e6
--- /dev/null
+++ b/conf/battle/misc.conf
@@ -0,0 +1,112 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// PK Server Mode.  Turns entire server pvp(excluding towns). Experience loss is doubled if killed by another player.
+// When players hunt monsters over 20 levels higher, they will receive 15% additional exp., and 25% chance of receiving more items. 
+// There is a nopvp.txt for setting up maps not to have pk on in this mode.  Novices cannot be attacked and cannot attack.
+// Normal pvp counter and rank display are disabled as well.
+// Note: If pk_mode is set to 2 instead of 1 (yes), players will receive a 
+//   manner penalty of 5 each time they kill another player (see manner_system 
+//   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 3)
+skill_log: off
+
+// 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
+
+// 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)
+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)
+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/battle/monster.conf b/conf/battle/monster.conf
new file mode 100644
index 000000000..58111ab2d
--- /dev/null
+++ b/conf/battle/monster.conf
@@ -0,0 +1,201 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// [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. (Note 3)
+// 0x001: When enabled mobs will update their target cell every few iterations
+//        (normally they never update their target cell until they reach it while
+//        chasing)
+// 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)
+// 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
+// 0x400: By default mobs have a range of 9 for all skills. Set this to enforce
+//        the normal skill range rules on them.
+// 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? (Note 1)
+monster_class_change_full_recover: yes
+
+// 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/battle/party.conf b/conf/battle/party.conf
new file mode 100644
index 000000000..2dce065af
--- /dev/null
+++ b/conf/battle/party.conf
@@ -0,0 +1,54 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+//--------------------------------------------------------------
+
+// If someone steals (gank/steal skills), 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/item sharing disabled for idle members in the party?
+// Set to no, or the amount of seconds (NOT milliseconds) that need to pass before considering
+// a character idle.
+// Characters in a chat/vending are always considered idle.
+// 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
diff --git a/conf/battle/pet.conf b/conf/battle/pet.conf
new file mode 100644
index 000000000..0d13d26b9
--- /dev/null
+++ b/conf/battle/pet.conf
@@ -0,0 +1,86 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// 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/battle/player.conf b/conf/battle/player.conf
new file mode 100644
index 000000000..58f0f9bb1
--- /dev/null
+++ b/conf/battle/player.conf
@@ -0,0 +1,137 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+//--------------------------------------------------------------
+
+// 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)
+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)
+natural_healhp_interval: 6000
+
+// The time interval for SP to restore naturally. (in milliseconds)
+natural_healsp_interval: 8000
+
+// Automatic healing skill's time interval. (in milliseconds)
+natural_heal_skill_interval: 10000
+
+// The maximum weight for a character to carry when the character stops healing naturally. (in %)
+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)
+max_hp: 1000000
+
+// Maximum SP. (Default is 1000000)
+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.
+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.
+// NOTE: this setting only enables friend auto-adding; auto-deletion does not work yet
+friend_auto_add: yes
+
+// Are simultaneous trade/party/guild invite requests automatically rejected?
+invite_request_check: yes
+
+// Players' will drop a 'Skull' when killed?
+// 0 = Disabled
+// 1 = Dropped only in PvP maps
+// 2 = Dropped in all situations
+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/battle/skill.conf b/conf/battle/skill.conf
new file mode 100644
index 000000000..a7ddc3cac
--- /dev/null
+++ b/conf/battle/skill.conf
@@ -0,0 +1,269 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// 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
+
+// Does the delay time depend on the caster's DEX and/or AGI? (Note 1)
+// Note: On Official servers, neither Dex nor Agi affect delay time
+delay_dependon_dex: no
+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 3)
+//NOTE: By default mobs don't have the skill delay as specified in the skill
+//  database, but follow their own 'reuse' skill delay which is specified on
+//  the mob skill db. When set, the delay for all skills become
+//  min_skill_delay_limit.
+no_skill_delay: 2
+
+// At what dex does the cast time become zero (instacast)?
+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: 0
+
+// If the target moves out of range while casting, do we take the items and SP for the skill anyway? (Note 1)
+skill_out_range_consume: no
+
+// Does the distance between caster and target define if the skill is a ranged skill? (Note 3)
+// If set, when the distance between caster and target is greater than 3 the skill is considered long-range, otherwise it's a melee range.
+// If not set, then the range is determined by the skill's range (if it is above 5, the skill is ranged).
+// Default 14 (mobs + pets + homun)
+skillrange_by_distance: 14
+
+// Should the equipped weapon's range override the skill's range defined in the skill_db for most weapon-based skills? (Note 3)
+// NOTE: Skills affected by this option are those whose range in the skill_db are negative. Note that unless monster_ai&0x400 is
+// set, the range of all skills is 9 for monsters.
+skillrange_from_weapon: 14
+
+// 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 3)
+clear_skills_on_death: 0
+
+// Should ground placed skills be removed when the caster changes maps? (Note 3)
+clear_skills_on_warp: 15
+
+//Setting this to YES will override the target mode of ground-based skills with the flag 0x01 to "No Enemies"
+//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 3)
+// For those characters on which it is set, 100% Critical,
+// Otherwise it disregard DEF and HIT+20, CRI*2
+auto_counter_type: 15
+
+// Can ground skills be placed on top of each other? (Note 3)
+// By default, skills with UF_NOREITERATION set cannot be stacked on top of 
+// other skills, this setting will override that. (skill_unit_db)
+skill_reiteration: 0
+
+// Can ground skills NOT be placed underneath/near players/monsters? (Note 3)
+// If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db)
+skill_nofootset: 1
+
+// Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 3)
+// 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 3)
+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: 2
+
+// 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 will be used?
+// 0 = Aegis style (single multi-hit attack)
+// 1 = Athena style (multiple consecutive attacks)
+finger_offensive_type: 0
+
+// Number of hits at a time that undead/fire elemental enemies receive from firewall.
+// 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 : Returns all items used to deploy the trap
+skill_removetrap_type: 0
+
+// Does using bow to do a backstab give a 50% damage penalty? (Note 1)
+backstab_bow_penalty: yes
+
+// Use kRO new steal formula? (favors skillv more than dex difference) (Note 1)
+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: 11
+
+// 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: 2
+
+// Miracle of the Sun, Moon and Stars skill duration in milliseconds
+sg_miracle_skill_duration: 3600000
+
+// Angel of the Sun, Moon and Stars skill ratio (100% = 10000)
+sg_angel_skill_ratio: 10
diff --git a/conf/battle/status.conf b/conf/battle/status.conf
new file mode 100644
index 000000000..87d76de7a
--- /dev/null
+++ b/conf/battle/status.conf
@@ -0,0 +1,53 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// Should skill casting be cancelled when inflicted by curse/stun/sleep/etc (includes silence) (Note 3)?
+status_cast_cancel: 0
+
+// Will certain skill status-changes be removed on logout?
+// This mimics official servers, where Extremity Fist's no SP regen,
+// Strip Equipment, and some other buffs are removed when you logout. Setting is:
+// 0 = remove nothing.
+// 1 = remove negative buffs (stripping, EF)
+// 2 = remove positive buffs (maximize power, steel body...)
+// 3 = remove both negative and positive buffs.
+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 immunity.
+// Eg: 40 vit -> 40% resist. 150 luk -> +50% of the missing gap. 
+//     So 40% + (50% of 60%) = 70%
+pc_luk_status_def: 300
+mob_luk_status_def: 300
+
+// Maximum resistance to status changes. (100 = 100%)
+// NOTE: Cards and equipment can go over this limit, so it only applies to natural resist.
+pc_max_status_def: 100
+mob_max_status_def: 100
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
new file mode 100644
index 000000000..6098b0fa6
--- /dev/null
+++ b/conf/battle_athena.conf
@@ -0,0 +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
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
new file mode 100644
index 000000000..200831220
--- /dev/null
+++ b/conf/char_athena.conf
@@ -0,0 +1,218 @@
+// 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: Do not use spaces in the 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 IP address which clients will use to connect.
+// Set this to what your server's public IP address is.
+//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]
+
+//If redirected output contains escape sequences (color codes)
+stdout_with_ansisequence: no
+
+//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
+
+// 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
+
+// Friends list flatfile database
+friends_txt: save/friends.txt
+
+// Start point, Map name followed by coordinates (x,y)
+start_point: new_zone01,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
+
+// To log the character server?
+log_char: 1
+
+// 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
+
+// Character rename option. When set to yes, the server will send an extended 
+// char-info packet, informing whether the character can be renamed or not.
+// NOTE: This functionality is not implemented.
+// NOTE: This option is for compatibility with kRO sakray 2006-10-23 and newer.
+//       !Do not use it for any other type of client since it will crash them!
+char_rename: yes
+
+// 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 any level)
+// -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
+
+//NOTE: The following online listing options are only for TXT servers.
+
+// 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
+
+import: conf/import/char_conf.txt
diff --git a/conf/charcommand_athena.conf b/conf/charcommand_athena.conf
new file mode 100644
index 000000000..acd89779a
--- /dev/null
+++ b/conf/charcommand_athena.conf
@@ -0,0 +1,260 @@
+// Athena charcommand Configuration file.
+// Translated by Peter Kieser <pfak@telus.net>
+
+// The symbol that will be used to recognize commands.
+// You can set any one character, except control-characters (0x00-0x1f),
+// '%', '$' (party/guild chat speaking) and '/' (standard client commands).
+// The symbol must be different from from the standard GM command symbol.
+command_symbol: #
+
+
+//--------------------------
+// 0: normal player commands
+// None for security purposes.
+
+//-------------------------
+// 1: Super player commands
+
+//---------------------------
+// 10: Super player+ commands
+
+//----------------------
+// 20: Mediator commands
+
+//--------------------
+// 40: Sub-GM commands
+
+
+// View the items in a character's cart
+cartlist: 40
+
+// Apply an effect onto another character
+effect: 40
+
+// View the exp of a character
+exp: 40
+
+// List a chacter's items
+itemlist: 40
+
+// View the jail time remaining
+jailtime: 40
+
+// Refresh a character
+refresh: 40
+
+// List a chacter's stats
+stats: 40
+
+// List a chacter's storage items
+storagelist: 40
+
+//---------------------
+// 50: Sub-GM+ commands
+
+// Change a character's clothing color
+dye: 50
+
+// Give another character a fake name
+fakename: 50
+
+// Open the hatch dialog for a character
+hatch: 50
+
+// Change a character's hair color
+hcolor: 50
+haircolor: 50
+
+// Change a character's hair style
+hstyle: 50
+hairstyle: 50
+
+// Changes character's model
+model: 50
+
+// Give or remove a peco from a character
+mount: 50
+mountpeco: 50
+
+// Make another character's pet friendly/not
+petfriendly: 50
+
+// Rename another character's pet
+petrename: 50
+
+// Change a character's size
+size: 50
+
+//----------------
+// 60: GM commands
+
+// Resurrects a dead character
+alive: 60
+revive: 60
+
+// Give a player all the skills available to him/her
+allskill: 60
+allskills: 60
+skillall: 60
+skillsall: 60
+
+// Give a character the maximum possible stats
+allstat: 60
+allstats: 60
+statall: 60
+statsall: 60
+
+// Change another character's base level (3 same commands)
+blvl: 60
+blevel: 60
+baselvl: 60
+baselevel: 60
+
+// Changes the sex of an online player (all characters on the account)
+changesex: 60
+
+// Delete items from a character
+delitem: 60
+
+// Disguise a character
+disguise: 60
+undisguise: 60
+
+// Resets another character's designated maps
+feelreset: 60
+
+// Change the guild level for a character's guild
+glvl: 60
+glevel: 60
+guildlvl: 60
+guildlevel: 60
+
+// Open guild storage for a character
+gstorage: 60
+
+// Heal a character
+heal: 60
+
+// Invoke GM Hide on a character
+hide: 60
+
+// Increase a character's homunculus' level
+hlvl: 60
+hlevel: 60
+homlvl: 60
+homlevel: 60
+
+// Evolve a character's homunculus
+homevolve: 60
+homevolution: 60
+
+// Change a character's homunculus' friendly value
+homfriendly: 60
+
+// Change a character's homunculus' hunger value
+homhungry: 60
+
+// View a character's homunculus' stats
+hominfo: 40
+
+// Give another character an item
+item: 60
+
+// Create a specific item (with cards, refines, etc
+item2: 60
+
+// Remove all of a character's possessions
+itemreset: 60
+
+// Change another character's job (2 same commands)
+job: 60
+jobchange: 60
+
+// Change another character's job level (3 same commands)
+jlvl: 60
+jlevel: 60
+joblvl: 60
+joblevel: 60
+
+// Allow a character to attack anybody
+killer: 60
+
+// Make a character killable by anybody
+killable: 60
+
+// Return a character to their respawn point
+load: 60
+
+// Take away a character's platinum skill
+lostskill: 60
+
+// Make a character immune to monsters
+monsterignore: 60
+
+// Apply a certain option to another character
+option: 60
+
+// Change a character's pet's hungry value
+pethungry: 60
+
+// Produce forged equipment on a character (as if he/she was a blacksmith)
+produce: 60
+
+// Give another character a platinum skill
+questskill: 60
+
+// Performs a stat and skill reset on someone else.
+reset: 60
+
+// Save another character
+save: 60
+
+// Gives another character skill points
+skpoint: 60
+
+// Change a character's walking speed
+speed: 60
+
+// Give another character spiritball effect
+spiritball: 60
+
+// Open storage for a character
+storage: 60
+
+// Gives another character status points
+stpoint: 60
+
+// Change a character's stats
+str: 60
+agi: 60
+vit: 60
+int: 60
+dex: 60
+luk: 60
+
+// Resets another character's status, skills
+streset: 60
+skreset: 60
+
+// Warp a player somewhere else (3 same commands)
+warp: 60
+rura: 60
+rura+: 60
+
+//----------------------
+// 80: GM Chief commands
+
+// Refine a character's equipment
+refine: 80
+
+// Give another character zeny
+zeny: 80
+
+//---------------------------
+// 99: Administrator commands
+
+//---------------------------------------------------------------
+// 100: Disabled commands
+
+
+import: conf/import/charcommand_conf.txt
diff --git a/conf/charhelp.txt b/conf/charhelp.txt
new file mode 100644
index 000000000..c64a0c330
--- /dev/null
+++ b/conf/charhelp.txt
@@ -0,0 +1,26 @@
+ 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
diff --git a/conf/grf-files.txt b/conf/grf-files.txt
new file mode 100644
index 000000000..39cee544e
--- /dev/null
+++ b/conf/grf-files.txt
@@ -0,0 +1,12 @@
+//-----------------------------------------
+// GRF List
+//-----------------------------------------
+// grf: C:\path\to\RO\data.grf
+// You may add more in this format
+// grf: <data file path>
+
+//------ Others ---------------------------
+
+// Data Directory (without the actual data\ though)
+// the below example would use C:\path\to\RO\data\
+//data_dir: C:\path\to\RO\
diff --git a/conf/help.txt b/conf/help.txt
new file mode 100644
index 000000000..2fe7726ef
--- /dev/null
+++ b/conf/help.txt
@@ -0,0 +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.
+ 80:@sendprioritymail - Sends priority mail (cannot be deleted until read)
diff --git a/conf/help2.txt b/conf/help2.txt
new file mode 100644
index 000000000..3a0772425
--- /dev/null
+++ b/conf/help2.txt
@@ -0,0 +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: adjustment (+/- 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)
diff --git a/conf/import/atcommand_conf.txt b/conf/import/atcommand_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/atcommand_conf.txt
diff --git a/conf/import/battle_conf.txt b/conf/import/battle_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/battle_conf.txt
diff --git a/conf/import/char_conf.txt b/conf/import/char_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/char_conf.txt
diff --git a/conf/import/charcommand_conf.txt b/conf/import/charcommand_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/charcommand_conf.txt
diff --git a/conf/import/inter_conf.txt b/conf/import/inter_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/inter_conf.txt
diff --git a/conf/import/ladmin_conf.txt b/conf/import/ladmin_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/ladmin_conf.txt
diff --git a/conf/import/log_conf.txt b/conf/import/log_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/log_conf.txt
diff --git a/conf/import/login_conf.txt b/conf/import/login_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/login_conf.txt
diff --git a/conf/import/map_conf.txt b/conf/import/map_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/map_conf.txt
diff --git a/conf/import/msg_conf.txt b/conf/import/msg_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/msg_conf.txt
diff --git a/conf/import/packet_conf.txt b/conf/import/packet_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/packet_conf.txt
diff --git a/conf/import/script_conf.txt b/conf/import/script_conf.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/conf/import/script_conf.txt
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
new file mode 100644
index 000000000..29bdb7aa2
--- /dev/null
+++ b/conf/inter_athena.conf
@@ -0,0 +1,161 @@
+// 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
+
+// Hotkeys flatfile database, where character skill shortcuts are stored.
+hotkeys_txt: save/hotkeys.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
+
+// 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: 
+
+// 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
+hotkey_db: hotkey
+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/irc_athena.conf b/conf/irc_athena.conf
new file mode 100644
index 000000000..c55b9c2c0
--- /dev/null
+++ b/conf/irc_athena.conf
@@ -0,0 +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
diff --git a/conf/ladmin_athena.conf b/conf/ladmin_athena.conf
new file mode 100644
index 000000000..b091b47ff
--- /dev/null
+++ b/conf/ladmin_athena.conf
@@ -0,0 +1,36 @@
+// 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çais
+// 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
+
+//If redirected output contains escape sequences (color codes)
+stdout_with_ansisequence: no
+
+import: conf/import/ladmin_conf.txt
diff --git a/conf/log_athena.conf b/conf/log_athena.conf
new file mode 100644
index 000000000..80aacd122
--- /dev/null
+++ b/conf/log_athena.conf
@@ -0,0 +1,143 @@
+// eAthena - Log Configuration File
+
+// Enable Logs?
+// 1 - Log all events.
+// Or, determine what to log by adding up the different events:
+// 0002 - (T) Log trades
+// 0004 - (V) Log vending transactions
+// 0008 - (P) Log items drop/picked by players
+// 0016 - (L) Log items drop/looted by monsters
+// 0032 - (S) Log NPC transactions (buy/sell)
+// 0064 - (N) Log Script transactions (items deleted/acquired through quests)
+// 0128 - (M) Log items stolen from mobs (Steal/Gank)
+// 0256 - (C) Log player-used items
+// 0512 - (M) Log MVP prize items
+// 1024 - (A) Log player created/deleted items (through @/# commands)
+// 2048 - (R) Log items placed/retrieved from storage.
+// 4096 - (G) Log items placed/retrieved from guild storage.
+// Example: Log trades+vending+script items+created items: 2+4+64+1024 = 1094
+enable_logs: 1
+
+// Use MySQL Logs? (SQL Version Only)
+sql_logs: 0
+
+// LOGGING FILTERS
+// =============================================================
+// 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
+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 (Global, Whisper, Party, Guild, Main chat)
+// LOGGING FILTERS
+// =============================================================
+// 00 = Don't log at all
+// Advanced Filter Bits: ||
+// 01 - Log Global messages
+// 02 - Log Whisper messages
+// 04 - Log Party messages
+// 08 - Log Guild messages
+// 16 - Log Main chat messages
+// 32 - Don't log anything when WOE is on
+// Example:
+// log_chat:  6 = logs both Whisper & Party messages
+// log_chat:  8 = logs only Guild messages
+// log_chat: 34 = logs only Whisper, when WOE is off
+// log_chat: 31 = logs EVERYTHING
+
+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/login_athena.conf b/conf/login_athena.conf
new file mode 100644
index 000000000..3ad980de6
--- /dev/null
+++ b/conf/login_athena.conf
@@ -0,0 +1,187 @@
+// 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]
+
+//If redirected output contains escape sequences (color codes)
+stdout_with_ansisequence: no
+
+//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
+// NOTE: ladmin only works on TXT login servers.
+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 logins case sensitive? (SQL only)
+case_sensitive: yes
+
+// 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 use _M/_F to make new accounts on the server?
+new_account: yes
+
+// Account registration flood protection 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: yes
+
+// 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.
+date_format: %Y-%m-%d %H:%M:%S
+
+// 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
+
+// Ipban features (TXT only):
+
+// 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
+
+// Store passwords as MD5 hashes instead of plaintext ?
+// NOTE: Will not work with clients that use <passwordencrypt>
+use_MD5_passwords: no
+
+// Ipban features (SQL only)
+ipban: yes
+dynamic_pass_failure_ban: yes
+dynamic_pass_failure_ban_interval: 5
+dynamic_pass_failure_ban_limit: 7
+dynamic_pass_failure_ban_duration: 5
+
+// 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
+// If enabled, each incoming connection will be tested against the blacklists
+// on the specified dnsbl_servers (comma-separated list)
+use_dnsbl: no
+dnsbl_servers: dnsbl.deltaanime.net
+
+import: conf/import/login_conf.txt
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
new file mode 100644
index 000000000..06fe87eb2
--- /dev/null
+++ b/conf/map_athena.conf
@@ -0,0 +1,129 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \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 IP address which clients will use to connect.
+// Set this to what your server's public IP address is.
+//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]
+
+//If redirected output contains escape sequences (color codes)
+stdout_with_ansisequence: no
+
+//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
+
+//Where should the map data be read from?
+map_cache_file: db/map_cache.dat
+
+//Where should all database data be read from?
+db_path: db
+
+// Enable the @guildspy and @partyspy at commands?
+// Note that enabling them decreases packet sending performance.
+enable_spy: no
+
+// Read map data from GATs and RSWs in GRF files or a data directory
+// as referenced by grf-files.txt rather than from the mapcache?
+use_grf: 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/mapflag/gvg.txt b/conf/mapflag/gvg.txt
new file mode 100644
index 000000000..16046e4e0
--- /dev/null
+++ b/conf/mapflag/gvg.txt
@@ -0,0 +1,93 @@
+//===== 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	mapflag	gvg
+guild_vs2	mapflag	gvg
+guild_vs3	mapflag	gvg
+guild_vs4	mapflag	gvg
+guild_vs5	mapflag	gvg
+
+// Guild Castles ==========
+aldeg_cas01	mapflag	gvg_castle
+aldeg_cas02	mapflag	gvg_castle
+aldeg_cas03	mapflag	gvg_castle
+aldeg_cas04	mapflag	gvg_castle
+aldeg_cas05	mapflag	gvg_castle
+gefg_cas01	mapflag	gvg_castle
+gefg_cas02	mapflag	gvg_castle
+gefg_cas03	mapflag	gvg_castle
+gefg_cas04	mapflag	gvg_castle
+gefg_cas05	mapflag	gvg_castle
+payg_cas01	mapflag	gvg_castle
+payg_cas02	mapflag	gvg_castle
+payg_cas03	mapflag	gvg_castle
+payg_cas04	mapflag	gvg_castle
+payg_cas05	mapflag	gvg_castle
+prtg_cas01	mapflag	gvg_castle
+prtg_cas02	mapflag	gvg_castle
+prtg_cas03	mapflag	gvg_castle
+prtg_cas04	mapflag	gvg_castle
+prtg_cas05	mapflag	gvg_castle
+schg_cas01	mapflag	gvg_castle
+schg_cas02	mapflag	gvg_castle
+schg_cas03	mapflag	gvg_castle
+schg_cas04	mapflag	gvg_castle
+schg_cas05	mapflag	gvg_castle
+
+//Uncomment to disable monsters teleporting (prevents them from "escaping" when rude attacked)
+//aldeg_cas01	mapflag	monster_noteleport
+//aldeg_cas02	mapflag	monster_noteleport
+//aldeg_cas03	mapflag	monster_noteleport
+//aldeg_cas04	mapflag	monster_noteleport
+//aldeg_cas05	mapflag	monster_noteleport
+//gefg_cas01	mapflag	monster_noteleport
+//gefg_cas02	mapflag	monster_noteleport
+//gefg_cas03	mapflag	monster_noteleport
+//gefg_cas04	mapflag	monster_noteleport
+//gefg_cas05	mapflag	monster_noteleport
+//payg_cas01	mapflag	monster_noteleport
+//payg_cas02	mapflag	monster_noteleport
+//payg_cas03	mapflag	monster_noteleport
+//payg_cas04	mapflag	monster_noteleport
+//payg_cas05	mapflag	monster_noteleport
+//prtg_cas01	mapflag	monster_noteleport
+//prtg_cas02	mapflag	monster_noteleport
+//prtg_cas03	mapflag	monster_noteleport
+//prtg_cas04	mapflag	monster_noteleport
+//prtg_cas05	mapflag	monster_noteleport
+//schg_cas01	mapflag	monster_noteleport
+//schg_cas02	mapflag	monster_noteleport
+//schg_cas03	mapflag	monster_noteleport
+//schg_cas04	mapflag	monster_noteleport
+//schg_cas05	mapflag	monster_noteleport
+
+// Novice Guild Castles ===
+//n_castle	mapflag	gvg_castle
+nguild_alde	mapflag	gvg_castle
+nguild_gef	mapflag	gvg_castle
+nguild_pay	mapflag	gvg_castle
+nguild_prt	mapflag	gvg_castle
+
+//nguild_alde	mapflag	monster_noteleport
+//nguild_gef	mapflag	monster_noteleport
+//nguild_pay	mapflag	monster_noteleport
+//nguild_prt	mapflag	monster_noteleport
+
+// Guild Dungeons =========
+gld_dun01	mapflag	gvg_dungeon
+gld_dun02	mapflag	gvg_dungeon
+gld_dun03	mapflag	gvg_dungeon
+gld_dun04	mapflag	gvg_dungeon
diff --git a/conf/mapflag/indoors.txt b/conf/mapflag/indoors.txt
new file mode 100644
index 000000000..19ee69828
--- /dev/null
+++ b/conf/mapflag/indoors.txt
@@ -0,0 +1,85 @@
+//===== eAthena Script =======================================
+//= Map Flags for Indoors Buildings or Dungeons
+//===== By: ==================================================
+//= eAthena Dev Team
+//===== Current Version: =====================================
+//= 1.3a [Lupus]
+//===== Compatible With: =====================================
+//=
+//===== Description: =========================================
+//= 'indoors' turns off all night effects.
+//============================================================
+
+alberta_in	mapflag	indoors
+ama_test	mapflag	indoors
+izlude_in	mapflag	indoors
+gef_tower	mapflag	indoors
+geffen_in	mapflag	indoors
+moc_castle	mapflag	indoors
+morocc_in	mapflag	indoors
+mosk_in	mapflag	indoors
+payon_in01	mapflag	indoors
+payon_in02	mapflag	indoors
+payon_in03	mapflag	indoors
+prt_in	mapflag	indoors
+prt_castle	mapflag	indoors
+prt_church	mapflag	indoors
+in_orcs01	mapflag	indoors
+aldeba_in	mapflag	indoors
+monk_in	mapflag	indoors
+nameless_in	mapflag	indoors
+prt_are_in	mapflag	indoors
+arena_room	mapflag	indoors
+job_sword1	mapflag	indoors
+xmas_in	mapflag	indoors
+cmd_in01	mapflag	indoors
+cmd_in02	mapflag	indoors
+yuno_in01	mapflag	indoors
+yuno_in02	mapflag	indoors
+yuno_in03	mapflag	indoors
+yuno_in04	mapflag	indoors
+yuno_in05	mapflag	indoors
+alde_alche	mapflag	indoors
+sec_in01	mapflag	indoors
+ama_in01	mapflag	indoors
+ama_in02	mapflag	indoors
+gon_in	mapflag	indoors
+um_in	mapflag	indoors
+nif_in	mapflag	indoors
+lou_in01	mapflag	indoors
+lou_in02	mapflag	indoors
+jawaii_in	mapflag	indoors
+que_god01	mapflag	indoors
+que_god02	mapflag	indoors
+ayo_in01	mapflag	indoors
+ayo_in02	mapflag	indoors
+que_sign01	mapflag	indoors
+ein_in01	mapflag	indoors
+airport	mapflag	indoors
+airplane	mapflag	indoors
+airplane_01	mapflag	indoors
+hu_in01	mapflag	indoors
+y_airport	mapflag	indoors
+lhz_airport	mapflag	indoors
+lhz_in01	mapflag	indoors
+lhz_in02	mapflag	indoors
+lhz_in03	mapflag	indoors
+lhz_cube	mapflag	indoors
+hu_in01	mapflag	indoors
+auction_01	mapflag	indoors
+auction_02	mapflag	indoors
+ra_in01	mapflag	indoors
+ra_temin	mapflag	indoors
+que_rachel	mapflag	indoors
+yuno_pre	mapflag	indoors
+lhz_que01	mapflag	indoors
+que_job01	mapflag	indoors
+thana_step	mapflag	indoors
+kh_mansion	mapflag	indoors
+kh_rossi	mapflag	indoors
+kh_school	mapflag	indoors
+kh_vila	mapflag	indoors
+que_bingo	mapflag	indoors
+que_ng	mapflag	indoors
+ve_in	mapflag	indoors
+ve_in02	mapflag	indoors
diff --git a/conf/mapflag/jail.txt b/conf/mapflag/jail.txt
new file mode 100644
index 000000000..99cd7b653
--- /dev/null
+++ b/conf/mapflag/jail.txt
@@ -0,0 +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	mapflag	nomemo
+
+// No Save ===============================
+sec_pri	mapflag	nosave	SavePoint
+
+// No Teleport ===========================
+sec_pri	mapflag	noteleport
+
+// No Warp ===============================
+sec_pri	mapflag	nowarp
+
+// No Return, Stop people from being pulled out of jail (warpparty/guild)
+sec_pri	mapflag	noreturn 
+
+// Bloody Jail ===========================
+//Uncomment following maps to let your prisoners fight with other prisoners
+
+// PvP ===================================
+sec_pri	mapflag	pvp
+
+// No Party ==============================
+sec_pri	mapflag	pvp_noparty
+
+//Nightmare Equipment Drops PVP ==========
+sec_pri	mapflag	pvp_nightmaredrop	random,equip,300
diff --git a/conf/mapflag/night.txt b/conf/mapflag/night.txt
new file mode 100644
index 000000000..3feb96c6e
--- /dev/null
+++ b/conf/mapflag/night.txt
@@ -0,0 +1,241 @@
+//===== 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	mapflag	nightenabled
+alberta	mapflag	nightenabled
+aldebaran	mapflag	nightenabled
+gef_fild00	mapflag	nightenabled
+gef_fild01	mapflag	nightenabled
+gef_fild02	mapflag	nightenabled
+gef_fild03	mapflag	nightenabled
+gef_fild04	mapflag	nightenabled
+gef_fild05	mapflag	nightenabled
+gef_fild06	mapflag	nightenabled
+gef_fild07	mapflag	nightenabled
+gef_fild08	mapflag	nightenabled
+gef_fild09	mapflag	nightenabled
+gef_fild10	mapflag	nightenabled
+gef_fild11	mapflag	nightenabled
+geffen	mapflag	nightenabled
+glast_01	mapflag	nightenabled
+izlu2dun	mapflag	nightenabled
+izlude	mapflag	nightenabled
+mjolnir_01	mapflag	nightenabled
+mjolnir_02	mapflag	nightenabled
+mjolnir_03	mapflag	nightenabled
+mjolnir_04	mapflag	nightenabled
+mjolnir_05	mapflag	nightenabled
+mjolnir_06	mapflag	nightenabled
+mjolnir_07	mapflag	nightenabled
+mjolnir_08	mapflag	nightenabled
+mjolnir_09	mapflag	nightenabled
+mjolnir_10	mapflag	nightenabled
+mjolnir_11	mapflag	nightenabled
+mjolnir_12	mapflag	nightenabled
+moc_fild01	mapflag	nightenabled
+moc_fild02	mapflag	nightenabled
+moc_fild03	mapflag	nightenabled
+moc_fild04	mapflag	nightenabled
+moc_fild05	mapflag	nightenabled
+moc_fild06	mapflag	nightenabled
+moc_fild07	mapflag	nightenabled
+moc_fild08	mapflag	nightenabled
+moc_fild09	mapflag	nightenabled
+moc_fild10	mapflag	nightenabled
+moc_fild11	mapflag	nightenabled
+moc_fild12	mapflag	nightenabled
+moc_fild13	mapflag	nightenabled
+moc_fild14	mapflag	nightenabled
+moc_fild15	mapflag	nightenabled
+moc_fild16	mapflag	nightenabled
+moc_fild17	mapflag	nightenabled
+moc_fild18	mapflag	nightenabled
+moc_fild19	mapflag	nightenabled
+moc_fild20	mapflag	nightenabled
+moc_fild21	mapflag	nightenabled
+moc_fild22	mapflag	nightenabled
+moc_ruins	mapflag	nightenabled
+morocc	mapflag	nightenabled
+pay_arche	mapflag	nightenabled
+pay_fild01	mapflag	nightenabled
+pay_fild02	mapflag	nightenabled
+pay_fild03	mapflag	nightenabled
+pay_fild04	mapflag	nightenabled
+pay_fild05	mapflag	nightenabled
+pay_fild06	mapflag	nightenabled
+pay_fild07	mapflag	nightenabled
+pay_fild08	mapflag	nightenabled
+pay_fild09	mapflag	nightenabled
+pay_fild10	mapflag	nightenabled
+pay_fild11	mapflag	nightenabled
+prontera	mapflag	nightenabled
+prt_fild00	mapflag	nightenabled
+prt_fild01	mapflag	nightenabled
+prt_fild02	mapflag	nightenabled
+prt_fild03	mapflag	nightenabled
+prt_fild04	mapflag	nightenabled
+prt_fild05	mapflag	nightenabled
+prt_fild06	mapflag	nightenabled
+prt_fild07	mapflag	nightenabled
+prt_fild08	mapflag	nightenabled
+prt_fild09	mapflag	nightenabled
+prt_fild10	mapflag	nightenabled
+prt_fild11	mapflag	nightenabled
+prt_monk	mapflag	nightenabled
+pvp_y_1-1	mapflag	nightenabled
+pvp_y_1-2	mapflag	nightenabled
+pvp_y_1-3	mapflag	nightenabled
+pvp_y_1-4	mapflag	nightenabled
+pvp_y_1-5	mapflag	nightenabled
+pvp_y_2-1	mapflag	nightenabled
+pvp_y_2-2	mapflag	nightenabled
+pvp_y_2-3	mapflag	nightenabled
+pvp_y_2-4	mapflag	nightenabled
+pvp_y_2-5	mapflag	nightenabled
+pvp_y_3-1	mapflag	nightenabled
+pvp_y_3-2	mapflag	nightenabled
+pvp_y_3-3	mapflag	nightenabled
+pvp_y_3-4	mapflag	nightenabled
+pvp_y_3-5	mapflag	nightenabled
+pvp_y_4-1	mapflag	nightenabled
+pvp_y_4-2	mapflag	nightenabled
+pvp_y_4-3	mapflag	nightenabled
+pvp_y_4-4	mapflag	nightenabled
+pvp_y_4-5	mapflag	nightenabled
+pvp_y_5-1	mapflag	nightenabled
+pvp_y_5-2	mapflag	nightenabled
+pvp_y_5-3	mapflag	nightenabled
+pvp_y_5-4	mapflag	nightenabled
+pvp_y_5-5	mapflag	nightenabled
+pvp_y_6-1	mapflag	nightenabled
+pvp_y_6-2	mapflag	nightenabled
+pvp_y_6-3	mapflag	nightenabled
+pvp_y_6-4	mapflag	nightenabled
+pvp_y_6-5	mapflag	nightenabled
+pvp_y_7-1	mapflag	nightenabled
+pvp_y_7-2	mapflag	nightenabled
+pvp_y_7-3	mapflag	nightenabled
+pvp_y_7-4	mapflag	nightenabled
+pvp_y_7-5	mapflag	nightenabled
+pvp_y_8-1	mapflag	nightenabled
+pvp_y_8-2	mapflag	nightenabled
+pvp_y_8-3	mapflag	nightenabled
+pvp_y_8-4	mapflag	nightenabled
+pvp_y_8-5	mapflag	nightenabled
+xmas	mapflag	nightenabled
+xmas_fild01	mapflag	nightenabled
+cmd_fild01	mapflag	nightenabled
+cmd_fild02	mapflag	nightenabled
+cmd_fild03	mapflag	nightenabled
+cmd_fild04	mapflag	nightenabled
+cmd_fild05	mapflag	nightenabled
+cmd_fild06	mapflag	nightenabled
+cmd_fild07	mapflag	nightenabled
+cmd_fild08	mapflag	nightenabled
+cmd_fild09	mapflag	nightenabled
+gef_fild12	mapflag	nightenabled
+gef_fild13	mapflag	nightenabled
+gef_fild14	mapflag	nightenabled
+tur_dun01	mapflag	nightenabled
+alde_gld	mapflag	nightenabled
+pay_gld	mapflag	nightenabled
+prt_gld	mapflag	nightenabled
+yuno	mapflag	nightenabled
+yuno_fild01	mapflag	nightenabled
+yuno_fild02	mapflag	nightenabled
+yuno_fild03	mapflag	nightenabled
+yuno_fild04	mapflag	nightenabled
+ama_fild01	mapflag	nightenabled
+amatsu	mapflag	nightenabled
+gon_fild01	mapflag	nightenabled
+gonryun	mapflag	nightenabled
+umbala	mapflag	nightenabled
+um_fild01	mapflag	nightenabled
+um_fild02	mapflag	nightenabled
+um_fild03	mapflag	nightenabled
+um_fild04	mapflag	nightenabled
+lou_fild01	mapflag	nightenabled
+louyang	mapflag	nightenabled
+jawaii	mapflag	nightenabled
+gefenia01	mapflag	nightenabled
+gefenia02	mapflag	nightenabled
+gefenia03	mapflag	nightenabled
+gefenia04	mapflag	nightenabled
+payon	mapflag	nightenabled
+ayothaya	mapflag	nightenabled
+ayo_fild01	mapflag	nightenabled
+ayo_fild02	mapflag	nightenabled
+yuno_fild05	mapflag	nightenabled
+yuno_fild07	mapflag	nightenabled
+yuno_fild08	mapflag	nightenabled
+yuno_fild09	mapflag	nightenabled
+yuno_fild11	mapflag	nightenabled
+yuno_fild12	mapflag	nightenabled
+einbech	mapflag	nightenabled
+einbroch	mapflag	nightenabled
+ein_fild06	mapflag	nightenabled
+ein_fild07	mapflag	nightenabled
+ein_fild08	mapflag	nightenabled
+ein_fild09	mapflag	nightenabled
+ein_fild10	mapflag	nightenabled
+ein_fild03	mapflag	nightenabled
+ein_fild04	mapflag	nightenabled
+lhz_fild02	mapflag	nightenabled
+lhz_fild03	mapflag	nightenabled
+lhz_fild01	mapflag	nightenabled
+lighthalzen	mapflag	nightenabled
+lhz_in01	mapflag	nightenabled
+lhz_in02	mapflag	nightenabled
+lhz_in03	mapflag	nightenabled
+hu_fild07	mapflag	nightenabled
+hu_fild05	mapflag	nightenabled
+hu_fild04	mapflag	nightenabled
+hu_fild01	mapflag	nightenabled
+yuno_fild06	mapflag	nightenabled
+tha_scene01	mapflag	nightenabled
+hugel	mapflag	nightenabled
+p_track01	mapflag	nightenabled
+p_track01	mapflag	nightenabled
+odin_tem01	mapflag	nightenabled
+odin_tem02	mapflag	nightenabled
+odin_tem03	mapflag	nightenabled
+hu_fild02	mapflag	nightenabled
+hu_fild03	mapflag	nightenabled
+hu_fild06	mapflag	nightenabled
+ein_fild01	mapflag	nightenabled
+ein_fild02	mapflag	nightenabled
+ein_fild05	mapflag	nightenabled
+yuno_fild10	mapflag	nightenabled
+rachel	mapflag	nightenabled
+ra_fild01	mapflag	nightenabled
+ra_fild02	mapflag	nightenabled
+ra_fild03	mapflag	nightenabled
+ra_fild04	mapflag	nightenabled
+ra_fild05	mapflag	nightenabled
+ra_fild06	mapflag	nightenabled
+ra_fild07	mapflag	nightenabled
+ra_fild08	mapflag	nightenabled
+ra_fild09	mapflag	nightenabled
+ra_fild10	mapflag	nightenabled
+ra_fild11	mapflag	nightenabled
+ra_fild12	mapflag	nightenabled
+ra_fild13	mapflag	nightenabled
+ra_temple	mapflag	nightenabled
+ra_temsky	mapflag	nightenabled
+veins	mapflag	nightenabled
+ve_fild01	mapflag	nightenabled
+ve_fild02	mapflag	nightenabled
+ve_fild03	mapflag	nightenabled
+ve_fild04	mapflag	nightenabled
+ve_fild05	mapflag	nightenabled
+ve_fild06	mapflag	nightenabled
+ve_fild07	mapflag	nightenabled
diff --git a/conf/mapflag/nightmare.txt b/conf/mapflag/nightmare.txt
new file mode 100644
index 000000000..8bf7e3484
--- /dev/null
+++ b/conf/mapflag/nightmare.txt
@@ -0,0 +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	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-5	mapflag	pvp_nightmaredrop	random,equip,300
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
new file mode 100644
index 000000000..1a33a862d
--- /dev/null
+++ b/conf/mapflag/nobranch.txt
@@ -0,0 +1,305 @@
+//===== eAthena Script =======================================
+//= Map flags that disable dead branching
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.2 [Lupus]
+//= 1.3 [massdriller]
+//= 1.6a [Lupus]
+//===== Current Version: =====================================
+
+// Cities ================>\\
+ayo_in01	mapflag	nobranch
+ayo_in02	mapflag	nobranch
+alb_ship	mapflag	nobranch
+alberta_in	mapflag	nobranch
+aldeba_in	mapflag	nobranch
+ama_in01	mapflag	nobranch
+ama_in02	mapflag	nobranch
+ama_test	mapflag	nobranch
+cmd_in01	mapflag	nobranch
+cmd_in02	mapflag	nobranch
+gef_tower	mapflag	nobranch
+geffen_in	mapflag	nobranch
+gon_in	mapflag	nobranch
+gon_test	mapflag	nobranch
+in_orcs01	mapflag	nobranch
+izlude_in	mapflag	nobranch
+jawaii_in	mapflag	nobranch
+lou_in01	mapflag	nobranch
+lou_in02	mapflag	nobranch
+moc_castle	mapflag	nobranch
+morocc_in	mapflag	nobranch
+moscovia	mapflag	nobranch
+mosk_in	mapflag	nobranch
+new_zone01	mapflag	nobranch
+new_zone02	mapflag	nobranch
+new_zone03	mapflag	nobranch
+new_zone04	mapflag	nobranch
+nif_in	mapflag	nobranch
+payon_in01	mapflag	nobranch
+payon_in02	mapflag	nobranch
+payon_in03	mapflag	nobranch
+prt_castle	mapflag	nobranch
+prt_church	mapflag	nobranch
+prt_in	mapflag	nobranch
+um_in	mapflag	nobranch
+xmas_in	mapflag	nobranch
+yuno_in01	mapflag	nobranch
+yuno_in02	mapflag	nobranch
+yuno_in03	mapflag	nobranch
+yuno_in04	mapflag	nobranch
+yuno_in05	mapflag	nobranch
+que_sign01	mapflag	nobranch
+ein_in01	mapflag	nobranch
+airport	mapflag	nobranch
+airplane	mapflag	nobranch
+airplane_01	mapflag	nobranch
+yuno_pre	mapflag	nobranch
+y_airport	mapflag	nobranch
+lhz_airport	mapflag	nobranch
+lhz_in01	mapflag	nobranch
+lhz_in02	mapflag	nobranch
+lhz_in03	mapflag	nobranch
+lhz_que01	mapflag	nobranch
+lhz_cube	mapflag	nobranch
+hu_in01	mapflag	nobranch
+auction_01	mapflag	nobranch
+auction_02	mapflag	nobranch
+p_track01	mapflag	nobranch
+p_track02	mapflag	nobranch
+ra_in01	mapflag	nobranch
+ra_temin	mapflag	nobranch
+ra_temple	mapflag	nobranch
+ra_temsky	mapflag	nobranch
+ve_in	mapflag	nobranch
+ve_in02	mapflag	nobranch
+thor_camp	mapflag	nobranch
+
+// Job Quests ====================
+job_sword1	mapflag	nobranch
+job_thief1	mapflag	nobranch
+// 2-1
+job_knt	mapflag	nobranch
+job_prist	mapflag	nobranch
+job_wiz	mapflag	nobranch
+job_hunte	mapflag	nobranch
+in_hunter	mapflag	nobranch
+in_moc_16	mapflag	nobranch
+// 2-2
+alde_alche	mapflag	nobranch
+job_cru	mapflag	nobranch
+job_duncer	mapflag	nobranch
+job_monk	mapflag	nobranch
+monk_test	mapflag	nobranch
+monk_in	mapflag	nobranch
+in_rogue	mapflag	nobranch
+job_sage	mapflag	nobranch
+que_ng	mapflag	nobranch
+job_soul	mapflag	nobranch
+job_star	mapflag	nobranch
+
+// Special Quests Places =========
+que_god01	mapflag	nobranch
+que_god02	mapflag	nobranch
+que_bingo	mapflag	nobranch
+que_hugel	mapflag	nobranch
+poring_c01	mapflag	nobranch
+poring_c02	mapflag	nobranch
+kh_mansion	mapflag	nobranch
+kh_rossi	mapflag	nobranch
+kh_school	mapflag	nobranch
+kh_vila	mapflag	nobranch
+kh_kiehl01	mapflag	nobranch
+kh_kiehl02	mapflag	nobranch
+que_rachel	mapflag	nobranch
+que_san04	mapflag	nobranch
+que_thor	mapflag	nobranch
+
+// Guild Castles ==================
+//alde_gld	mapflag	nobranch
+aldeg_cas01	mapflag	nobranch
+aldeg_cas02	mapflag	nobranch
+aldeg_cas03	mapflag	nobranch
+aldeg_cas04	mapflag	nobranch
+aldeg_cas05	mapflag	nobranch
+gefg_cas01	mapflag	nobranch
+gefg_cas02	mapflag	nobranch
+gefg_cas03	mapflag	nobranch
+gefg_cas04	mapflag	nobranch
+gefg_cas05	mapflag	nobranch
+//pay_gld	mapflag	nobranch
+payg_cas01	mapflag	nobranch
+payg_cas02	mapflag	nobranch
+payg_cas03	mapflag	nobranch
+payg_cas04	mapflag	nobranch
+payg_cas05	mapflag	nobranch
+//prt_gld	mapflag	nobranch
+prtg_cas01	mapflag	nobranch
+prtg_cas02	mapflag	nobranch
+prtg_cas03	mapflag	nobranch
+prtg_cas04	mapflag	nobranch
+prtg_cas05	mapflag	nobranch
+//schg_gld
+schg_cas01	mapflag	nobranch
+schg_cas02	mapflag	nobranch
+schg_cas03	mapflag	nobranch
+schg_cas04	mapflag	nobranch
+schg_cas05	mapflag	nobranch
+
+//n_castle	mapflag	nobranch
+nguild_alde	mapflag	nobranch
+nguild_gef	mapflag	nobranch
+nguild_pay	mapflag	nobranch
+nguild_prt	mapflag	nobranch
+
+// GvG Arenas =====================
+guild_vs1	mapflag	nobranch
+guild_vs2	mapflag	nobranch
+guild_vs3	mapflag	nobranch
+guild_vs4	mapflag	nobranch
+guild_vs5	mapflag	nobranch
+
+// Arenas ================>\\
+arena_room	mapflag	nobranch
+force_1-1	mapflag	nobranch
+force_1-2	mapflag	nobranch
+force_1-3	mapflag	nobranch
+ordeal_1-1	mapflag	nobranch
+ordeal_1-2	mapflag	nobranch
+ordeal_1-3	mapflag	nobranch
+ordeal_2-1	mapflag	nobranch
+ordeal_2-2	mapflag	nobranch
+ordeal_2-3	mapflag	nobranch
+ordeal_3-1	mapflag	nobranch
+ordeal_3-2	mapflag	nobranch
+ordeal_3-3	mapflag	nobranch
+pvp_2vs2	mapflag	nobranch
+pvp_c_room	mapflag	nobranch
+quiz_00	mapflag	nobranch
+quiz_01	mapflag	nobranch
+sec_in01	mapflag	nobranch
+//hunter_1-1	mapflag	nobranch
+//hunter_2-1	mapflag	nobranch
+//hunter_3-1	mapflag	nobranch
+//knight_1-1	mapflag	nobranch
+//knight_2-1	mapflag	nobranch
+//knight_3-1	mapflag	nobranch
+//priest_1-1	mapflag	nobranch
+//priest_2-1	mapflag	nobranch
+//priest_3-1	mapflag	nobranch
+prt_are_in	mapflag	nobranch
+prt_are01	mapflag	nobranch
+//wizard_1-1	mapflag	nobranch
+//wizard_2-1	mapflag	nobranch
+//wizard_3-1	mapflag	nobranch
+
+// PvP Arenas =========================
+pvp_y_room	mapflag	nobranch
+pvp_y_1-1	mapflag	nobranch
+pvp_y_1-2	mapflag	nobranch
+pvp_y_1-3	mapflag	nobranch
+pvp_y_1-4	mapflag	nobranch
+pvp_y_1-5	mapflag	nobranch
+pvp_y_2-1	mapflag	nobranch
+pvp_y_2-2	mapflag	nobranch
+pvp_y_2-3	mapflag	nobranch
+pvp_y_2-4	mapflag	nobranch
+pvp_y_2-5	mapflag	nobranch
+pvp_y_3-1	mapflag	nobranch
+pvp_y_3-2	mapflag	nobranch
+pvp_y_3-3	mapflag	nobranch
+pvp_y_3-4	mapflag	nobranch
+pvp_y_3-5	mapflag	nobranch
+pvp_y_4-1	mapflag	nobranch
+pvp_y_4-2	mapflag	nobranch
+pvp_y_4-3	mapflag	nobranch
+pvp_y_4-4	mapflag	nobranch
+pvp_y_4-5	mapflag	nobranch
+pvp_y_5-1	mapflag	nobranch
+pvp_y_5-2	mapflag	nobranch
+pvp_y_5-3	mapflag	nobranch
+pvp_y_5-4	mapflag	nobranch
+pvp_y_5-5	mapflag	nobranch
+pvp_y_6-1	mapflag	nobranch
+pvp_y_6-2	mapflag	nobranch
+pvp_y_6-3	mapflag	nobranch
+pvp_y_6-4	mapflag	nobranch
+pvp_y_6-5	mapflag	nobranch
+pvp_y_7-1	mapflag	nobranch
+pvp_y_7-2	mapflag	nobranch
+pvp_y_7-3	mapflag	nobranch
+pvp_y_7-4	mapflag	nobranch
+pvp_y_7-5	mapflag	nobranch
+pvp_y_8-1	mapflag	nobranch
+pvp_y_8-2	mapflag	nobranch
+pvp_y_8-3	mapflag	nobranch
+pvp_y_8-4	mapflag	nobranch
+pvp_y_8-5	mapflag	nobranch
+pvp_n_room	mapflag	nobranch
+pvp_n_1-1	mapflag	nobranch
+pvp_n_1-2	mapflag	nobranch
+pvp_n_1-3	mapflag	nobranch
+pvp_n_1-4	mapflag	nobranch
+pvp_n_1-5	mapflag	nobranch
+pvp_n_2-1	mapflag	nobranch
+pvp_n_2-2	mapflag	nobranch
+pvp_n_2-3	mapflag	nobranch
+pvp_n_2-4	mapflag	nobranch
+pvp_n_2-5	mapflag	nobranch
+pvp_n_3-1	mapflag	nobranch
+pvp_n_3-2	mapflag	nobranch
+pvp_n_3-3	mapflag	nobranch
+pvp_n_3-4	mapflag	nobranch
+pvp_n_3-5	mapflag	nobranch
+pvp_n_4-1	mapflag	nobranch
+pvp_n_4-2	mapflag	nobranch
+pvp_n_4-3	mapflag	nobranch
+pvp_n_4-4	mapflag	nobranch
+pvp_n_4-5	mapflag	nobranch
+pvp_n_5-1	mapflag	nobranch
+pvp_n_5-2	mapflag	nobranch
+pvp_n_5-3	mapflag	nobranch
+pvp_n_5-4	mapflag	nobranch
+pvp_n_5-5	mapflag	nobranch
+pvp_n_6-1	mapflag	nobranch
+pvp_n_6-2	mapflag	nobranch
+pvp_n_6-3	mapflag	nobranch
+pvp_n_6-4	mapflag	nobranch
+pvp_n_6-5	mapflag	nobranch
+pvp_n_7-1	mapflag	nobranch
+pvp_n_7-2	mapflag	nobranch
+pvp_n_7-3	mapflag	nobranch
+pvp_n_7-4	mapflag	nobranch
+pvp_n_7-5	mapflag	nobranch
+pvp_n_8-1	mapflag	nobranch
+pvp_n_8-2	mapflag	nobranch
+pvp_n_8-3	mapflag	nobranch
+pvp_n_8-4	mapflag	nobranch
+pvp_n_8-5	mapflag	nobranch
+pvp_2vs2	mapflag	nobranch
+
+//Main City maps
+alberta	mapflag	nobranch
+aldebaran	mapflag	nobranch
+amatsu	mapflag	nobranch
+ayothaya	mapflag	nobranch
+comodo	mapflag	nobranch
+einbroch	mapflag	nobranch
+einbech	mapflag	nobranch
+geffen	mapflag	nobranch
+gonryun	mapflag	nobranch
+izlude	mapflag	nobranch
+jawaii	mapflag	nobranch
+hugel	mapflag	nobranch
+lighthalzen	mapflag	nobranch
+louyang	mapflag	nobranch
+morocc	mapflag	nobranch
+niflheim	mapflag	nobranch
+prontera	mapflag	nobranch
+payon	mapflag	nobranch
+pay_arche	mapflag	nobranch
+umbala	mapflag	nobranch
+xmas	mapflag	nobranch
+yuno	mapflag	nobranch
+rachel	mapflag	nobranch
+veins	mapflag	nobranch
diff --git a/conf/mapflag/noexp.txt b/conf/mapflag/noexp.txt
new file mode 100644
index 000000000..f01181b38
--- /dev/null
+++ b/conf/mapflag/noexp.txt
@@ -0,0 +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	mapflag	noexp
+job_sword1	mapflag	noexp
+in_moc_16	mapflag	noexp
+job_hunte	mapflag	noexp
+job_knt	mapflag	noexp
+job_prist	mapflag	noexp
+job_wiz	mapflag	noexp
+job_cru	mapflag	noexp
+monk_test	mapflag	noexp
+in_rogue	mapflag	noexp
+job_sage	mapflag	noexp
+job_soul	mapflag	noexp
+job_star	mapflag	noexp
+que_ng	mapflag	noexp
diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt
new file mode 100644
index 000000000..a27e4cc90
--- /dev/null
+++ b/conf/mapflag/noicewall.txt
@@ -0,0 +1,128 @@
+//===== 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.6a Re-enabled icewalls for cities [Lupus]
+//============================================================
+
+ayo_in01	mapflag	noicewall
+ayo_in02	mapflag	noicewall
+alberta_in	mapflag	noicewall
+//alberta	mapflag	noicewall
+alde_alche	mapflag	noicewall
+aldeba_in	mapflag	noicewall
+//aldebaran	mapflag	noicewall
+ama_in01	mapflag	noicewall
+ama_in02	mapflag	noicewall
+//amatsu	mapflag	noicewall
+//ayothaya	mapflag	noicewall
+cmd_in01	mapflag	noicewall
+cmd_in02	mapflag	noicewall
+//comodo	mapflag	noicewall
+//einbroch	mapflag	noicewall
+//einbech	mapflag	noicewall
+gef_tower	mapflag	noicewall
+//geffen	mapflag	noicewall
+geffen_in	mapflag	noicewall
+gon_in	mapflag	noicewall
+//gonryun	mapflag	noicewall
+in_hunter	mapflag	noicewall
+in_moc_16	mapflag	noicewall
+in_orcs01	mapflag	noicewall
+izlude_in	mapflag	noicewall
+//izlude	mapflag	noicewall
+//hugel	mapflag	noicewall
+//jawaii	mapflag	noicewall
+moc_castle	mapflag	noicewall
+monk_in	mapflag	noicewall
+morocc_in	mapflag	noicewall
+//morocc	mapflag	noicewall
+mosk_in	mapflag	noicewall
+payon_in01	mapflag	noicewall
+payon_in02	mapflag	noicewall
+payon_in03	mapflag	noicewall
+//payon	mapflag	noicewall
+//pay_arche	mapflag	noicewall
+prt_are_in	mapflag	noicewall
+prt_are01	mapflag	noicewall
+prt_castle	mapflag	noicewall
+prt_church	mapflag	noicewall
+prt_in	mapflag	noicewall
+//prontera	mapflag	noicewall
+sec_in01	mapflag	noicewall
+job_sword1	mapflag	noicewall
+um_in	mapflag	noicewall
+//umbala	mapflag	noicewall
+xmas_in	mapflag	noicewall
+//xmas	mapflag	noicewall
+yuno_in01	mapflag	noicewall
+yuno_in02	mapflag	noicewall
+yuno_in03	mapflag	noicewall
+yuno_in04	mapflag	noicewall
+yuno_in05	mapflag	noicewall
+//yuno	mapflag	noicewall
+gon_test	mapflag	noicewall
+nif_in	mapflag	noicewall
+//louyang	mapflag	noicewall
+que_sign01	mapflag	noicewall
+ein_in01	mapflag	noicewall
+airport	mapflag	noicewall
+airplane	mapflag	noicewall
+airplane_01	mapflag	noicewall
+//lighthalzen	mapflag	noicewall
+yuno_pre	mapflag	noicewall
+y_airport	mapflag	noicewall
+lhz_airport	mapflag	noicewall
+lhz_in01	mapflag	noicewall
+lhz_in02	mapflag	noicewall
+lhz_in03	mapflag	noicewall
+//rachel	mapflag	noicewall
+ra_in01	mapflag	noicewall
+ra_temin	mapflag	noicewall
+ra_temple	mapflag	noicewall
+ra_temsky	mapflag	noicewall
+que_rachel	mapflag	noicewall
+auction_01	mapflag	noicewall
+auction_02	mapflag	noicewall
+hu_in01	mapflag	noicewall
+kh_mansion	mapflag	noicewall
+kh_rossi	mapflag	noicewall
+kh_school	mapflag	noicewall
+kh_vila	mapflag	noicewall
+ve_in	mapflag	noicewall
+ve_in02	mapflag	noicewall
+
+// Guild Castles ==========
+aldeg_cas01	mapflag	noicewall
+aldeg_cas02	mapflag	noicewall
+aldeg_cas03	mapflag	noicewall
+aldeg_cas04	mapflag	noicewall
+aldeg_cas05	mapflag	noicewall
+gefg_cas01	mapflag	noicewall
+gefg_cas02	mapflag	noicewall
+gefg_cas03	mapflag	noicewall
+gefg_cas04	mapflag	noicewall
+gefg_cas05	mapflag	noicewall
+payg_cas01	mapflag	noicewall
+payg_cas02	mapflag	noicewall
+payg_cas03	mapflag	noicewall
+payg_cas04	mapflag	noicewall
+payg_cas05	mapflag	noicewall
+prtg_cas01	mapflag	noicewall
+prtg_cas02	mapflag	noicewall
+prtg_cas03	mapflag	noicewall
+prtg_cas04	mapflag	noicewall
+prtg_cas05	mapflag	noicewall
+schg_cas01	mapflag	noicewall
+schg_cas02	mapflag	noicewall
+schg_cas03	mapflag	noicewall
+schg_cas04	mapflag	noicewall
+schg_cas05	mapflag	noicewall
+// Novice Guild Castles ===
+nguild_alde	mapflag	noicewall
+nguild_gef	mapflag	noicewall
+nguild_pay	mapflag	noicewall
+nguild_prt	mapflag	noicewall
diff --git a/conf/mapflag/noloot.txt b/conf/mapflag/noloot.txt
new file mode 100644
index 000000000..a260ed5b3
--- /dev/null
+++ b/conf/mapflag/noloot.txt
@@ -0,0 +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	mapflag	noloot
+in_moc_16	mapflag	noloot
+job_hunte	mapflag	noloot
+job_knt	mapflag	noloot
+job_prist	mapflag	noloot
+job_wiz	mapflag	noloot
+job_cru	mapflag	noloot
+monk_test	mapflag	noloot
+in_rogue	mapflag	noloot
+job_sage	mapflag	noloot
+job_soul	mapflag	noloot
+job_star	mapflag	noloot
+que_ng	mapflag	noloot
+
+//Thieves have to gather some mushrooms. So they need loot
+//job_thief1	mapflag	noloot
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
new file mode 100644
index 000000000..e5ea69811
--- /dev/null
+++ b/conf/mapflag/nomemo.txt
@@ -0,0 +1,570 @@
+//===== eAthena Script =======================================
+//= Map flags that disable warp portal memory
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.6a added up to Hugel maps. [Lupus]
+//===== Current Version: =====================================
+
+
+// Towns  ====================
+ayo_in01	mapflag	nomemo
+ayo_in02	mapflag	nomemo
+alb_ship	mapflag	nomemo
+alberta_in	mapflag	nomemo
+aldeba_in	mapflag	nomemo
+ama_in01	mapflag	nomemo
+ama_in02	mapflag	nomemo
+ama_test	mapflag	nomemo
+cmd_in01	mapflag	nomemo
+cmd_in02	mapflag	nomemo
+gef_tower	mapflag	nomemo
+geffen_in	mapflag	nomemo
+gon_test	mapflag	nomemo
+gon_in	mapflag	nomemo
+in_orcs01	mapflag	nomemo
+izlude_in	mapflag	nomemo
+jawaii_in	mapflag	nomemo
+lou_in01	mapflag	nomemo
+lou_in02	mapflag	nomemo
+moc_castle	mapflag	nomemo
+morocc_in	mapflag	nomemo
+mosk_in	mapflag	nomemo
+mosk_ship	mapflag	nomemo
+mosk_fild01	mapflag	nomemo
+mosk_fild02	mapflag	nomemo
+mosk_dun01	mapflag	nomemo
+mosk_dun02	mapflag	nomemo
+mosk_dun03	mapflag	nomemo
+nameless_in	mapflag	nomemo
+niflheim	mapflag	nomemo
+nif_in	mapflag	nomemo
+new_zone01	mapflag	nomemo
+new_zone02	mapflag	nomemo
+new_zone03	mapflag	nomemo
+new_zone04	mapflag	nomemo
+pay_arche	mapflag	nomemo
+payon_in01	mapflag	nomemo
+payon_in02	mapflag	nomemo
+payon_in03	mapflag	nomemo
+prt_castle	mapflag	nomemo
+prt_church	mapflag	nomemo
+prt_in	mapflag	nomemo
+um_in	mapflag	nomemo
+xmas_in	mapflag	nomemo
+valkyrie	mapflag	nomemo
+yuno_in01	mapflag	nomemo
+yuno_in02	mapflag	nomemo
+yuno_in03	mapflag	nomemo
+yuno_in04	mapflag	nomemo
+yuno_in05	mapflag	nomemo
+yuno	mapflag	nomemo
+ein_in01	mapflag	nomemo
+airport	mapflag	nomemo
+airplane	mapflag	nomemo
+airplane_01	mapflag	nomemo
+lighthalzen	mapflag	nomemo
+yuno_pre	mapflag	nomemo
+y_airport	mapflag	nomemo
+lhz_airport	mapflag	nomemo
+einbroch	mapflag	nomemo
+einbech	mapflag	nomemo
+lhz_cube	mapflag	nomemo
+lhz_in01	mapflag	nomemo
+lhz_in02	mapflag	nomemo
+lhz_in03	mapflag	nomemo
+hu_in01	mapflag	nomemo
+auction_01	mapflag	nomemo
+auction_02	mapflag	nomemo
+p_track01	mapflag	nomemo
+p_track02	mapflag	nomemo
+ra_in01	mapflag	nomemo
+ra_temin	mapflag	nomemo
+ra_temsky	mapflag	nomemo
+veins	mapflag	nomemo
+ve_in	mapflag	nomemo
+ve_in02	mapflag	nomemo
+thor_camp	mapflag	nomemo
+
+// Fields  ===================
+alb2trea	mapflag	nomemo
+ayo_fild02	mapflag	nomemo
+cmd_fild01	mapflag	nomemo
+cmd_fild02	mapflag	nomemo
+cmd_fild03	mapflag	nomemo
+cmd_fild04	mapflag	nomemo
+cmd_fild05	mapflag	nomemo
+cmd_fild06	mapflag	nomemo
+cmd_fild07	mapflag	nomemo
+cmd_fild08	mapflag	nomemo
+cmd_fild09	mapflag	nomemo
+gef_fild02	mapflag	nomemo
+gef_fild03	mapflag	nomemo
+gef_fild06	mapflag	nomemo
+gef_fild08	mapflag	nomemo
+gef_fild10	mapflag	nomemo
+gef_fild11	mapflag	nomemo
+gef_fild12	mapflag	nomemo
+gef_fild14	mapflag	nomemo
+glast_01	mapflag	nomemo
+hu_fild01	mapflag	nomemo
+hu_fild05	mapflag	nomemo
+izlu2dun	mapflag	nomemo
+mjolnir_01	mapflag	nomemo
+mjolnir_02	mapflag	nomemo
+mjolnir_03	mapflag	nomemo
+mjolnir_04	mapflag	nomemo
+mjolnir_05	mapflag	nomemo
+mjolnir_07	mapflag	nomemo
+mjolnir_08	mapflag	nomemo
+mjolnir_10	mapflag	nomemo
+mjolnir_11	mapflag	nomemo
+moc_fild01	mapflag	nomemo
+moc_fild02	mapflag	nomemo
+moc_fild03	mapflag	nomemo
+moc_fild04	mapflag	nomemo
+moc_fild05	mapflag	nomemo
+moc_fild08	mapflag	nomemo
+moc_fild09	mapflag	nomemo
+moc_fild13	mapflag	nomemo
+moc_fild14	mapflag	nomemo
+moc_fild15	mapflag	nomemo
+moc_fild16	mapflag	nomemo
+moc_fild17	mapflag	nomemo
+moc_fild18	mapflag	nomemo
+nif_fild01	mapflag	nomemo
+nif_fild02	mapflag	nomemo
+pay_fild02	mapflag	nomemo
+pay_fild04	mapflag	nomemo
+pay_fild05	mapflag	nomemo
+pay_fild09	mapflag	nomemo
+pay_fild10	mapflag	nomemo
+pay_fild11	mapflag	nomemo
+prt_fild00	mapflag	nomemo
+prt_fild03	mapflag	nomemo
+prt_fild04	mapflag	nomemo
+prt_fild09	mapflag	nomemo
+prt_fild10	mapflag	nomemo
+prt_fild11	mapflag	nomemo
+prt_monk	mapflag	nomemo
+um_fild01	mapflag	nomemo
+um_fild02	mapflag	nomemo
+um_fild03	mapflag	nomemo
+yuno_fild02	mapflag	nomemo
+yuno_fild03	mapflag	nomemo
+yuno_fild04	mapflag	nomemo
+yuno_fild05	mapflag	nomemo
+yuno_fild07	mapflag	nomemo
+yuno_fild08	mapflag	nomemo
+yuno_fild09	mapflag	nomemo
+yuno_fild10	mapflag	nomemo
+ra_fild01	mapflag	nomemo
+ra_fild02	mapflag	nomemo
+ra_fild03	mapflag	nomemo
+ra_fild04	mapflag	nomemo
+ra_fild05	mapflag	nomemo
+ra_fild06	mapflag	nomemo
+ra_fild10	mapflag	nomemo
+ve_fild01	mapflag	nomemo
+ve_fild02	mapflag	nomemo
+ve_fild03	mapflag	nomemo
+ve_fild04	mapflag	nomemo
+ve_fild06	mapflag	nomemo
+
+// Job Quests ================
+// First Job Class
+job_sword1	mapflag	nomemo
+job_thief1	mapflag	nomemo
+job_star	mapflag	nomemo
+// Primary Second Job Class
+job_prist	mapflag	nomemo
+job_wiz	mapflag	nomemo
+job_hunte	mapflag	nomemo
+in_hunter	mapflag	nomemo
+in_moc_16	mapflag	nomemo
+// Secondary Second Job Class
+alde_alche	mapflag	nomemo
+job_cru	mapflag	nomemo
+job_duncer	mapflag	nomemo
+job_monk	mapflag	nomemo
+monk_test	mapflag	nomemo
+monk_in	mapflag	nomemo
+in_rogue	mapflag	nomemo
+job_sage	mapflag	nomemo
+job_soul	mapflag	nomemo
+que_ng	mapflag	nomemo
+
+// Special Quests Places =====
+que_god01	mapflag	nomemo
+que_god02	mapflag	nomemo
+que_bingo	mapflag	nomemo
+que_sign01	mapflag	nomemo
+que_hugel	mapflag	nomemo
+que_rachel	mapflag	nomemo
+que_san04	mapflag	nomemo
+que_thor	mapflag	nomemo
+poring_c01	mapflag	nomemo
+poring_c02	mapflag	nomemo
+// Dungeons =================
+alde_dun01	mapflag	nomemo
+alde_dun02	mapflag	nomemo
+alde_dun03	mapflag	nomemo
+alde_dun04	mapflag	nomemo
+// Anthelll ------------------
+anthell01	mapflag	nomemo
+anthell02	mapflag	nomemo
+// Amatsu Dungeon ------------
+ama_dun01	mapflag	nomemo
+ama_dun02	mapflag	nomemo
+ama_dun03	mapflag	nomemo
+// Ayothaya
+ayo_dun01	mapflag	nomemo
+ayo_dun02	mapflag	nomemo
+// Comodo Beach --------------
+beach_dun	mapflag	nomemo
+beach_dun2	mapflag	nomemo
+beach_dun3	mapflag	nomemo
+// Clock Tower ---------------
+c_tower1	mapflag	nomemo
+c_tower2	mapflag	nomemo
+c_tower3	mapflag	nomemo
+c_tower4	mapflag	nomemo
+// Einbech Mines -------------
+ein_dun01	mapflag	nomemo
+ein_dun02	mapflag	nomemo
+// Geffen Dun ----------------
+gef_dun00	mapflag	nomemo
+gef_dun01	mapflag	nomemo
+gef_dun02	mapflag	nomemo
+gef_dun03	mapflag	nomemo
+// Glast Hiem ----------------
+gl_cas01	mapflag	nomemo
+gl_cas02	mapflag	nomemo
+gl_church	mapflag	nomemo
+gl_chyard	mapflag	nomemo
+gl_dun01	mapflag	nomemo
+gl_dun02	mapflag	nomemo
+gl_in01	mapflag	nomemo
+gl_knt01	mapflag	nomemo
+gl_knt02	mapflag	nomemo
+gl_prison	mapflag	nomemo
+gl_prison1	mapflag	nomemo
+gl_sew01	mapflag	nomemo
+gl_sew02	mapflag	nomemo
+gl_sew03	mapflag	nomemo
+gl_sew04	mapflag	nomemo
+gl_step	mapflag	nomemo
+// Guild Dun -----------------
+gld_dun01	mapflag	nomemo
+gld_dun02	mapflag	nomemo
+gld_dun03	mapflag	nomemo
+gld_dun04	mapflag	nomemo
+// Bayalan Island ------------
+iz_dun00	mapflag	nomemo
+iz_dun01	mapflag	nomemo
+iz_dun02	mapflag	nomemo
+iz_dun03	mapflag	nomemo
+iz_dun04	mapflag	nomemo
+// Sphinx --------------------
+in_sphinx1	mapflag	nomemo
+in_sphinx2	mapflag	nomemo
+in_sphinx3	mapflag	nomemo
+in_sphinx4	mapflag	nomemo
+in_sphinx5	mapflag	nomemo
+// Louyang Dun --------------
+lou_dun03	mapflag	nomemo
+lou_dun02	mapflag	nomemo
+lou_dun01	mapflag	nomemo
+// Magma Dun -----------------
+mag_dun01	mapflag	nomemo
+mag_dun02	mapflag	nomemo
+// Pyrmaids ------------------
+moc_pryd01	mapflag	nomemo
+moc_pryd02	mapflag	nomemo
+moc_pryd03	mapflag	nomemo
+moc_pryd04	mapflag	nomemo
+moc_pryd05	mapflag	nomemo
+moc_pryd06	mapflag	nomemo
+moc_prydb1	mapflag	nomemo
+// Coal Mine(Dead Pitt) ------
+mjo_dun01	mapflag	nomemo
+mjo_dun02	mapflag	nomemo
+mjo_dun03	mapflag	nomemo
+// Orc Dun -------------------
+orcsdun01	mapflag	nomemo
+orcsdun02	mapflag	nomemo
+// Payon Cave ----------------
+pay_dun00	mapflag	nomemo
+pay_dun01	mapflag	nomemo
+pay_dun02	mapflag	nomemo
+pay_dun03	mapflag	nomemo
+pay_dun04	mapflag	nomemo
+// Hidden Temple  ------------
+prt_maze01	mapflag	nomemo
+prt_maze02	mapflag	nomemo
+prt_maze03	mapflag	nomemo
+// Culvert Sewers ------------
+prt_sewb1	mapflag	nomemo
+prt_sewb2	mapflag	nomemo
+prt_sewb3	mapflag	nomemo
+prt_sewb4	mapflag	nomemo
+// Gonryun Dun ---------------
+gon_dun01	mapflag	nomemo
+gon_dun02	mapflag	nomemo
+gon_dun03	mapflag	nomemo
+// Sunken Ship ---------------
+treasure01	mapflag	nomemo
+treasure02	mapflag	nomemo
+// Turtle Island -------------
+tur_dun01	mapflag	nomemo
+tur_dun02	mapflag	nomemo
+tur_dun03	mapflag	nomemo
+tur_dun04	mapflag	nomemo
+tur_dun05	mapflag	nomemo
+tur_dun06	mapflag	nomemo
+// Umbala Dun ----------------
+um_dun01	mapflag	nomemo
+um_dun02	mapflag	nomemo
+// Toy Factory ---------------
+xmas_dun01	mapflag	nomemo
+xmas_dun02	mapflag	nomemo
+// Yggdrasil Tree Dun --------
+yggdrasil01	mapflag	nomemo
+// Old Geffenia --------------
+gefenia01	mapflag	nomemo
+gefenia02	mapflag	nomemo
+gefenia03	mapflag	nomemo
+gefenia04	mapflag	nomemo
+// Bio Lab Dungeon -----------
+lhz_dun01	mapflag	nomemo
+lhz_dun02	mapflag	nomemo
+lhz_dun03	mapflag	nomemo
+// Juperos Dungeon -----------
+juperos_01	mapflag	nomemo
+juperos_02	mapflag	nomemo
+jupe_area1	mapflag	nomemo
+jupe_area2	mapflag	nomemo
+jupe_core	mapflag	nomemo
+jupe_ele	mapflag	nomemo
+jupe_ele_r	mapflag	nomemo
+jupe_gate	mapflag	nomemo
+jupe_cave	mapflag	nomemo
+// Thanatos Tower ------------
+thana_boss	mapflag	nomemo
+tha_scene01	mapflag	nomemo
+tha_t01	mapflag	nomemo
+tha_t02	mapflag	nomemo
+tha_t03	mapflag	nomemo
+tha_t04	mapflag	nomemo
+tha_t05	mapflag	nomemo
+tha_t06	mapflag	nomemo
+tha_t07	mapflag	nomemo
+tha_t08	mapflag	nomemo
+tha_t09	mapflag	nomemo
+tha_t10	mapflag	nomemo
+tha_t11	mapflag	nomemo
+tha_t12	mapflag	nomemo
+thana_step	mapflag	nomemo
+// Abyss Lake Dungeon --------
+abyss_01	mapflag	nomemo
+abyss_02	mapflag	nomemo
+abyss_03	mapflag	nomemo
+//Odin's Temple & Kiehl
+odin_tem01	mapflag	nomemo
+odin_tem02	mapflag	nomemo
+odin_tem03	mapflag	nomemo
+kh_kiehl02	mapflag	nomemo
+kh_kiehl01	mapflag	nomemo
+kh_dun02	mapflag	nomemo
+kh_dun01	mapflag	nomemo
+kh_mansion	mapflag	nomemo
+kh_rossi	mapflag	nomemo
+kh_school	mapflag	nomemo
+kh_vila	mapflag	nomemo
+//Ice Dungeon
+ice_dun01	mapflag	nomemo
+ice_dun02	mapflag	nomemo
+ice_dun03	mapflag	nomemo
+ice_dun04	mapflag	nomemo
+//Rachel Santuary
+ra_san01	mapflag	nomemo
+ra_san02	mapflag	nomemo
+ra_san03	mapflag	nomemo
+ra_san04	mapflag	nomemo
+ra_san05	mapflag	nomemo
+//Thor Volcano
+thor_v01	mapflag	nomemo
+thor_v02	mapflag	nomemo
+thor_v03	mapflag	nomemo
+//Cursed Abbey
+nameless_n	mapflag	nomemo
+abbey01	mapflag	nomemo
+abbey02	mapflag	nomemo
+abbey03	mapflag	nomemo
+
+// Guild Castles =============
+//alde_gld	mapflag	nomemo
+aldeg_cas01	mapflag	nomemo
+aldeg_cas02	mapflag	nomemo
+aldeg_cas03	mapflag	nomemo
+aldeg_cas04	mapflag	nomemo
+aldeg_cas05	mapflag	nomemo
+gefg_cas01	mapflag	nomemo
+gefg_cas02	mapflag	nomemo
+gefg_cas03	mapflag	nomemo
+gefg_cas04	mapflag	nomemo
+gefg_cas05	mapflag	nomemo
+//pay_gld	mapflag	nomemo
+payg_cas01	mapflag	nomemo
+payg_cas02	mapflag	nomemo
+payg_cas03	mapflag	nomemo
+payg_cas04	mapflag	nomemo
+payg_cas05	mapflag	nomemo
+//prt_gld	mapflag	nomemo
+prtg_cas01	mapflag	nomemo
+prtg_cas02	mapflag	nomemo
+prtg_cas03	mapflag	nomemo
+prtg_cas04	mapflag	nomemo
+prtg_cas05	mapflag	nomemo
+gefg_cas01	mapflag	nomemo
+gefg_cas02	mapflag	nomemo
+gefg_cas03	mapflag	nomemo
+gefg_cas04	mapflag	nomemo
+gefg_cas05	mapflag	nomemo
+nguild_alde	mapflag	nomemo
+nguild_gef	mapflag	nomemo
+nguild_pay	mapflag	nomemo
+nguild_prt	mapflag	nomemo
+schg_cas01	mapflag	nomemo
+schg_cas02	mapflag	nomemo
+schg_cas03	mapflag	nomemo
+schg_cas04	mapflag	nomemo
+schg_cas05	mapflag	nomemo
+//To Protect Novices Guilds from level abusers
+n_castle	mapflag	nomemo
+
+// GvG Arenas ================
+guild_vs1	mapflag	nomemo
+guild_vs2	mapflag	nomemo
+guild_vs3	mapflag	nomemo
+guild_vs4	mapflag	nomemo
+guild_vs5	mapflag	nomemo
+
+// Arenas ====================
+arena_room	mapflag	nomemo
+force_1-1	mapflag	nomemo
+force_1-2	mapflag	nomemo
+force_1-3	mapflag	nomemo
+ordeal_1-1	mapflag	nomemo
+ordeal_1-2	mapflag	nomemo
+ordeal_1-3	mapflag	nomemo
+ordeal_2-1	mapflag	nomemo
+ordeal_2-2	mapflag	nomemo
+ordeal_2-3	mapflag	nomemo
+ordeal_3-1	mapflag	nomemo
+ordeal_3-2	mapflag	nomemo
+ordeal_3-3	mapflag	nomemo
+pvp_c_room	mapflag	nomemo
+quiz_00	mapflag	nomemo
+quiz_01	mapflag	nomemo
+sec_in01	mapflag	nomemo
+sec_in02	mapflag	nomemo
+//hunter_1-1	mapflag	nomemo
+//hunter_2-1	mapflag	nomemo
+//hunter_3-1	mapflag	nomemo
+//knight_1-1	mapflag	nomemo
+//knight_2-1	mapflag	nomemo
+//knight_3-1	mapflag	nomemo
+//priest_1-1	mapflag	nomemo
+//priest_2-1	mapflag	nomemo
+//priest_3-1	mapflag	nomemo
+prt_are_in	mapflag	nomemo
+prt_are_in	mapflag	nomemo
+prt_are01	mapflag	nomemo
+//wizard_1-1	mapflag	nomemo
+//wizard_2-1	mapflag	nomemo
+//wizard_3-1	mapflag	nomemo
+
+// PvP Arenas ================
+pvp_y_room	mapflag	nomemo
+pvp_y_1-1	mapflag	nomemo
+pvp_y_1-2	mapflag	nomemo
+pvp_y_1-3	mapflag	nomemo
+pvp_y_1-4	mapflag	nomemo
+pvp_y_1-5	mapflag	nomemo
+pvp_y_2-1	mapflag	nomemo
+pvp_y_2-2	mapflag	nomemo
+pvp_y_2-3	mapflag	nomemo
+pvp_y_2-4	mapflag	nomemo
+pvp_y_2-5	mapflag	nomemo
+pvp_y_3-1	mapflag	nomemo
+pvp_y_3-2	mapflag	nomemo
+pvp_y_3-3	mapflag	nomemo
+pvp_y_3-4	mapflag	nomemo
+pvp_y_3-5	mapflag	nomemo
+pvp_y_4-1	mapflag	nomemo
+pvp_y_4-2	mapflag	nomemo
+pvp_y_4-3	mapflag	nomemo
+pvp_y_4-4	mapflag	nomemo
+pvp_y_4-5	mapflag	nomemo
+pvp_y_5-1	mapflag	nomemo
+pvp_y_5-2	mapflag	nomemo
+pvp_y_5-3	mapflag	nomemo
+pvp_y_5-4	mapflag	nomemo
+pvp_y_5-5	mapflag	nomemo
+pvp_y_6-1	mapflag	nomemo
+pvp_y_6-2	mapflag	nomemo
+pvp_y_6-3	mapflag	nomemo
+pvp_y_6-4	mapflag	nomemo
+pvp_y_6-5	mapflag	nomemo
+pvp_y_7-1	mapflag	nomemo
+pvp_y_7-2	mapflag	nomemo
+pvp_y_7-3	mapflag	nomemo
+pvp_y_7-4	mapflag	nomemo
+pvp_y_7-5	mapflag	nomemo
+pvp_y_8-1	mapflag	nomemo
+pvp_y_8-2	mapflag	nomemo
+pvp_y_8-3	mapflag	nomemo
+pvp_y_8-4	mapflag	nomemo
+pvp_y_8-5	mapflag	nomemo
+pvp_n_room	mapflag	nomemo
+pvp_n_1-1	mapflag	nomemo
+pvp_n_1-2	mapflag	nomemo
+pvp_n_1-3	mapflag	nomemo
+pvp_n_1-4	mapflag	nomemo
+pvp_n_1-5	mapflag	nomemo
+pvp_n_2-1	mapflag	nomemo
+pvp_n_2-2	mapflag	nomemo
+pvp_n_2-3	mapflag	nomemo
+pvp_n_2-4	mapflag	nomemo
+pvp_n_2-5	mapflag	nomemo
+pvp_n_3-1	mapflag	nomemo
+pvp_n_3-2	mapflag	nomemo
+pvp_n_3-3	mapflag	nomemo
+pvp_n_3-4	mapflag	nomemo
+pvp_n_3-5	mapflag	nomemo
+pvp_n_4-1	mapflag	nomemo
+pvp_n_4-2	mapflag	nomemo
+pvp_n_4-3	mapflag	nomemo
+pvp_n_4-4	mapflag	nomemo
+pvp_n_4-5	mapflag	nomemo
+pvp_n_5-1	mapflag	nomemo
+pvp_n_5-2	mapflag	nomemo
+pvp_n_5-3	mapflag	nomemo
+pvp_n_5-4	mapflag	nomemo
+pvp_n_5-5	mapflag	nomemo
+pvp_n_6-1	mapflag	nomemo
+pvp_n_6-2	mapflag	nomemo
+pvp_n_6-3	mapflag	nomemo
+pvp_n_6-4	mapflag	nomemo
+pvp_n_6-5	mapflag	nomemo
+pvp_n_7-1	mapflag	nomemo
+pvp_n_7-2	mapflag	nomemo
+pvp_n_7-3	mapflag	nomemo
+pvp_n_7-4	mapflag	nomemo
+pvp_n_7-5	mapflag	nomemo
+pvp_n_8-1	mapflag	nomemo
+pvp_n_8-2	mapflag	nomemo
+pvp_n_8-3	mapflag	nomemo
+pvp_n_8-4	mapflag	nomemo
+pvp_n_8-5	mapflag	nomemo
+pvp_2vs2	mapflag	nomemo
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
new file mode 100644
index 000000000..8d6f257f2
--- /dev/null
+++ b/conf/mapflag/nopenalty.txt
@@ -0,0 +1,232 @@
+//===== eAthena Script =======================================
+//= Map flags that disable exp. penalty on death.
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.2 [Lupus]
+//===== Current Version: =====================================
+
+
+// Towns ====================>\\
+ayo_in01	mapflag	nopenalty
+ayo_in02	mapflag	nopenalty
+alb_ship	mapflag	nopenalty
+alberta	mapflag	nopenalty
+alberta_in	mapflag	nopenalty
+aldebaran	mapflag	nopenalty
+aldeba_in	mapflag	nopenalty
+amatsu	mapflag	nopenalty
+ama_in01	mapflag	nopenalty
+ama_in02	mapflag	nopenalty
+ama_test	mapflag	nopenalty
+arena_room	mapflag	nopenalty
+comodo	mapflag	nopenalty
+cmd_in01	mapflag	nopenalty
+cmd_in02	mapflag	nopenalty
+geffen	mapflag	nopenalty
+gef_dun03	mapflag	nopenalty
+gef_tower	mapflag	nopenalty
+geffen_in	mapflag	nopenalty
+gonryun	mapflag	nopenalty
+gon_in	mapflag	nopenalty
+gon_test	mapflag	nopenalty
+hugel	mapflag	nopenalty
+in_orcs01	mapflag	nopenalty
+izlude	mapflag	nopenalty
+izlude_in	mapflag	nopenalty
+jawaii	mapflag	nopenalty
+jawaii_in	mapflag	nopenalty
+lighthalzen	mapflag	nopenalty
+louyang	mapflag	nopenalty
+lou_in01	mapflag	nopenalty
+lou_in02	mapflag	nopenalty
+morocc	mapflag	nopenalty
+moc_castle	mapflag	nopenalty
+morocc_in	mapflag	nopenalty
+new_zone01	mapflag	nopenalty
+new_zone02	mapflag	nopenalty
+new_zone03	mapflag	nopenalty
+new_zone04	mapflag	nopenalty
+nif_in	mapflag	nopenalty
+pay_arche	mapflag	nopenalty
+payon	mapflag	nopenalty
+payon_in01	mapflag	nopenalty
+payon_in02	mapflag	nopenalty
+payon_in03	mapflag	nopenalty
+prontera	mapflag	nopenalty
+prt_are_in	mapflag	nopenalty
+prt_are01	mapflag	nopenalty
+prt_castle	mapflag	nopenalty
+prt_church	mapflag	nopenalty
+prt_in	mapflag	nopenalty
+umbala	mapflag	nopenalty
+um_in	mapflag	nopenalty
+xmas	mapflag	nopenalty
+xmas_in	mapflag	nopenalty
+yuno	mapflag	nopenalty
+yuno_in01	mapflag	nopenalty
+yuno_in02	mapflag	nopenalty
+yuno_in03	mapflag	nopenalty
+yuno_in04	mapflag	nopenalty
+yuno_in05	mapflag	nopenalty
+yuno_pre	mapflag	nopenalty
+y_airport	mapflag	nopenalty
+lhz_airport	mapflag	nopenalty
+lhz_in01	mapflag	nopenalty
+lhz_in02	mapflag	nopenalty
+lhz_in03	mapflag	nopenalty
+rachel	mapflag	nopenalty
+ra_in01	mapflag	nopenalty
+ra_temin	mapflag	nopenalty
+ra_temple	mapflag	nopenalty
+ra_temsky	mapflag	nopenalty
+que_rachel	mapflag	nopenalty
+airplane	mapflag	nopenalty
+airport	mapflag	nopenalty
+einbech	mapflag	nopenalty
+einbroch	mapflag	nopenalty
+ein_in01	mapflag	nopenalty
+job_soul	mapflag	nopenalty
+job_star	mapflag	nopenalty
+auction_01	mapflag	nopenalty
+auction_02	mapflag	nopenalty
+hu_in01	mapflag	nopenalty
+que_ng	mapflag	nopenalty
+kh_mansion	mapflag	nopenalty
+kh_rossi	mapflag	nopenalty
+kh_school	mapflag	nopenalty
+kh_vila	mapflag	nopenalty
+kh_kiehl01	mapflag	nopenalty
+kh_kiehl02	mapflag	nopenalty
+ayothaya	mapflag	nopenalty
+veins	mapflag	nopenalty
+ve_in	mapflag	nopenalty
+ve_in02	mapflag	nopenalty
+thor_camp	mapflag	nopenalty
+
+// Job Quests ========================
+job_sword1	mapflag	nopenalty
+job_thief1	mapflag	nopenalty
+// 2-1 -----------------------
+job_prist	mapflag	nopenalty
+job_wiz	mapflag	nopenalty
+job_hunte	mapflag	nopenalty
+in_hunter	mapflag	nopenalty
+in_moc_16	mapflag	nopenalty
+// 2-2 --------------------
+alde_alche	mapflag	nopenalty
+job_cru	mapflag	nopenalty
+job_duncer	mapflag	nopenalty
+job_monk	mapflag	nopenalty
+monk_test	mapflag	nopenalty
+monk_in	mapflag	nopenalty
+in_rogue	mapflag	nopenalty
+job_sage	mapflag	nopenalty
+
+// Misc Quests =======================
+que_sign01	mapflag	nopenalty
+que_sign02	mapflag	nopenalty
+
+// GvG Arenas ===================
+guild_vs1	mapflag	nopenalty
+guild_vs2	mapflag	nopenalty
+guild_vs3	mapflag	nopenalty
+guild_vs4	mapflag	nopenalty
+guild_vs5	mapflag	nopenalty
+
+// Arenas=======================>\\
+sec_in01	mapflag	nopenalty
+sec_in02	mapflag	nopenalty
+
+// Izlude Arena ========================
+force_1-1	mapflag	nopenalty
+force_1-2	mapflag	nopenalty
+force_1-3	mapflag	nopenalty
+force_2-1	mapflag	nopenalty
+force_2-2	mapflag	nopenalty
+force_2-3	mapflag	nopenalty
+force_3-1	mapflag	nopenalty
+force_3-2	mapflag	nopenalty
+force_3-3	mapflag	nopenalty
+
+// PvP Arenas =========================
+pvp_y_1-1	mapflag	nopenalty
+pvp_y_1-2	mapflag	nopenalty
+pvp_y_1-3	mapflag	nopenalty
+pvp_y_1-4	mapflag	nopenalty
+pvp_y_1-5	mapflag	nopenalty
+pvp_y_2-1	mapflag	nopenalty
+pvp_y_2-2	mapflag	nopenalty
+pvp_y_2-3	mapflag	nopenalty
+pvp_y_2-4	mapflag	nopenalty
+pvp_y_2-5	mapflag	nopenalty
+pvp_y_3-1	mapflag	nopenalty
+pvp_y_3-2	mapflag	nopenalty
+pvp_y_3-3	mapflag	nopenalty
+pvp_y_3-4	mapflag	nopenalty
+pvp_y_3-5	mapflag	nopenalty
+pvp_y_4-1	mapflag	nopenalty
+pvp_y_4-2	mapflag	nopenalty
+pvp_y_4-3	mapflag	nopenalty
+pvp_y_4-4	mapflag	nopenalty
+pvp_y_4-5	mapflag	nopenalty
+pvp_y_5-1	mapflag	nopenalty
+pvp_y_5-2	mapflag	nopenalty
+pvp_y_5-3	mapflag	nopenalty
+pvp_y_5-4	mapflag	nopenalty
+pvp_y_5-5	mapflag	nopenalty
+pvp_y_6-1	mapflag	nopenalty
+pvp_y_6-2	mapflag	nopenalty
+pvp_y_6-3	mapflag	nopenalty
+pvp_y_6-4	mapflag	nopenalty
+pvp_y_6-5	mapflag	nopenalty
+pvp_y_7-1	mapflag	nopenalty
+pvp_y_7-2	mapflag	nopenalty
+pvp_y_7-3	mapflag	nopenalty
+pvp_y_7-4	mapflag	nopenalty
+pvp_y_7-5	mapflag	nopenalty
+pvp_y_8-1	mapflag	nopenalty
+pvp_y_8-2	mapflag	nopenalty
+pvp_y_8-3	mapflag	nopenalty
+pvp_y_8-4	mapflag	nopenalty
+pvp_y_8-5	mapflag	nopenalty
+pvp_n_1-1	mapflag	nopenalty
+pvp_n_1-2	mapflag	nopenalty
+pvp_n_1-3	mapflag	nopenalty
+pvp_n_1-4	mapflag	nopenalty
+pvp_n_1-5	mapflag	nopenalty
+pvp_n_2-1	mapflag	nopenalty
+pvp_n_2-2	mapflag	nopenalty
+pvp_n_2-3	mapflag	nopenalty
+pvp_n_2-4	mapflag	nopenalty
+pvp_n_2-5	mapflag	nopenalty
+pvp_n_3-1	mapflag	nopenalty
+pvp_n_3-2	mapflag	nopenalty
+pvp_n_3-3	mapflag	nopenalty
+pvp_n_3-4	mapflag	nopenalty
+pvp_n_3-5	mapflag	nopenalty
+pvp_n_4-1	mapflag	nopenalty
+pvp_n_4-2	mapflag	nopenalty
+pvp_n_4-3	mapflag	nopenalty
+pvp_n_4-4	mapflag	nopenalty
+pvp_n_4-5	mapflag	nopenalty
+pvp_n_5-1	mapflag	nopenalty
+pvp_n_5-2	mapflag	nopenalty
+pvp_n_5-3	mapflag	nopenalty
+pvp_n_5-4	mapflag	nopenalty
+pvp_n_5-5	mapflag	nopenalty
+pvp_n_6-1	mapflag	nopenalty
+pvp_n_6-2	mapflag	nopenalty
+pvp_n_6-3	mapflag	nopenalty
+pvp_n_6-4	mapflag	nopenalty
+pvp_n_6-5	mapflag	nopenalty
+pvp_n_7-1	mapflag	nopenalty
+pvp_n_7-2	mapflag	nopenalty
+pvp_n_7-3	mapflag	nopenalty
+pvp_n_7-4	mapflag	nopenalty
+pvp_n_7-5	mapflag	nopenalty
+pvp_n_8-1	mapflag	nopenalty
+pvp_n_8-2	mapflag	nopenalty
+pvp_n_8-3	mapflag	nopenalty
+pvp_n_8-4	mapflag	nopenalty
+pvp_n_8-5	mapflag	nopenalty
+pvp_2vs2	mapflag	nopenalty
diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt
new file mode 100644
index 000000000..bda34e055
--- /dev/null
+++ b/conf/mapflag/nopvp.txt
@@ -0,0 +1,79 @@
+///===== Description: =============================================
+//= pvp	off: Disables Player versus Player mode.
+//= To disable PvP mode on a specific map add the mapname here.
+//= v 1.1a
+//============================================================
+
+ayo_in01	mapflag	pvp	off
+ayo_in02	mapflag	pvp	off
+alberta_in	mapflag	pvp	off
+alberta	mapflag	pvp	off
+alde_alche	mapflag	pvp	off
+aldeba_in	mapflag	pvp	off
+aldebaran	mapflag	pvp	off
+ama_in01	mapflag	pvp	off
+ama_in02	mapflag	pvp	off
+amatsu	mapflag	pvp	off
+cmd_in01	mapflag	pvp	off
+cmd_in02	mapflag	pvp	off
+comodo	mapflag	pvp	off
+gef_tower	mapflag	pvp	off
+geffen	mapflag	pvp	off
+geffen_in	mapflag	pvp	off
+gon_in	mapflag	pvp	off
+gonryun	mapflag	pvp	off
+gon_test	mapflag	pvp	off
+in_hunter	mapflag	pvp	off
+in_moc_16	mapflag	pvp	off
+in_orcs01	mapflag	pvp	off
+izlude_in	mapflag	pvp	off
+izlude	mapflag	pvp	off
+hugel	mapflag	pvp	off
+hu_in01	mapflag	pvp	off
+lighthalzen	mapflag	pvp	off
+lhz_airport	mapflag	pvp	off
+lhz_in01	mapflag	pvp	off
+lhz_in02	mapflag	pvp	off
+lhz_in03	mapflag	pvp	off
+louyang	mapflag	pvp	off
+lou_in01	mapflag	pvp	off
+lou_in02	mapflag	pvp	off
+moc_castle	mapflag	pvp	off
+monk_in	mapflag	pvp	off
+morocc_in	mapflag	pvp	off
+morocc	mapflag	pvp	off
+mosk_in	mapflag	pvp	off
+nif_in	mapflag	pvp	off
+payon_in01	mapflag	pvp	off
+payon_in02	mapflag	pvp	off
+payon_in03	mapflag	pvp	off
+payon	mapflag	pvp	off
+pay_arche	mapflag	pvp	off
+prt_are_in	mapflag	pvp	off
+prt_are01	mapflag	pvp	off
+prt_castle	mapflag	pvp	off
+prt_church	mapflag	pvp	off
+prt_in	mapflag	pvp	off
+prontera	mapflag	pvp	off
+sec_in01	mapflag	pvp	off
+job_sword1	mapflag	pvp	off
+um_in	mapflag	pvp	off
+umbala	mapflag	pvp	off
+xmas_in	mapflag	pvp	off
+xmas	mapflag	pvp	off
+yuno_in01	mapflag	pvp	off
+yuno_in03	mapflag	pvp	off
+yuno_in04	mapflag	pvp	off
+yuno_in05	mapflag	pvp	off
+yuno	mapflag	pvp	off
+yuno_pre	mapflag	pvp	off
+y_airport	mapflag	pvp	off
+rachel	mapflag	pvp	off
+ra_in01	mapflag	pvp	off
+ra_temin	mapflag	pvp	off
+airplane	mapflag	pvp	off
+airport	mapflag	pvp	off
+einbech	mapflag	pvp	off
+einbroch	mapflag	pvp	off
+ein_in01	mapflag	pvp	off
+ayothaya	mapflag	pvp	off
diff --git a/conf/mapflag/noreturn.txt b/conf/mapflag/noreturn.txt
new file mode 100644
index 000000000..ee3720da0
--- /dev/null
+++ b/conf/mapflag/noreturn.txt
@@ -0,0 +1,227 @@
+//===== eAthena Script =======================================
+//= Map flags that disable use of Butterfly wings
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.4a [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	mapflag	noreturn
+ayo_in02	mapflag	noreturn
+alb_ship	mapflag	noreturn
+alberta_in	mapflag	noreturn
+aldeba_in	mapflag	noreturn
+ama_in01	mapflag	noreturn
+ama_in02	mapflag	noreturn
+ama_test	mapflag	noreturn
+cmd_in01	mapflag	noreturn
+cmd_in02	mapflag	noreturn
+gef_tower	mapflag	noreturn
+geffen_in	mapflag	noreturn
+gon_test	mapflag	noreturn
+gon_in	mapflag	noreturn
+in_orcs01	mapflag	noreturn
+izlude_in	mapflag	noreturn
+hu_in01	mapflag	noreturn
+jawaii_in	mapflag	noreturn
+lou_in01	mapflag	noreturn
+lou_in02	mapflag	noreturn
+moc_castle	mapflag	noreturn
+morocc_in	mapflag	noreturn
+mosk_in	mapflag	noreturn
+new_zone01	mapflag	noreturn
+new_zone02	mapflag	noreturn
+new_zone03	mapflag	noreturn
+new_zone04	mapflag	noreturn
+nif_in	mapflag	noreturn
+payon_in01	mapflag	noreturn
+payon_in02	mapflag	noreturn
+payon_in03	mapflag	noreturn
+prt_are_in	mapflag	noreturn
+prt_are01	mapflag	noreturn
+prt_castle	mapflag	noreturn
+prt_church	mapflag	noreturn
+prt_in	mapflag	noreturn
+um_in	mapflag	noreturn
+xmas_in	mapflag	noreturn
+yuno_in01	mapflag	noreturn
+yuno_in03	mapflag	noreturn
+yuno_in04	mapflag	noreturn
+yuno_in05	mapflag	noreturn
+que_sign01	mapflag	noreturn
+ein_in01	mapflag	noreturn
+airport	mapflag	noreturn
+airplane	mapflag	noreturn
+airplane_01	mapflag	noreturn
+yuno_pre	mapflag	noreturn
+y_airport	mapflag	noreturn
+lhz_airport	mapflag	noreturn
+lhz_in01	mapflag	noreturn
+lhz_in02	mapflag	noreturn
+lhz_in03	mapflag	noreturn
+lhz_que01	mapflag	noreturn
+kh_mansion	mapflag	noreturn
+kh_rossi	mapflag	noreturn
+kh_school	mapflag	noreturn
+kh_vila	mapflag	noreturn
+ra_in01	mapflag	noreturn
+ra_temin	mapflag	noreturn
+ve_in	mapflag	noreturn
+ve_in02	mapflag	noreturn
+
+// Job Quests ====================
+job_sword1	mapflag	noreturn
+job_thief1	mapflag	noreturn
+// 2-1 -----------------------
+job_hunte	mapflag	noreturn
+job_prist	mapflag	noreturn
+job_wiz	mapflag	noreturn
+in_hunter	mapflag	noreturn
+in_moc_16	mapflag	noreturn
+// 2-2 --------------------
+alde_alche	mapflag	noreturn
+job_cru	mapflag	noreturn
+job_duncer	mapflag	noreturn
+job_monk	mapflag	noreturn
+monk_test	mapflag	noreturn
+monk_in	mapflag	noreturn
+in_rogue	mapflag	noreturn
+job_sage	mapflag	noreturn
+que_ng	mapflag	noreturn
+
+// Special Quests Places =========
+que_god01	mapflag	noreturn
+que_god02	mapflag	noreturn
+que_bingo	mapflag	noreturn
+que_hugel	mapflag	noreturn
+que_thor	mapflag	noreturn
+poring_c01	mapflag	noreturn
+poring_c02	mapflag	noreturn
+
+// Guild Castles =================
+//= 1.3 According to the kRO patch, enabled Butterfly wings in the Castles
+//aldeg_cas01	mapflag	noreturn
+//aldeg_cas02	mapflag	noreturn
+//aldeg_cas03	mapflag	noreturn
+//aldeg_cas04	mapflag	noreturn
+//aldeg_cas05	mapflag	noreturn
+//gefg_cas01	mapflag	noreturn
+//gefg_cas02	mapflag	noreturn
+//gefg_cas03	mapflag	noreturn
+//gefg_cas04	mapflag	noreturn
+//gefg_cas05	mapflag	noreturn
+//payg_cas01	mapflag	noreturn
+//payg_cas02	mapflag	noreturn
+//payg_cas03	mapflag	noreturn
+//payg_cas04	mapflag	noreturn
+//payg_cas05	mapflag	noreturn
+//prtg_cas01	mapflag	noreturn
+//prtg_cas02	mapflag	noreturn
+//prtg_cas03	mapflag	noreturn
+//prtg_cas04	mapflag	noreturn
+//prtg_cas05	mapflag	noreturn
+//nguild_alde	mapflag	noreturn
+//nguild_gef	mapflag	noreturn
+//nguild_pay	mapflag	noreturn
+//nguild_prt	mapflag	noreturn
+
+// GvG Arenas ===================
+guild_vs1	mapflag	noreturn
+guild_vs2	mapflag	noreturn
+guild_vs3	mapflag	noreturn
+guild_vs4	mapflag	noreturn
+guild_vs5	mapflag	noreturn
+
+// Arenas =====================>\\
+arena_room	mapflag	noreturn
+sec_in01	mapflag	noreturn
+sec_in02	mapflag	noreturn
+
+// PvP Arenas=======================
+pvp_y_room	mapflag	noreturn
+//pvp_y_1-1	mapflag	noreturn
+//pvp_y_1-2	mapflag	noreturn
+//pvp_y_1-3	mapflag	noreturn
+//pvp_y_1-4	mapflag	noreturn
+//pvp_y_1-5	mapflag	noreturn
+//pvp_y_2-1	mapflag	noreturn
+//pvp_y_2-2	mapflag	noreturn
+//pvp_y_2-3	mapflag	noreturn
+//pvp_y_2-4	mapflag	noreturn
+//pvp_y_2-5	mapflag	noreturn
+//pvp_y_3-1	mapflag	noreturn
+//pvp_y_3-2	mapflag	noreturn
+//pvp_y_3-3	mapflag	noreturn
+//pvp_y_3-4	mapflag	noreturn
+//pvp_y_3-5	mapflag	noreturn
+//pvp_y_4-1	mapflag	noreturn
+//pvp_y_4-2	mapflag	noreturn
+//pvp_y_4-3	mapflag	noreturn
+//pvp_y_4-4	mapflag	noreturn
+//pvp_y_4-5	mapflag	noreturn
+//pvp_y_5-1	mapflag	noreturn
+//pvp_y_5-2	mapflag	noreturn
+//pvp_y_5-3	mapflag	noreturn
+//pvp_y_5-4	mapflag	noreturn
+//pvp_y_5-5	mapflag	noreturn
+//pvp_y_6-1	mapflag	noreturn
+//pvp_y_6-2	mapflag	noreturn
+//pvp_y_6-3	mapflag	noreturn
+//pvp_y_6-4	mapflag	noreturn
+//pvp_y_6-5	mapflag	noreturn
+//pvp_y_7-1	mapflag	noreturn
+//pvp_y_7-2	mapflag	noreturn
+//pvp_y_7-3	mapflag	noreturn
+//pvp_y_7-4	mapflag	noreturn
+//pvp_y_7-5	mapflag	noreturn
+//pvp_y_8-1	mapflag	noreturn
+//pvp_y_8-2	mapflag	noreturn
+//pvp_y_8-3	mapflag	noreturn
+//pvp_y_8-4	mapflag	noreturn
+//pvp_y_8-5	mapflag	noreturn
+pvp_n_room	mapflag	noreturn
+//pvp_n_1-1	mapflag	noreturn
+//pvp_n_1-2	mapflag	noreturn
+//pvp_n_1-3	mapflag	noreturn
+//pvp_n_1-4	mapflag	noreturn
+//pvp_n_1-5	mapflag	noreturn
+//pvp_n_2-1	mapflag	noreturn
+//pvp_n_2-2	mapflag	noreturn
+//pvp_n_2-3	mapflag	noreturn
+//pvp_n_2-4	mapflag	noreturn
+//pvp_n_2-5	mapflag	noreturn
+//pvp_n_3-1	mapflag	noreturn
+//pvp_n_3-2	mapflag	noreturn
+//pvp_n_3-3	mapflag	noreturn
+//pvp_n_3-4	mapflag	noreturn
+//pvp_n_3-5	mapflag	noreturn
+//pvp_n_4-1	mapflag	noreturn
+//pvp_n_4-2	mapflag	noreturn
+//pvp_n_4-3	mapflag	noreturn
+//pvp_n_4-4	mapflag	noreturn
+//pvp_n_4-5	mapflag	noreturn
+//pvp_n_5-1	mapflag	noreturn
+//pvp_n_5-2	mapflag	noreturn
+//pvp_n_5-3	mapflag	noreturn
+//pvp_n_5-4	mapflag	noreturn
+//pvp_n_5-5	mapflag	noreturn
+//pvp_n_6-1	mapflag	noreturn
+//pvp_n_6-2	mapflag	noreturn
+//pvp_n_6-3	mapflag	noreturn
+//pvp_n_6-4	mapflag	noreturn
+//pvp_n_6-5	mapflag	noreturn
+//pvp_n_7-1	mapflag	noreturn
+//pvp_n_7-2	mapflag	noreturn
+//pvp_n_7-3	mapflag	noreturn
+//pvp_n_7-4	mapflag	noreturn
+//pvp_n_7-5	mapflag	noreturn
+//pvp_n_8-1	mapflag	noreturn
+//pvp_n_8-2	mapflag	noreturn
+//pvp_n_8-3	mapflag	noreturn
+//pvp_n_8-4	mapflag	noreturn
+//pvp_n_8-5	mapflag	noreturn
+//pvp_2vs2	mapflag	noreturn
diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt
new file mode 100644
index 000000000..7bfe836c3
--- /dev/null
+++ b/conf/mapflag/nosave.txt
@@ -0,0 +1,194 @@
+//===== eAthena Script =======================================
+//= Map flags that disable auto saving
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.7 [Lupus]
+//===== Current Version: =====================================
+
+// Job Quests ====================
+job_sword1	mapflag	nosave	SavePoint
+//job_thief1	mapflag	nosave	SavePoint
+// 2-1
+job_knt	mapflag	nosave	SavePoint
+job_prist	mapflag	nosave	SavePoint
+job_wiz	mapflag	nosave	SavePoint
+in_moc_16	mapflag	nosave	SavePoint
+job_hunte	mapflag	nosave	SavePoint
+//in_hunter	mapflag	nosave	SavePoint
+// 2-2
+alde_alche	mapflag	nosave	SavePoint
+job_cru	mapflag	nosave	SavePoint
+job_duncer	mapflag	nosave	SavePoint
+job_monk	mapflag	nosave	SavePoint
+monk_test	mapflag	nosave	SavePoint
+monk_in	mapflag	nosave	SavePoint
+in_rogue	mapflag	nosave	SavePoint
+job_sage	mapflag	nosave	SavePoint
+
+job_star	mapflag	nosave	SavePoint
+job_soul	mapflag	nosave	SavePoint
+
+// Special Quests Places =====
+ama_test	mapflag	nosave	SavePoint
+gef_dun03	mapflag	nosave	SavePoint
+que_god01	mapflag	nosave	SavePoint
+que_god02	mapflag	nosave	SavePoint
+que_sign01	mapflag	nosave	SavePoint
+que_sign02	mapflag	nosave	SavePoint
+que_thor	mapflag	nosave	SavePoint
+que_ng		mapflag	nosave	SavePoint
+gon_test	mapflag	nosave	SavePoint
+kh_kiehl01	mapflag	nosave	SavePoint
+kh_kiehl02	mapflag	nosave	SavePoint
+que_bingo	mapflag	nosave	SavePoint
+
+// GvG Arenas ==========================
+guild_vs1	mapflag	nosave	SavePoint
+guild_vs2	mapflag	nosave	SavePoint
+guild_vs3	mapflag	nosave	SavePoint
+guild_vs4	mapflag	nosave	SavePoint
+guild_vs5	mapflag	nosave	SavePoint
+
+// Izlude Arena ========================
+force_1-1	mapflag	nosave	SavePoint
+force_1-2	mapflag	nosave	SavePoint
+force_1-3	mapflag	nosave	SavePoint
+force_2-1	mapflag	nosave	SavePoint
+force_2-2	mapflag	nosave	SavePoint
+force_2-3	mapflag	nosave	SavePoint
+force_3-1	mapflag	nosave	SavePoint
+force_3-2	mapflag	nosave	SavePoint
+force_3-3	mapflag	nosave	SavePoint
+
+// Juperos =============================
+jupe_area1	mapflag	nosave	SavePoint
+jupe_area2	mapflag	nosave	SavePoint
+jupe_ele	mapflag	nosave	SavePoint
+jupe_ele_r	mapflag	nosave	SavePoint
+jupe_gate	mapflag	nosave	SavePoint
+
+//PvP Arenas =================================
+pvp_y_room	mapflag	nosave	SavePoint
+pvp_y_1-1	mapflag	nosave	SavePoint
+pvp_y_1-2	mapflag	nosave	SavePoint
+pvp_y_1-3	mapflag	nosave	SavePoint
+pvp_y_1-4	mapflag	nosave	SavePoint
+pvp_y_1-5	mapflag	nosave	SavePoint
+pvp_y_2-1	mapflag	nosave	SavePoint
+pvp_y_2-2	mapflag	nosave	SavePoint
+pvp_y_2-3	mapflag	nosave	SavePoint
+pvp_y_2-4	mapflag	nosave	SavePoint
+pvp_y_2-5	mapflag	nosave	SavePoint
+pvp_y_3-1	mapflag	nosave	SavePoint
+pvp_y_3-2	mapflag	nosave	SavePoint
+pvp_y_3-3	mapflag	nosave	SavePoint
+pvp_y_3-4	mapflag	nosave	SavePoint
+pvp_y_3-5	mapflag	nosave	SavePoint
+pvp_y_4-1	mapflag	nosave	SavePoint
+pvp_y_4-2	mapflag	nosave	SavePoint
+pvp_y_4-3	mapflag	nosave	SavePoint
+pvp_y_4-4	mapflag	nosave	SavePoint
+pvp_y_4-5	mapflag	nosave	SavePoint
+pvp_y_5-1	mapflag	nosave	SavePoint
+pvp_y_5-2	mapflag	nosave	SavePoint
+pvp_y_5-3	mapflag	nosave	SavePoint
+pvp_y_5-4	mapflag	nosave	SavePoint
+pvp_y_5-5	mapflag	nosave	SavePoint
+pvp_y_6-1	mapflag	nosave	SavePoint
+pvp_y_6-2	mapflag	nosave	SavePoint
+pvp_y_6-3	mapflag	nosave	SavePoint
+pvp_y_6-4	mapflag	nosave	SavePoint
+pvp_y_6-5	mapflag	nosave	SavePoint
+pvp_y_7-1	mapflag	nosave	SavePoint
+pvp_y_7-2	mapflag	nosave	SavePoint
+pvp_y_7-3	mapflag	nosave	SavePoint
+pvp_y_7-4	mapflag	nosave	SavePoint
+pvp_y_7-5	mapflag	nosave	SavePoint
+pvp_y_8-1	mapflag	nosave	SavePoint
+pvp_y_8-2	mapflag	nosave	SavePoint
+pvp_y_8-3	mapflag	nosave	SavePoint
+pvp_y_8-4	mapflag	nosave	SavePoint
+pvp_y_8-5	mapflag	nosave	SavePoint
+pvp_n_room	mapflag	nosave	SavePoint
+pvp_n_1-1	mapflag	nosave	SavePoint
+pvp_n_1-2	mapflag	nosave	SavePoint
+pvp_n_1-3	mapflag	nosave	SavePoint
+pvp_n_1-4	mapflag	nosave	SavePoint
+pvp_n_1-5	mapflag	nosave	SavePoint
+pvp_n_2-1	mapflag	nosave	SavePoint
+pvp_n_2-2	mapflag	nosave	SavePoint
+pvp_n_2-3	mapflag	nosave	SavePoint
+pvp_n_2-4	mapflag	nosave	SavePoint
+pvp_n_2-5	mapflag	nosave	SavePoint
+pvp_n_3-1	mapflag	nosave	SavePoint
+pvp_n_3-2	mapflag	nosave	SavePoint
+pvp_n_3-3	mapflag	nosave	SavePoint
+pvp_n_3-4	mapflag	nosave	SavePoint
+pvp_n_3-5	mapflag	nosave	SavePoint
+pvp_n_4-1	mapflag	nosave	SavePoint
+pvp_n_4-2	mapflag	nosave	SavePoint
+pvp_n_4-3	mapflag	nosave	SavePoint
+pvp_n_4-4	mapflag	nosave	SavePoint
+pvp_n_4-5	mapflag	nosave	SavePoint
+pvp_n_5-1	mapflag	nosave	SavePoint
+pvp_n_5-2	mapflag	nosave	SavePoint
+pvp_n_5-3	mapflag	nosave	SavePoint
+pvp_n_5-4	mapflag	nosave	SavePoint
+pvp_n_5-5	mapflag	nosave	SavePoint
+pvp_n_6-1	mapflag	nosave	SavePoint
+pvp_n_6-2	mapflag	nosave	SavePoint
+pvp_n_6-3	mapflag	nosave	SavePoint
+pvp_n_6-4	mapflag	nosave	SavePoint
+pvp_n_6-5	mapflag	nosave	SavePoint
+pvp_n_7-1	mapflag	nosave	SavePoint
+pvp_n_7-2	mapflag	nosave	SavePoint
+pvp_n_7-3	mapflag	nosave	SavePoint
+pvp_n_7-4	mapflag	nosave	SavePoint
+pvp_n_7-5	mapflag	nosave	SavePoint
+pvp_n_8-1	mapflag	nosave	SavePoint
+pvp_n_8-2	mapflag	nosave	SavePoint
+pvp_n_8-3	mapflag	nosave	SavePoint
+pvp_n_8-4	mapflag	nosave	SavePoint
+pvp_n_8-5	mapflag	nosave	SavePoint
+pvp_2vs2	mapflag	nosave	SavePoint
+
+//WoE Castles =================================
+aldeg_cas01	mapflag	nosave	SavePoint
+aldeg_cas02	mapflag	nosave	SavePoint
+aldeg_cas03	mapflag	nosave	SavePoint
+aldeg_cas04	mapflag	nosave	SavePoint
+aldeg_cas05	mapflag	nosave	SavePoint
+gefg_cas01	mapflag	nosave	SavePoint
+gefg_cas02	mapflag	nosave	SavePoint
+gefg_cas03	mapflag	nosave	SavePoint
+gefg_cas04	mapflag	nosave	SavePoint
+gefg_cas05	mapflag	nosave	SavePoint
+payg_cas01	mapflag	nosave	SavePoint
+payg_cas02	mapflag	nosave	SavePoint
+payg_cas03	mapflag	nosave	SavePoint
+payg_cas04	mapflag	nosave	SavePoint
+payg_cas05	mapflag	nosave	SavePoint
+prtg_cas01	mapflag	nosave	SavePoint
+prtg_cas02	mapflag	nosave	SavePoint
+prtg_cas03	mapflag	nosave	SavePoint
+prtg_cas04	mapflag	nosave	SavePoint
+prtg_cas05	mapflag	nosave	SavePoint
+schg_cas01	mapflag	nosave	SavePoint
+schg_cas02	mapflag	nosave	SavePoint
+schg_cas03	mapflag	nosave	SavePoint
+schg_cas04	mapflag	nosave	SavePoint
+schg_cas05	mapflag	nosave	SavePoint
+nguild_alde	mapflag	nosave	SavePoint
+nguild_gef	mapflag	nosave	SavePoint
+nguild_pay	mapflag	nosave	SavePoint
+nguild_prt	mapflag	nosave	SavePoint
+
+//Guild Dungeons ==============================
+gld_dun01	mapflag	nosave	SavePoint
+gld_dun02	mapflag	nosave	SavePoint
+gld_dun03	mapflag	nosave	SavePoint
+gld_dun04	mapflag	nosave	SavePoint
+
+//Normal Maps =================================
+yggdrasil01	mapflag	nosave	SavePoint
+thana_boss	mapflag	nosave	SavePoint
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
new file mode 100644
index 000000000..81907d513
--- /dev/null
+++ b/conf/mapflag/noteleport.txt
@@ -0,0 +1,265 @@
+//===== eAthena Script =======================================
+//= Map flags that disable use of fly wings
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.6a [Lupus]
+//===== Notes: ===============================================
+//= For disabling Butterfly wings use noreturn
+//===== Current Version: =====================================
+
+// Cities ========================
+ayo_in01	mapflag	noteleport
+ayo_in02	mapflag	noteleport
+alb_ship	mapflag	noteleport
+alberta_in	mapflag	noteleport
+aldeba_in	mapflag	noteleport
+ama_dun01	mapflag	noteleport
+ama_in01	mapflag	noteleport
+ama_in02	mapflag	noteleport
+ama_test	mapflag	noteleport
+cmd_in01	mapflag	noteleport
+cmd_in02	mapflag	noteleport
+gef_dun03	mapflag	noteleport
+gef_tower	mapflag	noteleport
+geffen_in	mapflag	noteleport
+gon_test	mapflag	noteleport
+gon_in	mapflag	noteleport
+in_orcs01	mapflag	noteleport
+izlude_in	mapflag	noteleport
+jawaii_in	mapflag	noteleport
+lou_in01	mapflag	noteleport
+lou_in02	mapflag	noteleport
+moc_castle	mapflag	noteleport
+morocc_in	mapflag	noteleport
+mosk_in	mapflag	noteleport
+new_zone01	mapflag	noteleport
+new_zone02	mapflag	noteleport
+new_zone03	mapflag	noteleport
+new_zone04	mapflag	noteleport
+nif_in	mapflag	noteleport
+payon_in01	mapflag	noteleport
+payon_in02	mapflag	noteleport
+payon_in03	mapflag	noteleport
+prt_are_in	mapflag	noteleport
+prt_are01	mapflag	noteleport
+prt_castle	mapflag	noteleport
+prt_church	mapflag	noteleport
+prt_in	mapflag	noteleport
+um_in	mapflag	noteleport
+xmas_in	mapflag	noteleport
+yuno_in01	mapflag	noteleport
+yuno_in02	mapflag	noteleport
+yuno_in03	mapflag	noteleport
+yuno_in04	mapflag	noteleport
+yuno_in05	mapflag	noteleport
+que_sign01	mapflag	noteleport
+que_sign02	mapflag	noteleport
+ein_in01	mapflag	noteleport
+airport	mapflag	noteleport
+airplane	mapflag	noteleport
+airplane_01	mapflag	noteleport
+// New areas
+lighthalzen	mapflag	noteleport
+yuno	mapflag	noteleport
+yuno_pre	mapflag	noteleport
+y_airport	mapflag	noteleport
+lhz_airport	mapflag	noteleport
+einbroch	mapflag	noteleport
+einbech	mapflag	noteleport
+lhz_que01	mapflag	noteleport
+lhz_cube	mapflag	noteleport
+lhz_in01	mapflag	noteleport
+lhz_in02	mapflag	noteleport
+lhz_in03	mapflag	noteleport
+jupe_area1	mapflag	noteleport
+jupe_area2	mapflag	noteleport
+jupe_ele	mapflag	noteleport
+jupe_ele_r	mapflag	noteleport
+jupe_gate	mapflag	noteleport
+tha_t07	mapflag	noteleport
+tha_t08	mapflag	noteleport
+tha_t09	mapflag	noteleport
+tha_t10	mapflag	noteleport
+tha_t11	mapflag	noteleport
+tha_t12	mapflag	noteleport
+thana_step	mapflag	noteleport
+hu_in01	mapflag	noteleport
+auction_01	mapflag	noteleport
+auction_02	mapflag	noteleport
+ra_in01	mapflag	noteleport
+ra_temin	mapflag	noteleport
+ra_temsky	mapflag	noteleport
+kh_mansion	mapflag	noteleport
+kh_rossi	mapflag	noteleport
+kh_school	mapflag	noteleport
+kh_vila	mapflag	noteleport
+kh_dun01	mapflag	noteleport
+veins	mapflag	noteleport
+ve_in	mapflag	noteleport
+ve_in02	mapflag	noteleport
+thor_camp	mapflag	noteleport
+
+// Job Quests ====================
+job_sword1	mapflag	noteleport
+job_thief1	mapflag	noteleport
+// 2-1 -----------------------
+job_prist	mapflag	noteleport
+job_wiz	mapflag	noteleport
+job_hunte	mapflag	noteleport
+in_hunter	mapflag	noteleport
+in_moc_16	mapflag	noteleport
+// 2-2 --------------------
+alde_alche	mapflag	noteleport
+job_cru	mapflag	noteleport
+job_duncer	mapflag	noteleport
+job_monk	mapflag	noteleport
+monk_test	mapflag	noteleport
+monk_in	mapflag	noteleport
+in_rogue	mapflag	noteleport
+job_sage	mapflag	noteleport
+job_star	mapflag	noteleport
+job_soul	mapflag	noteleport
+que_ng	mapflag	noteleport
+
+// Special Quests Places =========
+que_god01	mapflag	noteleport
+que_god02	mapflag	noteleport
+que_bingo	mapflag	noteleport
+que_hugel	mapflag	noteleport
+kh_kiehl01	mapflag	noteleport
+kh_kiehl02	mapflag	noteleport
+que_rachel	mapflag	noteleport
+que_thor	mapflag	noteleport
+poring_c01	mapflag	noteleport
+poring_c02	mapflag	noteleport
+que_job01	mapflag	noteleport
+que_job02	mapflag	noteleport
+que_job03	mapflag	noteleport
+
+// Guild Castles =================
+aldeg_cas01	mapflag	noteleport
+aldeg_cas02	mapflag	noteleport
+aldeg_cas03	mapflag	noteleport
+aldeg_cas04	mapflag	noteleport
+aldeg_cas05	mapflag	noteleport
+gefg_cas01	mapflag	noteleport
+gefg_cas02	mapflag	noteleport
+gefg_cas03	mapflag	noteleport
+gefg_cas04	mapflag	noteleport
+gefg_cas05	mapflag	noteleport
+payg_cas01	mapflag	noteleport
+payg_cas02	mapflag	noteleport
+payg_cas03	mapflag	noteleport
+payg_cas04	mapflag	noteleport
+payg_cas05	mapflag	noteleport
+prtg_cas01	mapflag	noteleport
+prtg_cas02	mapflag	noteleport
+prtg_cas03	mapflag	noteleport
+prtg_cas04	mapflag	noteleport
+prtg_cas05	mapflag	noteleport
+schg_cas01	mapflag	noteleport
+schg_cas02	mapflag	noteleport
+schg_cas03	mapflag	noteleport
+schg_cas04	mapflag	noteleport
+schg_cas05	mapflag	noteleport
+nguild_alde	mapflag	noteleport
+nguild_gef	mapflag	noteleport
+nguild_pay	mapflag	noteleport
+nguild_prt	mapflag	noteleport
+
+// GvG Arenas ===================
+guild_vs1	mapflag	noteleport
+guild_vs2	mapflag	noteleport
+guild_vs3	mapflag	noteleport
+guild_vs4	mapflag	noteleport
+guild_vs5	mapflag	noteleport
+
+// Arenas =====================>\\
+arena_room	mapflag	noteleport
+sec_in01	mapflag	noteleport
+sec_in02	mapflag	noteleport
+
+// PvP Arenas=======================
+pvp_y_room	mapflag	noteleport
+pvp_y_1-1	mapflag	noteleport
+pvp_y_1-2	mapflag	noteleport
+pvp_y_1-3	mapflag	noteleport
+pvp_y_1-4	mapflag	noteleport
+pvp_y_1-5	mapflag	noteleport
+pvp_y_2-1	mapflag	noteleport
+pvp_y_2-2	mapflag	noteleport
+pvp_y_2-3	mapflag	noteleport
+pvp_y_2-4	mapflag	noteleport
+pvp_y_2-5	mapflag	noteleport
+pvp_y_3-1	mapflag	noteleport
+pvp_y_3-2	mapflag	noteleport
+pvp_y_3-3	mapflag	noteleport
+pvp_y_3-4	mapflag	noteleport
+pvp_y_3-5	mapflag	noteleport
+pvp_y_4-1	mapflag	noteleport
+pvp_y_4-2	mapflag	noteleport
+pvp_y_4-3	mapflag	noteleport
+pvp_y_4-4	mapflag	noteleport
+pvp_y_4-5	mapflag	noteleport
+pvp_y_5-1	mapflag	noteleport
+pvp_y_5-2	mapflag	noteleport
+pvp_y_5-3	mapflag	noteleport
+pvp_y_5-4	mapflag	noteleport
+pvp_y_5-5	mapflag	noteleport
+pvp_y_6-1	mapflag	noteleport
+pvp_y_6-2	mapflag	noteleport
+pvp_y_6-3	mapflag	noteleport
+pvp_y_6-4	mapflag	noteleport
+pvp_y_6-5	mapflag	noteleport
+pvp_y_7-1	mapflag	noteleport
+pvp_y_7-2	mapflag	noteleport
+pvp_y_7-3	mapflag	noteleport
+pvp_y_7-4	mapflag	noteleport
+pvp_y_7-5	mapflag	noteleport
+pvp_y_8-1	mapflag	noteleport
+pvp_y_8-2	mapflag	noteleport
+pvp_y_8-3	mapflag	noteleport
+pvp_y_8-4	mapflag	noteleport
+pvp_y_8-5	mapflag	noteleport
+pvp_n_room	mapflag	noteleport
+pvp_n_1-1	mapflag	noteleport
+pvp_n_1-2	mapflag	noteleport
+pvp_n_1-3	mapflag	noteleport
+pvp_n_1-4	mapflag	noteleport
+pvp_n_1-5	mapflag	noteleport
+pvp_n_2-1	mapflag	noteleport
+pvp_n_2-2	mapflag	noteleport
+pvp_n_2-3	mapflag	noteleport
+pvp_n_2-4	mapflag	noteleport
+pvp_n_2-5	mapflag	noteleport
+pvp_n_3-1	mapflag	noteleport
+pvp_n_3-2	mapflag	noteleport
+pvp_n_3-3	mapflag	noteleport
+pvp_n_3-4	mapflag	noteleport
+pvp_n_3-5	mapflag	noteleport
+pvp_n_4-1	mapflag	noteleport
+pvp_n_4-2	mapflag	noteleport
+pvp_n_4-3	mapflag	noteleport
+pvp_n_4-4	mapflag	noteleport
+pvp_n_4-5	mapflag	noteleport
+pvp_n_5-1	mapflag	noteleport
+pvp_n_5-2	mapflag	noteleport
+pvp_n_5-3	mapflag	noteleport
+pvp_n_5-4	mapflag	noteleport
+pvp_n_5-5	mapflag	noteleport
+pvp_n_6-1	mapflag	noteleport
+pvp_n_6-2	mapflag	noteleport
+pvp_n_6-3	mapflag	noteleport
+pvp_n_6-4	mapflag	noteleport
+pvp_n_6-5	mapflag	noteleport
+pvp_n_7-1	mapflag	noteleport
+pvp_n_7-2	mapflag	noteleport
+pvp_n_7-3	mapflag	noteleport
+pvp_n_7-4	mapflag	noteleport
+pvp_n_7-5	mapflag	noteleport
+pvp_n_8-1	mapflag	noteleport
+pvp_n_8-2	mapflag	noteleport
+pvp_n_8-3	mapflag	noteleport
+pvp_n_8-4	mapflag	noteleport
+pvp_n_8-5	mapflag	noteleport
+pvp_2vs2	mapflag	noteleport
diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt
new file mode 100644
index 000000000..07767a589
--- /dev/null
+++ b/conf/mapflag/nowarp.txt
@@ -0,0 +1,42 @@
+//===== eAthena Script =======================================
+//= Map flags that disable warp
+//===== By: ==================================================
+//= eAthena Dev Team
+//= v 1.2
+//===== Current Version: =====================================
+
+// Special Quests Places =====
+ama_test	mapflag	nowarp
+gon_test	mapflag	nowarp
+
+// Guild Castles =============
+aldeg_cas01	mapflag	nowarp
+aldeg_cas02	mapflag	nowarp
+aldeg_cas03	mapflag	nowarp
+aldeg_cas04	mapflag	nowarp
+aldeg_cas05	mapflag	nowarp
+gefg_cas01	mapflag	nowarp
+gefg_cas02	mapflag	nowarp
+gefg_cas03	mapflag	nowarp
+gefg_cas04	mapflag	nowarp
+gefg_cas05	mapflag	nowarp
+payg_cas01	mapflag	nowarp
+payg_cas02	mapflag	nowarp
+payg_cas03	mapflag	nowarp
+payg_cas04	mapflag	nowarp
+payg_cas05	mapflag	nowarp
+prtg_cas01	mapflag	nowarp
+prtg_cas02	mapflag	nowarp
+prtg_cas03	mapflag	nowarp
+prtg_cas04	mapflag	nowarp
+prtg_cas05	mapflag	nowarp
+schg_cas01	mapflag	nowarp
+schg_cas02	mapflag	nowarp
+schg_cas03	mapflag	nowarp
+schg_cas04	mapflag	nowarp
+schg_cas05	mapflag	nowarp
+n_castle	mapflag	nowarp
+nguild_alde	mapflag	nowarp
+nguild_gef	mapflag	nowarp
+nguild_pay	mapflag	nowarp
+nguild_prt	mapflag	nowarp
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
new file mode 100644
index 000000000..15fba8d65
--- /dev/null
+++ b/conf/mapflag/nowarpto.txt
@@ -0,0 +1,49 @@
+//===== eAthena Script =======================================
+//= Map flags that disable warpto
+//===== By: ==================================================
+//= eAthena Dev Team
+//= v 1.3
+//===== Current Version: =====================================
+
+// Guild Castles ========================
+//alde_gld	mapflag	nowarpto
+aldeg_cas01	mapflag	nowarpto
+aldeg_cas02	mapflag	nowarpto
+aldeg_cas03	mapflag	nowarpto
+aldeg_cas04	mapflag	nowarpto
+aldeg_cas05	mapflag	nowarpto
+gefg_cas01	mapflag	nowarpto
+gefg_cas02	mapflag	nowarpto
+gefg_cas03	mapflag	nowarpto
+gefg_cas04	mapflag	nowarpto
+gefg_cas05	mapflag	nowarpto
+//pay_gld	mapflag	nowarpto
+payg_cas01	mapflag	nowarpto
+payg_cas02	mapflag	nowarpto
+payg_cas03	mapflag	nowarpto
+payg_cas04	mapflag	nowarpto
+payg_cas05	mapflag	nowarpto
+//prt_gld	mapflag	nowarpto
+prtg_cas01	mapflag	nowarpto
+prtg_cas02	mapflag	nowarpto
+prtg_cas03	mapflag	nowarpto
+prtg_cas04	mapflag	nowarpto
+prtg_cas05	mapflag	nowarpto
+schg_cas01	mapflag	nowarpto
+schg_cas02	mapflag	nowarpto
+schg_cas03	mapflag	nowarpto
+schg_cas04	mapflag	nowarpto
+schg_cas05	mapflag	nowarpto
+//Novice Guild
+n_castle	mapflag	nowarpto
+nguild_alde	mapflag	nowarpto
+nguild_gef	mapflag	nowarpto
+nguild_pay	mapflag	nowarpto
+nguild_prt	mapflag	nowarpto
+//Lighthalzen Bio-Lab 3F
+lhz_dun03	mapflag	nowarpto
+// Special Quests Places =======
+ama_test	mapflag	nowarpto
+gon_test	mapflag	nowarpto
+que_rachel	mapflag	nowarpto
+que_san04	mapflag	nowarpto
diff --git a/conf/mapflag/pvp.txt b/conf/mapflag/pvp.txt
new file mode 100644
index 000000000..e32d58aca
--- /dev/null
+++ b/conf/mapflag/pvp.txt
@@ -0,0 +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	mapflag	pvp
+pvp_y_1-2	mapflag	pvp
+pvp_y_1-3	mapflag	pvp
+pvp_y_1-4	mapflag	pvp
+pvp_y_1-5	mapflag	pvp
+pvp_y_2-1	mapflag	pvp
+pvp_y_2-2	mapflag	pvp
+pvp_y_2-3	mapflag	pvp
+pvp_y_2-4	mapflag	pvp
+pvp_y_2-5	mapflag	pvp
+pvp_y_3-1	mapflag	pvp
+pvp_y_3-2	mapflag	pvp
+pvp_y_3-3	mapflag	pvp
+pvp_y_3-4	mapflag	pvp
+pvp_y_3-5	mapflag	pvp
+pvp_y_4-1	mapflag	pvp
+pvp_y_4-2	mapflag	pvp
+pvp_y_4-3	mapflag	pvp
+pvp_y_4-4	mapflag	pvp
+pvp_y_4-5	mapflag	pvp
+pvp_y_5-1	mapflag	pvp
+pvp_y_5-2	mapflag	pvp
+pvp_y_5-3	mapflag	pvp
+pvp_y_5-4	mapflag	pvp
+pvp_y_5-5	mapflag	pvp
+pvp_y_6-1	mapflag	pvp
+pvp_y_6-2	mapflag	pvp
+pvp_y_6-3	mapflag	pvp
+pvp_y_6-4	mapflag	pvp
+pvp_y_6-5	mapflag	pvp
+pvp_y_7-1	mapflag	pvp
+pvp_y_7-2	mapflag	pvp
+pvp_y_7-3	mapflag	pvp
+pvp_y_7-4	mapflag	pvp
+pvp_y_7-5	mapflag	pvp
+pvp_y_8-1	mapflag	pvp
+pvp_y_8-2	mapflag	pvp
+pvp_y_8-3	mapflag	pvp
+pvp_y_8-4	mapflag	pvp
+pvp_y_8-5	mapflag	pvp
+pvp_n_1-1	mapflag	pvp
+pvp_n_1-2	mapflag	pvp
+pvp_n_1-3	mapflag	pvp
+pvp_n_1-4	mapflag	pvp
+pvp_n_1-5	mapflag	pvp
+pvp_n_2-1	mapflag	pvp
+pvp_n_2-2	mapflag	pvp
+pvp_n_2-3	mapflag	pvp
+pvp_n_2-4	mapflag	pvp
+pvp_n_2-5	mapflag	pvp
+pvp_n_3-1	mapflag	pvp
+pvp_n_3-2	mapflag	pvp
+pvp_n_3-3	mapflag	pvp
+pvp_n_3-4	mapflag	pvp
+pvp_n_3-5	mapflag	pvp
+pvp_n_4-1	mapflag	pvp
+pvp_n_4-2	mapflag	pvp
+pvp_n_4-3	mapflag	pvp
+pvp_n_4-4	mapflag	pvp
+pvp_n_4-5	mapflag	pvp
+pvp_n_5-1	mapflag	pvp
+pvp_n_5-2	mapflag	pvp
+pvp_n_5-3	mapflag	pvp
+pvp_n_5-4	mapflag	pvp
+pvp_n_5-5	mapflag	pvp
+pvp_n_6-1	mapflag	pvp
+pvp_n_6-2	mapflag	pvp
+pvp_n_6-3	mapflag	pvp
+pvp_n_6-4	mapflag	pvp
+pvp_n_6-5	mapflag	pvp
+pvp_n_7-1	mapflag	pvp
+pvp_n_7-2	mapflag	pvp
+pvp_n_7-3	mapflag	pvp
+pvp_n_7-4	mapflag	pvp
+pvp_n_7-5	mapflag	pvp
+pvp_n_8-1	mapflag	pvp
+pvp_n_8-2	mapflag	pvp
+pvp_n_8-3	mapflag	pvp
+pvp_n_8-4	mapflag	pvp
+pvp_n_8-5	mapflag	pvp
+pvp_2vs2	mapflag	pvp
diff --git a/conf/mapflag/pvp_noguild.txt b/conf/mapflag/pvp_noguild.txt
new file mode 100644
index 000000000..33937ea31
--- /dev/null
+++ b/conf/mapflag/pvp_noguild.txt
@@ -0,0 +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	mapflag	pvp_noguild
+pvp_y_1-2	mapflag	pvp_noguild
+pvp_y_1-3	mapflag	pvp_noguild
+pvp_y_1-4	mapflag	pvp_noguild
+pvp_y_1-5	mapflag	pvp_noguild
+pvp_y_2-1	mapflag	pvp_noguild
+pvp_y_2-2	mapflag	pvp_noguild
+pvp_y_2-3	mapflag	pvp_noguild
+pvp_y_2-4	mapflag	pvp_noguild
+pvp_y_2-5	mapflag	pvp_noguild
+pvp_y_3-1	mapflag	pvp_noguild
+pvp_y_3-2	mapflag	pvp_noguild
+pvp_y_3-3	mapflag	pvp_noguild
+pvp_y_3-4	mapflag	pvp_noguild
+pvp_y_3-5	mapflag	pvp_noguild
+pvp_y_4-1	mapflag	pvp_noguild
+pvp_y_4-2	mapflag	pvp_noguild
+pvp_y_4-3	mapflag	pvp_noguild
+pvp_y_4-4	mapflag	pvp_noguild
+pvp_y_4-5	mapflag	pvp_noguild
+pvp_y_5-1	mapflag	pvp_noguild
+pvp_y_5-2	mapflag	pvp_noguild
+pvp_y_5-3	mapflag	pvp_noguild
+pvp_y_5-4	mapflag	pvp_noguild
+pvp_y_5-5	mapflag	pvp_noguild
+pvp_y_6-1	mapflag	pvp_noguild
+pvp_y_6-2	mapflag	pvp_noguild
+pvp_y_6-3	mapflag	pvp_noguild
+pvp_y_6-4	mapflag	pvp_noguild
+pvp_y_6-5	mapflag	pvp_noguild
+pvp_y_7-1	mapflag	pvp_noguild
+pvp_y_7-2	mapflag	pvp_noguild
+pvp_y_7-3	mapflag	pvp_noguild
+pvp_y_7-4	mapflag	pvp_noguild
+pvp_y_7-5	mapflag	pvp_noguild
+pvp_y_8-1	mapflag	pvp_noguild
+pvp_y_8-2	mapflag	pvp_noguild
+pvp_y_8-3	mapflag	pvp_noguild
+pvp_y_8-4	mapflag	pvp_noguild
+pvp_y_8-5	mapflag	pvp_noguild
+pvp_n_1-1	mapflag	pvp_noguild
+pvp_n_1-2	mapflag	pvp_noguild
+pvp_n_1-3	mapflag	pvp_noguild
+pvp_n_1-4	mapflag	pvp_noguild
+pvp_n_1-5	mapflag	pvp_noguild
+pvp_n_2-1	mapflag	pvp_noguild
+pvp_n_2-2	mapflag	pvp_noguild
+pvp_n_2-3	mapflag	pvp_noguild
+pvp_n_2-4	mapflag	pvp_noguild
+pvp_n_2-5	mapflag	pvp_noguild
+pvp_n_3-1	mapflag	pvp_noguild
+pvp_n_3-2	mapflag	pvp_noguild
+pvp_n_3-3	mapflag	pvp_noguild
+pvp_n_3-4	mapflag	pvp_noguild
+pvp_n_3-5	mapflag	pvp_noguild
+pvp_n_4-1	mapflag	pvp_noguild
+pvp_n_4-2	mapflag	pvp_noguild
+pvp_n_4-3	mapflag	pvp_noguild
+pvp_n_4-4	mapflag	pvp_noguild
+pvp_n_4-5	mapflag	pvp_noguild
+pvp_n_5-1	mapflag	pvp_noguild
+pvp_n_5-2	mapflag	pvp_noguild
+pvp_n_5-3	mapflag	pvp_noguild
+pvp_n_5-4	mapflag	pvp_noguild
+pvp_n_5-5	mapflag	pvp_noguild
+pvp_n_6-1	mapflag	pvp_noguild
+pvp_n_6-2	mapflag	pvp_noguild
+pvp_n_6-3	mapflag	pvp_noguild
+pvp_n_6-4	mapflag	pvp_noguild
+pvp_n_6-5	mapflag	pvp_noguild
+pvp_n_7-1	mapflag	pvp_noguild
+pvp_n_7-2	mapflag	pvp_noguild
+pvp_n_7-3	mapflag	pvp_noguild
+pvp_n_7-4	mapflag	pvp_noguild
+pvp_n_7-5	mapflag	pvp_noguild
+pvp_n_8-1	mapflag	pvp_noguild
+pvp_n_8-2	mapflag	pvp_noguild
+pvp_n_8-3	mapflag	pvp_noguild
+pvp_n_8-4	mapflag	pvp_noguild
+pvp_n_8-5	mapflag	pvp_noguild
+pvp_2vs2	mapflag	pvp_noguild
diff --git a/conf/mapflag/pvp_noparty.txt b/conf/mapflag/pvp_noparty.txt
new file mode 100644
index 000000000..4371ca365
--- /dev/null
+++ b/conf/mapflag/pvp_noparty.txt
@@ -0,0 +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	mapflag	pvp_noparty
+guild_vs2	mapflag	pvp_noparty
+guild_vs3	mapflag	pvp_noparty
+guild_vs4	mapflag	pvp_noparty
+guild_vs5	mapflag	pvp_noparty
diff --git a/conf/mapflag/restricted.txt b/conf/mapflag/restricted.txt
new file mode 100644
index 000000000..6ae69efaf
--- /dev/null
+++ b/conf/mapflag/restricted.txt
@@ -0,0 +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	mapflag	restricted	1
+turbo_n_1	mapflag	restricted	1
+turbo_n_4	mapflag	restricted	1
+turbo_n_8	mapflag	restricted	1
+turbo_n_16	mapflag	restricted	1
+turbo_e_4	mapflag	restricted	1
+turbo_e_8	mapflag	restricted	1
+turbo_e_16	mapflag	restricted	1
+
+//Jail
+sec_pri	mapflag	restricted	2
diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
new file mode 100644
index 000000000..57f14af53
--- /dev/null
+++ b/conf/maps_athena.conf
@@ -0,0 +1,884 @@
+//------------------------- Normal Maps ---------------------------
+map: alb_ship
+map: alb2trea
+map: alberta
+map: alberta_in
+map: alde_dun01
+map: alde_dun02
+map: alde_dun03
+map: alde_dun04
+map: aldeba_in
+map: aldebaran
+map: anthell01
+map: anthell02
+map: arena_room
+map: c_tower1
+map: c_tower2
+map: c_tower3
+map: c_tower4
+//map: force_map1
+//map: force_map2
+//map: force_map3
+map: force_1-1
+map: force_2-1
+map: force_3-1
+map: force_4-1
+map: force_5-1
+map: force_1-2
+map: force_2-2
+map: force_3-2
+map: force_1-3
+map: force_2-3
+map: force_3-3
+map: gef_dun00
+map: gef_dun01
+map: gef_dun02
+map: gef_dun03
+map: gef_fild00
+map: gef_fild01
+map: gef_fild02
+map: gef_fild03
+map: gef_fild04
+map: gef_fild05
+map: gef_fild06
+map: gef_fild07
+map: gef_fild08
+map: gef_fild09
+map: gef_fild10
+map: gef_fild11
+map: gef_fild12
+map: gef_fild13
+map: gef_fild14
+map: gef_tower
+map: geffen
+map: geffen_in
+map: gl_cas01
+map: gl_cas02
+map: gl_church
+map: gl_chyard
+map: gl_dun01
+map: gl_dun02
+map: gl_in01
+map: gl_knt01
+map: gl_knt02
+map: gl_prison
+map: gl_prison1
+map: gl_sew01
+map: gl_sew02
+map: gl_sew03
+map: gl_sew04
+map: gl_step
+map: glast_01
+//map: hunter_1-1
+//map: hunter_2-1
+//map: hunter_3-1
+map: in_hunter
+map: in_moc_16
+map: in_orcs01
+map: in_sphinx1
+map: in_sphinx2
+map: in_sphinx3
+map: in_sphinx4
+map: in_sphinx5
+map: iz_dun00
+map: iz_dun01
+map: iz_dun02
+map: iz_dun03
+map: iz_dun04
+map: izlu2dun
+map: izlude
+map: izlude_in
+map: job_thief1
+//map: knight_1-1
+//map: knight_2-1
+//map: knight_3-1
+map: mjo_dun01
+map: mjo_dun02
+map: mjo_dun03
+map: mjolnir_01
+map: mjolnir_02
+map: mjolnir_03
+map: mjolnir_04
+map: mjolnir_05
+map: mjolnir_06
+map: mjolnir_07
+map: mjolnir_08
+map: mjolnir_09
+map: mjolnir_10
+map: mjolnir_11
+map: mjolnir_12
+map: moc_castle
+map: moc_fild01
+map: moc_fild02
+map: moc_fild03
+map: moc_fild04
+map: moc_fild05
+map: moc_fild06
+map: moc_fild07
+map: moc_fild08
+map: moc_fild09
+map: moc_fild10
+map: moc_fild11
+map: moc_fild12
+map: moc_fild13
+map: moc_fild14
+map: moc_fild15
+map: moc_fild16
+map: moc_fild17
+map: moc_fild18
+map: moc_fild19
+map: moc_pryd01
+map: moc_pryd02
+map: moc_pryd03
+map: moc_pryd04
+map: moc_pryd05
+map: moc_pryd06
+map: moc_prydb1
+map: moc_ruins
+map: monk_in
+map: morocc
+map: morocc_in
+map: new_zone01
+map: new_zone02
+map: new_zone03
+map: new_zone04
+//map: new_1-1
+//map: new_1-2
+//map: new_1-3
+//map: new_1-4
+//map: new_2-1
+//map: new_2-2
+//map: new_2-3
+//map: new_2-4
+//map: new_3-1
+//map: new_3-2
+//map: new_3-3
+//map: new_3-4
+//map: new_4-1
+//map: new_4-2
+//map: new_4-3
+//map: new_4-4
+//map: new_5-1
+//map: new_5-2
+//map: new_5-3
+//map: new_5-4
+map: orcsdun01
+map: orcsdun02
+//map: ordeal_a00
+//map: ordeal_a02
+map: ordeal_1-1
+map: ordeal_1-2
+//map: ordeal_1-3
+//map: ordeal_1-4
+map: ordeal_2-1
+map: ordeal_2-2
+//map: ordeal_2-3
+//map: ordeal_2-4
+map: ordeal_3-1
+map: ordeal_3-2
+//map: ordeal_3-3
+//map: ordeal_3-4
+map: pay_arche
+map: pay_dun00
+map: pay_dun01
+map: pay_dun02
+map: pay_dun03
+map: pay_dun04
+map: pay_fild01
+map: pay_fild02
+map: pay_fild03
+map: pay_fild04
+map: pay_fild05
+map: pay_fild06
+map: pay_fild07
+map: pay_fild08
+map: pay_fild09
+map: pay_fild10
+map: pay_fild11
+//map: payon	//moved down to new maps
+//map: payon_in01	//moved down to new maps
+//map: payon_in02	//moved down to new maps
+//map: priest_1-1
+//map: priest_2-1
+//map: priest_3-1
+map: prontera
+map: prt_are_in
+map: prt_are01
+map: prt_castle
+map: prt_church
+map: prt_fild00
+map: prt_fild01
+map: prt_fild02
+map: prt_fild03
+map: prt_fild04
+map: prt_fild05
+map: prt_fild06
+map: prt_fild07
+map: prt_fild08
+map: prt_fild09
+map: prt_fild10
+map: prt_fild11
+map: prt_in
+map: prt_maze01
+map: prt_maze02
+map: prt_maze03
+map: prt_monk
+map: prt_sewb1
+map: prt_sewb2
+map: prt_sewb3
+map: prt_sewb4
+//map: pvp_room
+map: pvp_2vs2
+map: pvp_c_room
+map: pvp_n_1-1
+map: pvp_n_1-2
+map: pvp_n_1-3
+map: pvp_n_1-4
+map: pvp_n_1-5
+map: pvp_n_2-1
+map: pvp_n_2-2
+map: pvp_n_2-3
+map: pvp_n_2-4
+map: pvp_n_2-5
+map: pvp_n_3-1
+map: pvp_n_3-2
+map: pvp_n_3-3
+map: pvp_n_3-4
+map: pvp_n_3-5
+map: pvp_n_4-1
+map: pvp_n_4-2
+map: pvp_n_4-3
+map: pvp_n_4-4
+map: pvp_n_4-5
+map: pvp_n_5-1
+map: pvp_n_5-2
+map: pvp_n_5-3
+map: pvp_n_5-4
+map: pvp_n_5-5
+map: pvp_n_6-1
+map: pvp_n_6-2
+map: pvp_n_6-3
+map: pvp_n_6-4
+map: pvp_n_6-5
+map: pvp_n_7-1
+map: pvp_n_7-2
+map: pvp_n_7-3
+map: pvp_n_7-4
+map: pvp_n_7-5
+map: pvp_n_8-1
+map: pvp_n_8-2
+map: pvp_n_8-3
+map: pvp_n_8-4
+map: pvp_n_8-5
+map: pvp_n_room
+map: pvp_y_1-1
+map: pvp_y_1-2
+map: pvp_y_1-3
+map: pvp_y_1-4
+map: pvp_y_1-5
+map: pvp_y_2-1
+map: pvp_y_2-2
+map: pvp_y_2-3
+map: pvp_y_2-4
+map: pvp_y_2-5
+map: pvp_y_3-1
+map: pvp_y_3-2
+map: pvp_y_3-3
+map: pvp_y_3-4
+map: pvp_y_3-5
+map: pvp_y_4-1
+map: pvp_y_4-2
+map: pvp_y_4-3
+map: pvp_y_4-4
+map: pvp_y_4-5
+map: pvp_y_5-1
+map: pvp_y_5-2
+map: pvp_y_5-3
+map: pvp_y_5-4
+map: pvp_y_5-5
+map: pvp_y_6-1
+map: pvp_y_6-2
+map: pvp_y_6-3
+map: pvp_y_6-4
+map: pvp_y_6-5
+map: pvp_y_7-1
+map: pvp_y_7-2
+map: pvp_y_7-3
+map: pvp_y_7-4
+map: pvp_y_7-5
+map: pvp_y_8-1
+map: pvp_y_8-2
+map: pvp_y_8-3
+map: pvp_y_8-4
+map: pvp_y_8-5
+map: pvp_y_room
+//map: sword_1-1
+//map: sword_2-1
+//map: sword_3-1
+map: treasure01
+map: treasure02
+//map: wizard_1-1
+//map: wizard_2-1
+//map: wizard_3-1
+map: xmas
+map: xmas_dun01
+map: xmas_dun02
+map: xmas_fild01
+map: xmas_in
+
+//---Ep3.0 Comodo ---
+
+map: beach_dun
+map: beach_dun2
+map: beach_dun3
+map: cmd_fild01
+map: cmd_fild02
+map: cmd_fild03
+map: cmd_fild04
+map: cmd_fild05
+map: cmd_fild06
+map: cmd_fild07
+map: cmd_fild08
+map: cmd_fild09
+map: cmd_in01
+map: cmd_in02
+map: comodo
+
+//---EP3.1 Quiz Revolution ---
+
+map: quiz_00
+map: quiz_01
+map: g_room1-1
+map: g_room1-2
+map: g_room1-3
+map: g_room2
+
+//--- Ep4.0 Turtle Island ---
+
+map: tur_dun01
+map: tur_dun02
+map: tur_dun03
+map: tur_dun04
+map: tur_dun05
+map: tur_dun06
+
+//--- Ep4.1 The War of Emperium ---
+
+map: alde_gld
+map: aldeg_cas01
+map: aldeg_cas02
+map: aldeg_cas03
+map: aldeg_cas04
+map: aldeg_cas05
+map: gefg_cas01
+map: gefg_cas02
+map: gefg_cas03
+map: gefg_cas04
+map: gefg_cas05
+map: gld_dun01
+map: gld_dun02
+map: gld_dun03
+map: gld_dun04
+map: guild_room
+map: guild_vs1
+map: guild_vs2
+map: guild_vs3
+map: guild_vs4
+map: guild_vs5
+map: guild_vs1-1
+map: guild_vs1-2
+map: guild_vs1-3
+map: guild_vs1-4
+map: guild_vs2-1
+map: guild_vs2-2
+//map: job_hunter
+map: job_hunte
+//map: job_knight
+map: job_knt
+//map: job_priest
+map: job_prist
+map: job_sword1
+//map: job_wizard
+map: job_wiz
+map: pay_gld
+map: payg_cas01
+map: payg_cas02
+map: payg_cas03
+map: payg_cas04
+map: payg_cas05
+map: prt_gld
+map: prtg_cas01
+map: prtg_cas02
+map: prtg_cas03
+map: prtg_cas04
+map: prtg_cas05
+
+
+//--- Ep5.0 Yuno ---
+
+map: alde_alche
+map: in_rogue
+map: job_cru
+map: job_duncer
+map: job_monk
+map: job_sage
+map: mag_dun01
+map: mag_dun02
+map: monk_test
+map: quiz_test
+map: yuno
+map: yuno_fild01
+map: yuno_fild02
+map: yuno_fild03
+map: yuno_fild04
+map: yuno_in01
+map: yuno_in02
+map: yuno_in03
+map: yuno_in04
+map: yuno_in05
+
+//--- Ep6.0 - Amatsu  ---
+// Requires: kRO 08-10-03 or newer
+// or kRO Sakray 09-09-03 or newer
+
+map: ama_dun01
+map: ama_dun02
+map: ama_dun03
+map: ama_fild01
+map: ama_in01
+map: ama_in02
+map: ama_test
+map: amatsu
+
+//--- Ep6.1 - Gon Ryun ---
+
+map: gon_dun01
+map: gon_dun02
+map: gon_dun03
+map: gon_fild01
+map: gon_in
+map: gon_test
+map: gonryun
+map: sec_in01
+map: sec_in02
+map: sec_pri
+
+//--- 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
+map: um_dun01
+map: um_dun02
+map: um_fild01
+map: um_fild02
+map: um_fild03
+map: um_fild04
+map: um_in
+
+//--- 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
+map: nif_fild01
+map: nif_fild02
+map: nif_in
+map: yggdrasil01
+
+//--- 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
+map: himinn
+
+//--- Ep6.5 - Castle of Dragon (LouYang) ---
+// Requires kRO Sakray 03-30 or newer
+//(Akaru's SuperGRF required version: 1.52)
+map: lou_in01
+map: lou_in02
+map: lou_dun03
+map: lou_dun02
+map: lou_dun01
+map: lou_fild01
+map: louyang
+
+//--- Ep6.6 - Novice Guild Siege ---
+//Requires kRO Sakray 04-07 or newer
+//(Akaru's SuperGRF required version: 1.53)
+//map: siege_test
+map: n_castle
+map: nguild_gef
+map: nguild_prt
+map: nguild_pay
+map: nguild_alde
+
+//--- Ep6.7 - Jawaii ---
+//Requires kRO Sakray 06-22 or newer
+//(Akaru's SuperGRF required version: 1.63)
+map: jawaii
+map: jawaii_in
+
+// --- Ep6.8 - Geffenia ---
+// Requires kRO Sakray 07-13 or newer
+// (Akaru's SuperGRF required version: 1.64)
+map: gefenia01
+map: gefenia02
+map: gefenia03
+map: gefenia04
+
+// --- Ep6.9 - New Payon ---
+// Requires kRO Sakray 09-03
+// -- dunno --
+map: payon
+map: payon_in01
+map: payon_in02
+map: payon_in03
+//same names as old maps except that payon_in03 got added
+
+// --- Ep? - Ayothaya ---
+// Requires kRO Sakray 09-21
+// -- 2004-10-19sdata_k.gpf --
+map: ayothaya
+map: ayo_in01
+map: ayo_in02
+map: ayo_fild01
+map: ayo_fild02
+map: ayo_dun01
+map: ayo_dun02
+
+// --- God item quests maps ---
+// -- 2004-10-12sdata_k3.gpf --
+map: que_god01
+map: que_god02
+
+// --- Ep? - Schwarzwald Republic ---
+// -- 2004-12-28sdata_k.gpf --
+map: yuno_fild05
+map: yuno_fild07
+map: yuno_fild08
+map: yuno_fild09
+map: yuno_fild11
+map: yuno_fild12
+
+// --- Turbo Track Arena ---
+// -- 2005-03-08sdata_k.gpf --
+map: alde_tt02
+map: turbo_n_1
+map: turbo_n_4
+map: turbo_n_8
+map: turbo_n_16
+map: turbo_e_4
+map: turbo_e_8
+map: turbo_e_16
+map: turbo_room
+
+// --- Einbroch/Einbech ---
+// -- 2005-03-15sdata_k.gpf --
+map: airplane
+map: airport
+map: einbech
+map: einbroch
+map: ein_dun01
+map: ein_dun02
+map: ein_fild06
+map: ein_fild07
+map: ein_fild08
+map: ein_fild09
+map: ein_fild10
+map: ein_in01
+map: que_sign01
+map: que_sign02
+
+// --- Einbroch and Lightalzen ---
+// -- 2005-05-10sdata_k.gpf --
+map: ein_fild03
+map: ein_fild04
+map: lhz_fild02
+map: lhz_fild03
+
+// --- Lighthalzen and Juperos Dungeon ---
+// -- 2005-06-14sdata_k.gpf --
+map: yuno_pre
+map: lhz_fild01
+map: lighthalzen
+map: lhz_in01
+map: lhz_in02
+map: lhz_in03
+map: lhz_que01
+map: lhz_dun01
+map: lhz_dun02
+map: lhz_dun03
+map: lhz_cube
+map: juperos_01
+map: juperos_02
+map: jupe_area1
+map: jupe_area2
+map: jupe_core
+map: jupe_ele
+map: jupe_ele_r
+map: jupe_gate
+
+// --- Lighthalzen & Juno Airport ---
+// -- resnametable clones of airport and airplane --
+map: y_airport
+map: lhz_airport
+map: airplane_01
+
+// --- Juperos Dungeon ---
+// -- 2005-06-28sdata_k.gpf --
+map: jupe_cave
+
+// --- Quiz Revolution ---
+// -- 2005-08-02sdata_k.gpf --
+map: quiz_02
+
+// --- Hugel Field ---
+// -- 2005-08-23sdata_k.gpf --
+map: hu_fild07
+map: hu_fild05
+map: hu_fild04
+map: hu_fild01
+map: yuno_fild06
+
+// --- Star Knight And Soul Linker Job Change Maps ---
+// -- 2005-08-23sdata_k.gpf --
+map: job_soul
+map: job_star
+
+// --- Abyss Lake, Thanatos Tower --
+// -- 2005-09-13sdata_k.gpf - 2005-09-13sdata_k6.gpf --
+map: que_job01
+map: que_job02
+map: que_job03
+map: abyss_01
+map: abyss_02
+map: abyss_03
+map: thana_step
+map: thana_boss
+map: tha_scene01
+map: tha_t01
+map: tha_t02
+map: tha_t03
+map: tha_t04
+map: tha_t07
+map: tha_t05
+map: tha_t06
+map: tha_t08
+
+// --- Thanatos Tower ---
+// -- 2005-09-21sdata_k.gpf -- 
+map: tha_t09
+map: tha_t10
+map: tha_t11
+map: tha_t12
+
+// --- Auction Market ---
+// -- 2005-11-29sdata_k.gpf -- 
+map: auction_01
+map: auction_02
+
+// --- Garden City Hugel / Kiehl ---
+// -- 2005-12-20sdata_k.gpf -- 
+map: hugel
+map: hu_in01
+map: que_bingo
+map: que_hugel
+map: p_track01
+map: p_track02
+map: odin_tem01
+map: odin_tem02
+map: odin_tem03
+map: hu_fild02
+map: hu_fild03
+map: hu_fild06
+map: ein_fild01
+map: ein_fild02
+map: ein_fild05
+map: yuno_fild10
+map: kh_kiehl02
+map: kh_kiehl01
+map: kh_dun02
+map: kh_dun01
+map: kh_mansion
+map: kh_rossi
+map: kh_school
+map: kh_vila
+
+// --- Poring Arena (?) & Gunslinger/Ninja Job Map ---
+// -- 2006-03-28sdata_k.gpf --
+map: poring_c01
+map: poring_c02
+map: que_ng
+
+// --- Arunafeltz & Ice Dungeon ---
+// -- 2006-05-30sdata_k.gpf --
+map: rachel
+map: ra_in01
+map: ra_fild01
+map: ra_fild02
+map: ra_fild03
+map: ra_fild04
+map: ra_fild05
+map: ra_fild06
+map: ra_fild07
+map: ra_fild08
+map: ra_fild09
+map: ra_fild10
+map: ra_fild11
+map: ra_fild12
+map: ra_fild13
+map: ra_san01
+map: ra_san02
+map: ra_san03
+map: ra_san04
+map: ra_san05
+map: ra_temin
+map: ra_temple
+map: ra_temsky
+map: que_rachel
+map: que_san04
+map: ice_dun01
+map: ice_dun02
+map: ice_dun03
+map: ice_dun04
+
+// --- Veins & Thor Dungeon ---
+// -- 2006-12-19sdata_k.gpf --
+map: que_thor
+map: thor_camp
+map: thor_v01
+map: thor_v02
+map: thor_v03
+map: veins
+map: ve_in
+map: ve_in02
+map: ve_fild01
+map: ve_fild02
+map: ve_fild03
+map: ve_fild04
+map: ve_fild05
+map: ve_fild06
+map: ve_fild07
+
+// --- Nameless Island & Abbey Dungeon ---
+// -- 2007-04-03sdata_k.gpf
+map: nameless_i
+map: nameless_n
+map: nameless_in
+map: abbey01
+map: abbey02
+map: abbey03
+map: poring_w01
+map: poring_w02
+
+// --- ??? ---
+// -- 2007-??-??
+map: 06guild_r
+map: 06guild_01
+map: 06guild_02
+map: 06guild_03
+map: 06guild_04
+map: 06guild_05
+map: 06guild_06
+map: 06guild_07
+map: 06guild_08
+map: z_agit
+map: que_temsky
+map: itemmall
+map: bossnia_01
+map: bossnia_02
+map: bossnia_03
+map: bossnia_04
+
+// --- Moscovia ---
+// -- 2007-06-???
+map: moscovia
+map: mosk_in
+map: mosk_ship
+map: mosk_fild01
+map: mosk_fild02
+map: mosk_dun01
+map: mosk_dun02
+map: mosk_dun03
+
+// --- Episode 12: Satan Morroc & Schwaltzvalt Seige ---
+// -- 2007-09-19sdata_k.gpf
+map: schg_cas01
+map: schg_cas02
+map: schg_cas03
+map: schg_cas04
+map: schg_cas05
+map: sch_gld
+map: cave
+map: moc_fild20
+map: moc_fild21
+map: moc_fild22
+map: que_ba
+map: que_moc_16
+map: que_moon
+
+//------------------------- Clone Maps ---------------------------
+//------------------------- Extra Maps ---------------------------
+
+// Ragnarok World Championship 2004
+// Requires: RWC 2004 Client
+// or Akaru's SuperGRF 1.64 or newer
+//map: rwc01
+//map: rwc02
+//map: rwc03
+
+//Christmas & Sakura Special
+//Requires Akaru's SuperGRF 1.1 or newer
+//map: prontera_x
+//map: alberta_x
+//map: aldebaran_x
+//map: geffen_x
+//map: izlude_x
+//map: prt_church_x
+//map: prontera_s
+//map: pay_arche_s
+
+//Fenced Lutie
+//Requires Akaru's SuperGRF 1.23 or newer
+//map: xmas_old
+
+//Alpha Maps
+//Requires adata.grf containing alpha maps and data
+//map: fay_vilg00
+//map: fay_vilg01
+//map: gef_vilg00
+//map: gef_vilg01
+//map: moc_dugn01
+//map: moc_dugn02
+//map: moc_fild01
+//map: moc_fild02
+//map: moc_fild03
+//map: moc_fild04
+//map: moc_intr00
+//map: moc_intr01
+//map: moc_intr02
+//map: moc_intr04
+//map: moc_vilg00
+//map: moc_vilg01
+//map: moc_vilg02
+//map: probemap
+//map: probemap02
+//map: prt_cstl01
+//map: prt_dugn00
+//map: prt_dugn01
+//map: prt_fild00
+//map: prt_fild01
+//map: prt_fild03
+//map: prt_fild04
+//map: prt_fild05
+//map: prt_intr01
+//map: prt_intr01_a
+//map: prt_intr02
+//map: prt_vilg00
+//map: prt_vilg01
+//map: prt_vilg02
+//map: tank_test
+//map: tank_test2
+//map: test
diff --git a/conf/motd.txt b/conf/motd.txt
new file mode 100644
index 000000000..b443cc434
--- /dev/null
+++ b/conf/motd.txt
@@ -0,0 +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
+Welcome to eAthena SVN Version! Enjoy! Please report any bugs you find.
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
new file mode 100644
index 000000000..851350300
--- /dev/null
+++ b/conf/msg_athena.conf
@@ -0,0 +1,557 @@
+// 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 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 sent 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: Appearance changed.
+37: An invalid number was specified.
+38: Invalid location number or name.
+39: All monsters 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 has passed.
+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: Guild siege warfare has already started.
+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 doesn'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 has 23 characters maximum.
+88: Character name sent 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 sent you to jail.
+118: Player warped to jail.
+119: This player is not in jail.
+120: A GM has discharged 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 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 from the current e-mail.
+148: Information sent 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 monster/egg name/ID doesn't exist.
+181: You already have a pet.
+182: Pet friendly value changed!
+183: Pet friendly is already in the good value.
+184: Sorry, but you have no pet.
+185: Pet hungry value changed!
+186: Pet hungry is already in 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: This player mounted a peco.
+217: This player cannot mount a peco with his/her job.
+218: Now, this player no longer has a 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 in night for %s.
+234: Game time: After, the game will be in permanent daylight.
+235: Game time: The game is 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 doesn'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 command 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 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: Twenty Four Castles
+324: Total Domination
+
+// 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 duelist.
+351: Duel: The limit of players has been reached.
+352: Duel: Player name not found.
+353: Duel: The Player is in the duel already.
+354: 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 duelist.
+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/she 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 a 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 unread messages.
+515: You have %d unread priority messages.
+516: You have no unread messages.
+517: Message not found.
+518: Reading message from %s.
+519: Cannot delete unread priority mail.
+520: You have received 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) is trying to use a bot (it tries to detect a fake player).
+537: Character '%s' (account: %d) is trying 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 tried 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
+619: Gunslinger
+620: Ninja
+//...
+650: Unknown Job
+
+//Custom translations
+import: conf/import/msg_conf.txt
diff --git a/conf/packet_athena.conf b/conf/packet_athena.conf
new file mode 100644
index 000000000..76203bedb
--- /dev/null
+++ b/conf/packet_athena.conf
@@ -0,0 +1,57 @@
+// Athena sockets Configuration file
+// translated (davidsiaw)
+
+
+// Display debug reports (When 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
+
+//----- IP Rules Settings -----
+
+// If IP's are checked when connecting.
+// This also enables DDoS protection.
+enable_ip_rules: yes
+
+// Order of the checks
+//   deny,allow     : Checks deny rules, then allow rules. Allows if no rules match.
+//   allow,deny     : Checks allow rules, then deny rules. Allows if no rules match.
+//   mutual-failure : Allows only if an allow rule matches and no deny rules match.
+// (default is deny,allow)
+
+order: deny,allow
+// order: allow,deny
+// order: mutual-failture
+
+// IP rules
+//   allow : Accepts connections from the ip range (even if flagged as DDoS)
+//   deny  : Rejects connections from the ip range
+// The rules are processed in order, the first matching rule of each list (allow and deny) is used
+
+// 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 ddos_count connection request are made within ddos_interval msec, it assumes it's a DDoS attack
+
+// Consecutive attempts interval (msec)
+// (default is 3000 msecs, 3 seconds)
+ddos_interval: 3000
+
+// Consecutive attempts trigger
+// (default is 5 attemps)
+ddos_count: 5
+
+// The time interval after which the threat of DDoS is assumed to be gone. (msec)
+// After this amount of time, the DDoS restrictions are lifted.
+// (default is 600000 msecs, 10 minutes)
+ddos_autoreset: 600000
+
+
+import: conf/import/packet_conf.txt
diff --git a/conf/plugin_athena.conf b/conf/plugin_athena.conf
new file mode 100644
index 000000000..b7c30dfab
--- /dev/null
+++ b/conf/plugin_athena.conf
@@ -0,0 +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
+
+// Console parser
+//plugin: console
diff --git a/conf/readme.txt b/conf/readme.txt
new file mode 100644
index 000000000..db8777680
--- /dev/null
+++ b/conf/readme.txt
@@ -0,0 +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.
+
+Semi-guide by Ajarn
\ No newline at end of file
diff --git a/conf/script_athena.conf b/conf/script_athena.conf
new file mode 100644
index 000000000..1c426a634
--- /dev/null
+++ b/conf/script_athena.conf
@@ -0,0 +1,65 @@
+//      ______  __    __                                 
+//     /\  _  \/\ \__/\ \                                
+//   __\ \ \L\ \ \ ,_\ \ \___      __    ___      __     
+// /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\   
+///\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \L\.\_ 
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+//  _   _   _   _   _   _   _     _   _   _   _   _   _
+// / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \ 
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------
+// eAthena Script Configuration File
+//--------------------------------------------------------
+
+
+//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_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/subnet_athena.conf b/conf/subnet_athena.conf
new file mode 100644
index 000000000..e91fb7376
--- /dev/null
+++ b/conf/subnet_athena.conf
@@ -0,0 +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