Remove conf dir.

30 files changed, 0 insertions, 5398 deletions

diff --git a/npc/mapflag/battleground.txt b/npc/mapflag/battleground.txt
deleted file mode 100644
index 5b25b7227..000000000
--- a/npc/mapflag/battleground.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Epoque
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Battleground map setting.
-//================= Current Version =======================================
-//= 1.0a
-//================= Description ===========================================
-//= Defines a Battleground map.
-//= Additional parameter '2' shows scoreboard.
-//=========================================================================
-
-bat_c01	mapflag	battleground	2
-bat_c02	mapflag	battleground	2
-bat_c03	mapflag	battleground	2
-bat_b01	mapflag	battleground	2
-bat_b02	mapflag	battleground
-bat_a01	mapflag	battleground
-bat_a02	mapflag	battleground
diff --git a/npc/mapflag/gvg.txt b/npc/mapflag/gvg.txt
deleted file mode 100644
index b30ff1340..000000000
--- a/npc/mapflag/gvg.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Guild versus Guild mode.
-//================= Current Version =======================================
-//= 1.2
-//================= Description ===========================================
-//= Players can attack other guilds, and will have their guild
-//= icons shown. WoE damage reductions will also take place.
-//= gvg: Turns on GvG mode
-//= gvg_castle: Describes castle maps for WoE.
-//=========================================================================
-
-// 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
-arug_cas01	mapflag	gvg_castle
-arug_cas02	mapflag	gvg_castle
-arug_cas03	mapflag	gvg_castle
-arug_cas04	mapflag	gvg_castle
-arug_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
-//arug_cas01	mapflag	monster_noteleport
-//arug_cas02	mapflag	monster_noteleport
-//arug_cas03	mapflag	monster_noteleport
-//arug_cas04	mapflag	monster_noteleport
-//arug_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 =========
-arug_dun01	mapflag	gvg_dungeon
-schg_dun01	mapflag	gvg_dungeon
diff --git a/npc/mapflag/jail.txt b/npc/mapflag/jail.txt
deleted file mode 100644
index 0aff7412d..000000000
--- a/npc/mapflag/jail.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Jail.
-//================= Current Version =======================================
-//= 1.0
-//================= 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 fly wings or butterfly wings.
-//=========================================================================
-
-// 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
-
-// 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/npc/mapflag/night.txt b/npc/mapflag/night.txt
deleted file mode 100644
index a7a7a771f..000000000
--- a/npc/mapflag/night.txt
+++ /dev/null
@@ -1,342 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Skotlex
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Night mode.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= Enables night mode effects.
-//=========================================================================
-
-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_track02	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
-
-//Episode 12 ====================
-poring_c01	mapflag	nightenabled
-poring_c02	mapflag	nightenabled
-nameless_i	mapflag	nightenabled
-nameless_n	mapflag	nightenabled
-poring_w01	mapflag	nightenabled
-poring_w02	mapflag	nightenabled
-moscovia	mapflag	nightenabled
-mosk_ship	mapflag	nightenabled
-mosk_fild01	mapflag	nightenabled
-mosk_fild02	mapflag	nightenabled
-mosk_dun01	mapflag	nightenabled
-mosk_dun02	mapflag	nightenabled
-mosk_dun03	mapflag	nightenabled
-que_temsky	mapflag	nightenabled
-sch_gld	mapflag	nightenabled
-moc_fild20	mapflag	nightenabled
-moc_fild21	mapflag	nightenabled
-moc_fild22	mapflag	nightenabled
-aru_gld	mapflag	nightenabled
-que_qsch01	mapflag	nightenabled
-que_qsch02	mapflag	nightenabled
-que_qsch03	mapflag	nightenabled
-que_qsch04	mapflag	nightenabled
-que_qsch05	mapflag	nightenabled
-que_qaru01	mapflag	nightenabled
-que_qaru02	mapflag	nightenabled
-que_qaru03	mapflag	nightenabled
-que_qaru04	mapflag	nightenabled
-que_qaru05	mapflag	nightenabled
-
-// Battle Grounds ==============
-bat_c01	mapflag	nightenabled
-bat_c02	mapflag	nightenabled
-bat_c03	mapflag	nightenabled
-
-//Endless Tower ==================
-e_tower	mapflag	nightenabled
-
-// Episode 13 ====================
-mid_camp	mapflag	nightenabled
-man_fild01	mapflag	nightenabled
-man_fild03	mapflag	nightenabled
-spl_fild02	mapflag	nightenabled
-spl_fild03	mapflag	nightenabled
-moc_fild22b	mapflag	nightenabled
-que_dan01	mapflag	nightenabled
-schg_que01	mapflag	nightenabled
-arug_que01	mapflag	nightenabled
-nyd_dun01	mapflag	nightenabled
-nyd_dun02	mapflag	nightenabled
-manuk	mapflag	nightenabled
-man_fild02	mapflag	nightenabled
-splendide	mapflag	nightenabled
-spl_fild01	mapflag	nightenabled
-brasilis	mapflag	nightenabled
-bra_fild01	mapflag	nightenabled
-dicastes01	mapflag	nightenabled
-dicastes02	mapflag	nightenabled
-dic_fild01	mapflag	nightenabled
-dic_fild02	mapflag	nightenabled
-
-// Episode 14 ====================
-bif_fild01	mapflag	nightenabled
-bif_fild02	mapflag	nightenabled
-dewata	mapflag	nightenabled
-dew_fild01	mapflag	nightenabled
-dew_dun02	mapflag	nightenabled
-malangdo	mapflag	nightenabled
-malaya	mapflag	nightenabled
-ma_fild01	mapflag	nightenabled
-ma_fild02	mapflag	nightenabled
-ma_scene01	mapflag	nightenabled
-eclage	mapflag	nightenabled
-ecl_fild01	mapflag	nightenabled
-ecl_hub01	mapflag	nightenabled
-
-//evt_zombie	mapflag	nightenabled
diff --git a/npc/mapflag/nightmare.txt b/npc/mapflag/nightmare.txt
deleted file mode 100644
index 94fb9c791..000000000
--- a/npc/mapflag/nightmare.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Nightmare mode.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= Players drop items/equipment on death.
-//= pvp_nightmaredrop	id,type,percent
-//=   id: Drop a specific item ID or "random"
-//=   type: "inventory", "equip", or "all"
-//=   percent: Rate of item drop.
-//=========================================================================
-
-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/npc/mapflag/nobranch.txt b/npc/mapflag/nobranch.txt
deleted file mode 100644
index 4ad59ad67..000000000
--- a/npc/mapflag/nobranch.txt
+++ /dev/null
@@ -1,397 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2016  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Lupus
-//= Copyright (C)  massdriller
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable Dead Branch use.
-//================= Current Version =======================================
-//= 1.8.1
-//================= Description ===========================================
-//= Disables the following items:
-//=   Dead Branch (604), Bloody Branch (12103),
-//=   Red Pouch (12024), Poring Box (12109)
-//=========================================================================
-
-// 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
-new_1-1	mapflag	nobranch
-new_1-2	mapflag	nobranch
-new_1-3	mapflag	nobranch
-new_1-4	mapflag	nobranch
-new_2-1	mapflag	nobranch
-new_2-2	mapflag	nobranch
-new_2-3	mapflag	nobranch
-new_2-4	mapflag	nobranch
-new_3-1	mapflag	nobranch
-new_3-2	mapflag	nobranch
-new_3-3	mapflag	nobranch
-new_3-4	mapflag	nobranch
-new_4-1	mapflag	nobranch
-new_4-2	mapflag	nobranch
-new_4-3	mapflag	nobranch
-new_4-4	mapflag	nobranch
-new_5-1	mapflag	nobranch
-new_5-2	mapflag	nobranch
-new_5-3	mapflag	nobranch
-new_5-4	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
-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
-cave	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
-//aru_gld
-arug_cas01	mapflag	nobranch
-arug_cas02	mapflag	nobranch
-arug_cas03	mapflag	nobranch
-arug_cas04	mapflag	nobranch
-arug_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_n_room	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
-
-//Aldebaran Turbo Track ========
-turbo_room	mapflag	nobranch
-turbo_n_1	mapflag	nobranch
-turbo_n_4	mapflag	nobranch
-turbo_n_8	mapflag	nobranch
-turbo_n_16	mapflag	nobranch
-turbo_e_4	mapflag	nobranch
-turbo_e_8	mapflag	nobranch
-turbo_e_16	mapflag	nobranch
-
-// Monster Races ===============
-p_track01	mapflag	nobranch
-p_track02	mapflag	nobranch
-
-// Vision of Okolnir ===========
-que_qsch01	mapflag	nobranch
-que_qsch02	mapflag	nobranch
-que_qsch03	mapflag	nobranch
-que_qsch04	mapflag	nobranch
-que_qsch05	mapflag	nobranch
-que_qaru01	mapflag	nobranch
-que_qaru02	mapflag	nobranch
-que_qaru03	mapflag	nobranch
-que_qaru04	mapflag	nobranch
-que_qaru05	mapflag	nobranch
-
-// Episode 12 ===========
-e_tower	mapflag	nobranch
-
-// Episode 13.1 ===========
-mid_camp	mapflag	nobranch
-mid_campin	mapflag	nobranch
-man_fild01	mapflag	nobranch
-moc_fild22b	mapflag	nobranch
-que_dan01	mapflag	nobranch
-que_dan02	mapflag	nobranch
-schg_que01	mapflag	nobranch
-arug_que01	mapflag	nobranch
-
-// Battle Grounds ==============
-bat_c01	mapflag	nobranch
-bat_c02	mapflag	nobranch
-bat_c03	mapflag	nobranch
-bat_room	mapflag	nobranch
-bat_b01	mapflag	nobranch
-bat_b02	mapflag	nobranch
-bat_a01	mapflag	nobranch
-bat_a02	mapflag	nobranch
-
-// Episode 13.2 ===========
-manuk	mapflag	nobranch
-man_fild02	mapflag	nobranch
-man_in01	mapflag	nobranch
-splendide	mapflag	nobranch
-spl_in01	mapflag	nobranch
-spl_in02	mapflag	nobranch
-
-// 3rd Class Job Maps & Paradise ===========
-moc_para01	mapflag	nobranch
-job3_arch01	mapflag	nobranch
-job3_arch02	mapflag	nobranch
-job3_arch03	mapflag	nobranch
-job3_guil01	mapflag	nobranch
-job3_guil02	mapflag	nobranch
-job3_guil03	mapflag	nobranch
-job3_rang01	mapflag	nobranch
-job3_rang02	mapflag	nobranch
-job3_rune01	mapflag	nobranch
-job3_rune02	mapflag	nobranch
-job3_rune03	mapflag	nobranch
-job3_war01	mapflag	nobranch
-job3_war02	mapflag	nobranch
-jupe_core2	mapflag	nobranch
-
-// Brasilis ===========
-brasilis	mapflag	nobranch
-bra_in01	mapflag	nobranch
-
-// Episode 13.3 ===========
-dicastes01	mapflag	nobranch
-dicastes02	mapflag	nobranch
-dic_in01	mapflag	nobranch
-s_atelier	mapflag	nobranch
-
-// Episode 14.1 & Dewata ===========
-mora	mapflag	nobranch
-dewata	mapflag	nobranch
-dew_in01	mapflag	nobranch
-
-// Episode Zero & Malaya Port ===========
-malangdo	mapflag	nobranch
-mal_in01	mapflag	nobranch
-mal_in02	mapflag	nobranch
-malaya	mapflag	nobranch
-ma_scene01	mapflag	nobranch
-ma_in01	mapflag	nobranch
-
-// Episode 14.2 ===========
-eclage	mapflag	nobranch
-ecl_in01	mapflag	nobranch
-ecl_in02	mapflag	nobranch
-ecl_in03	mapflag	nobranch
-ecl_in04	mapflag	nobranch
-ecl_hub01	mapflag	nobranch
-
-// Episode 14.3 ===========
-c_tower2_	mapflag	nobranch
-c_tower3_	mapflag	nobranch
-gl_chyard_	mapflag	nobranch
-gl_cas02_	mapflag	nobranch
-
-//evt_zombie	mapflag	nobranch
-
-// Poring War ==================
-poring_w01	mapflag	nobranch
-poring_w02	mapflag	nobranch
diff --git a/npc/mapflag/noexp.txt b/npc/mapflag/noexp.txt
deleted file mode 100644
index 66863f0bd..000000000
--- a/npc/mapflag/noexp.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Lorky
-//= Copyright (C)  massdriller
-//= Copyright (C)  Lupus
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable EXP gain.
-//================= Current Version =======================================
-//= 1.7
-//================= Description ===========================================
-//= Same as 'nobaseexp' and 'nojobexp' combined.
-//=========================================================================
-
-// Job 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
-
-// Misc Quests =======================
-// mosk_ship	mapflag	noexp
diff --git a/npc/mapflag/noicewall.txt b/npc/mapflag/noicewall.txt
deleted file mode 100644
index 195bec2bb..000000000
--- a/npc/mapflag/noicewall.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Lupus
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable Ice Wall.
-//================= Current Version =======================================
-//= 1.8
-//================= Description ===========================================
-//= Blocks usage of WZ_ICEWALL.
-//=========================================================================
-
-//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
-arug_cas01	mapflag	noicewall
-arug_cas02	mapflag	noicewall
-arug_cas03	mapflag	noicewall
-arug_cas04	mapflag	noicewall
-arug_cas05	mapflag	noicewall
-// Novice Guild Castles ===
-nguild_alde	mapflag	noicewall
-nguild_gef	mapflag	noicewall
-nguild_pay	mapflag	noicewall
-nguild_prt	mapflag	noicewall
-
-// Poring War ====================
-poring_w01	mapflag	noicewall
-poring_w02	mapflag	noicewall
diff --git a/npc/mapflag/noloot.txt b/npc/mapflag/noloot.txt
deleted file mode 100644
index d3895ce79..000000000
--- a/npc/mapflag/noloot.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Epoque
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable monster drops.
-//================= Current Version =======================================
-//= 1.0a
-//================= Description ===========================================
-//= Same as 'nomobloot' and 'nomvploot' combined.
-//=========================================================================
-
-//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
-//job_thief1	mapflag	noloot
diff --git a/npc/mapflag/nomemo.txt b/npc/mapflag/nomemo.txt
deleted file mode 100644
index 662bf4c05..000000000
--- a/npc/mapflag/nomemo.txt
+++ /dev/null
@@ -1,785 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2016  Hercules Dev Team
-//= Copyright (C)  Epoque
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  Gepard
-//= Copyright (C)  Yommy
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nova
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable Warp Portal memory.
-//================= Current Version =======================================
-//= 1.8.3
-//================= Description ===========================================
-//= Prevents players from using /memo on a map.
-//= Also disables marriage warp skills.
-//=========================================================================
-
-// 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
-new_1-1	mapflag	nomemo
-new_1-2	mapflag	nomemo
-new_1-3	mapflag	nomemo
-new_1-4	mapflag	nomemo
-new_2-1	mapflag	nomemo
-new_2-2	mapflag	nomemo
-new_2-3	mapflag	nomemo
-new_2-4	mapflag	nomemo
-new_3-1	mapflag	nomemo
-new_3-2	mapflag	nomemo
-new_3-3	mapflag	nomemo
-new_3-4	mapflag	nomemo
-new_4-1	mapflag	nomemo
-new_4-2	mapflag	nomemo
-new_4-3	mapflag	nomemo
-new_4-4	mapflag	nomemo
-new_5-1	mapflag	nomemo
-new_5-2	mapflag	nomemo
-new_5-3	mapflag	nomemo
-new_5-4	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
-ra_in01	mapflag	nomemo
-ra_temin	mapflag	nomemo
-ra_temsky	mapflag	nomemo
-ve_in	mapflag	nomemo
-ve_in02	mapflag	nomemo
-thor_camp	mapflag	nomemo
-moc_para01	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
-moc_fild20	mapflag	nomemo
-moc_fild21	mapflag	nomemo
-moc_fild22	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
-cave	mapflag	nomemo
-
-// Job Quests ================
-// First Job Class
-job_sword1	mapflag	nomemo
-job_thief1	mapflag	nomemo
-job_star	mapflag	nomemo
-// Primary Second Job Class
-job_knt	mapflag	nomemo
-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
-// Anthell -------------------
-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 Pit) ------
-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_i	mapflag	nomemo
-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
-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
-arug_cas01	mapflag	nomemo
-arug_cas02	mapflag	nomemo
-arug_cas03	mapflag	nomemo
-arug_cas04	mapflag	nomemo
-arug_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
-force_2-1	mapflag	nomemo
-force_3-1	mapflag	nomemo
-force_4-1	mapflag	nomemo
-force_5-1	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_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
-
-//Aldebaran Turbo Track
-turbo_room	mapflag	nomemo
-turbo_n_1	mapflag	nomemo
-turbo_n_4	mapflag	nomemo
-turbo_n_8	mapflag	nomemo
-turbo_n_16	mapflag	nomemo
-turbo_e_4	mapflag	nomemo
-turbo_e_8	mapflag	nomemo
-turbo_e_16	mapflag	nomemo
-
-//Monster Races ================
-p_track01	mapflag	nomemo
-p_track02	mapflag	nomemo
-
-//Vision of Okolnir ==========
-que_qsch01	mapflag	nomemo
-que_qsch02	mapflag	nomemo
-que_qsch03	mapflag	nomemo
-que_qsch04	mapflag	nomemo
-que_qsch05	mapflag	nomemo
-que_qaru01	mapflag	nomemo
-que_qaru02	mapflag	nomemo
-que_qaru03	mapflag	nomemo
-que_qaru04	mapflag	nomemo
-que_qaru05	mapflag	nomemo
-
-//Endless Tower ==================
-e_tower	mapflag	nomemo
-
-// Battle Grounds ================
-bat_c01	mapflag	nomemo
-bat_c02	mapflag	nomemo
-bat_c03	mapflag	nomemo
-bat_room	mapflag	nomemo
-bat_b01	mapflag	nomemo
-bat_b02	mapflag	nomemo
-bat_a01	mapflag	nomemo
-bat_a02	mapflag	nomemo
-
-// Episode 13 ====================
-mid_campin	mapflag	nomemo
-man_fild01	mapflag	nomemo
-man_fild03	mapflag	nomemo
-spl_fild02	mapflag	nomemo
-spl_fild03	mapflag	nomemo
-moc_fild22b	mapflag	nomemo
-que_dan01	mapflag	nomemo
-que_dan02	mapflag	nomemo
-schg_que01	mapflag	nomemo
-schg_dun01	mapflag	nomemo
-arug_que01	mapflag	nomemo
-arug_dun01	mapflag	nomemo
-nyd_dun01	mapflag	nomemo
-nyd_dun02	mapflag	nomemo
-manuk	mapflag	nomemo
-man_fild02	mapflag	nomemo
-man_in01	mapflag	nomemo
-splendide	mapflag	nomemo
-spl_fild01	mapflag	nomemo
-spl_in01	mapflag	nomemo
-job3_arch01	mapflag	nomemo
-job3_arch02	mapflag	nomemo
-job3_arch03	mapflag	nomemo
-job3_guil01	mapflag	nomemo
-job3_guil02	mapflag	nomemo
-job3_guil03	mapflag	nomemo
-job3_rang01	mapflag	nomemo
-job3_rang02	mapflag	nomemo
-job3_rune01	mapflag	nomemo
-job3_rune02	mapflag	nomemo
-job3_rune03	mapflag	nomemo
-job3_war01	mapflag	nomemo
-job3_war02	mapflag	nomemo
-job3_gen01	mapflag	nomemo
-job3_sha01	mapflag	nomemo
-jupe_core2	mapflag	nomemo
-s_atelier	mapflag	nomemo
-bra_in01	mapflag	nomemo
-bra_dun01	mapflag	nomemo
-bra_dun02	mapflag	nomemo
-dicastes01	mapflag	nomemo
-dicastes02	mapflag	nomemo
-dic_in01	mapflag	nomemo
-dic_fild01	mapflag	nomemo
-dic_fild02	mapflag	nomemo
-dic_dun01	mapflag	nomemo
-dic_dun02	mapflag	nomemo
-
-// Episode 14 ====================
-bif_fild01	mapflag	nomemo
-bif_fild02	mapflag	nomemo
-mora	mapflag	nomemo
-dew_dun01	mapflag	nomemo
-dew_dun02	mapflag	nomemo
-dew_in01	mapflag	nomemo
-dic_dun03	mapflag	nomemo
-mal_in01	mapflag	nomemo
-mal_in02	mapflag	nomemo
-mal_dun01	mapflag	nomemo
-iz_dun05	mapflag	nomemo
-lhz_dun04	mapflag	nomemo
-que_lhz	mapflag	nomemo
-gld_dun01_2	mapflag	nomemo
-gld_dun02_2	mapflag	nomemo
-gld_dun03_2	mapflag	nomemo
-gld_dun04_2	mapflag	nomemo
-gld2_ald	mapflag	nomemo
-gld2_gef	mapflag	nomemo
-gld2_pay	mapflag	nomemo
-gld2_prt	mapflag	nomemo
-ma_scene01	mapflag	nomemo
-ma_in01	mapflag	nomemo
-ma_dun01	mapflag	nomemo
-ma_zif01	mapflag	nomemo
-ma_zif02	mapflag	nomemo
-ma_zif03	mapflag	nomemo
-ma_zif04	mapflag	nomemo
-ma_zif05	mapflag	nomemo
-ma_zif06	mapflag	nomemo
-ma_zif07	mapflag	nomemo
-ma_zif08	mapflag	nomemo
-ma_zif09	mapflag	nomemo
-eclage	mapflag	nomemo
-ecl_fild01	mapflag	nomemo
-ecl_in01	mapflag	nomemo
-ecl_in02	mapflag	nomemo
-ecl_in03	mapflag	nomemo
-ecl_in04	mapflag	nomemo
-ecl_tdun01	mapflag	nomemo
-ecl_tdun02	mapflag	nomemo
-ecl_tdun03	mapflag	nomemo
-ecl_tdun04	mapflag	nomemo
-ecl_hub01	mapflag	nomemo
-moc_prydn1	mapflag	nomemo
-moc_prydn2	mapflag	nomemo
-dali	mapflag	nomemo
-dali02	mapflag	nomemo
-c_tower2_	mapflag	nomemo
-c_tower3_	mapflag	nomemo
-gl_chyard_	mapflag	nomemo
-gl_cas02_	mapflag	nomemo
-
-//evt_zombie	mapflag	nomemo
-
-// Poring War ====================
-poring_w01	mapflag	nomemo
-poring_w02	mapflag	nomemo
-
-// Bossnia (custom) ==============
-bossnia_01	mapflag	nomemo
-bossnia_02	mapflag	nomemo
-bossnia_03	mapflag	nomemo
-bossnia_04	mapflag	nomemo
diff --git a/npc/mapflag/nopenalty.txt b/npc/mapflag/nopenalty.txt
deleted file mode 100644
index 583730f16..000000000
--- a/npc/mapflag/nopenalty.txt
+++ /dev/null
@@ -1,341 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Epoque
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Lupus
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable death penalty.
-//================= Current Version =======================================
-//= 1.4
-//================= Description ===========================================
-//= Same as 'noexppenalty' and 'nozenypenalty' combined.
-//=========================================================================
-
-// 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
-new_1-1	mapflag	nopenalty
-new_1-2	mapflag	nopenalty
-new_1-3	mapflag	nopenalty
-new_1-4	mapflag	nopenalty
-new_2-1	mapflag	nopenalty
-new_2-2	mapflag	nopenalty
-new_2-3	mapflag	nopenalty
-new_2-4	mapflag	nopenalty
-new_3-1	mapflag	nopenalty
-new_3-2	mapflag	nopenalty
-new_3-3	mapflag	nopenalty
-new_3-4	mapflag	nopenalty
-new_4-1	mapflag	nopenalty
-new_4-2	mapflag	nopenalty
-new_4-3	mapflag	nopenalty
-new_4-4	mapflag	nopenalty
-new_5-1	mapflag	nopenalty
-new_5-2	mapflag	nopenalty
-new_5-3	mapflag	nopenalty
-new_5-4	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
-moc_para01	mapflag	nopenalty
-mid_camp	mapflag	nopenalty
-mid_campin	mapflag	nopenalty
-moc_fild22b	mapflag	nopenalty
-manuk	mapflag	nopenalty
-man_in01	mapflag	nopenalty
-splendide	mapflag	nopenalty
-spl_in01	mapflag	nopenalty
-spl_in02	mapflag	nopenalty
-brasilis	mapflag	nopenalty
-bra_in01	mapflag	nopenalty
-dicastes01	mapflag	nopenalty
-dicastes02	mapflag	nopenalty
-dic_in01	mapflag	nopenalty
-s_atelier	mapflag	nopenalty
-mora	mapflag	nopenalty
-dewata	mapflag	nopenalty
-dew_in01	mapflag	nopenalty
-malangdo	mapflag	nopenalty
-mal_in01	mapflag	nopenalty
-mal_in02	mapflag	nopenalty
-malaya	mapflag	nopenalty
-ma_scene01	mapflag	nopenalty
-ma_in01	mapflag	nopenalty
-ma_zif01	mapflag	nopenalty
-ma_zif02	mapflag	nopenalty
-ma_zif03	mapflag	nopenalty
-ma_zif04	mapflag	nopenalty
-ma_zif05	mapflag	nopenalty
-ma_zif06	mapflag	nopenalty
-ma_zif07	mapflag	nopenalty
-ma_zif08	mapflag	nopenalty
-ma_zif09	mapflag	nopenalty
-eclage	mapflag	nopenalty
-ecl_in01	mapflag	nopenalty
-ecl_in02	mapflag	nopenalty
-ecl_in03	mapflag	nopenalty
-ecl_in04	mapflag	nopenalty
-ecl_hub01	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
-// 3-1 --------------------
-job3_arch01	mapflag	nopenalty
-job3_arch02	mapflag	nopenalty
-job3_arch03	mapflag	nopenalty
-job3_guil01	mapflag	nopenalty
-job3_guil02	mapflag	nopenalty
-job3_guil03	mapflag	nopenalty
-job3_rang01	mapflag	nopenalty
-job3_rang02	mapflag	nopenalty
-job3_rune01	mapflag	nopenalty
-job3_rune02	mapflag	nopenalty
-job3_rune03	mapflag	nopenalty
-job3_war01	mapflag	nopenalty
-job3_war02	mapflag	nopenalty
-// 3-2 --------------------
-job3_gen01	mapflag	nopenalty
-// Ext --------------------
-job3_sha01	mapflag	nopenalty
-job_ko	mapflag	nopenalty
-
-// Misc Quests =======================
-mosk_ship	mapflag	nopenalty
-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_2vs2	mapflag	nopenalty
-
-//Aldebaran Turbo Track
-turbo_room	mapflag	nopenalty
-turbo_n_1	mapflag	nopenalty
-turbo_n_4	mapflag	nopenalty
-turbo_n_8	mapflag	nopenalty
-turbo_n_16	mapflag	nopenalty
-turbo_e_4	mapflag	nopenalty
-turbo_e_8	mapflag	nopenalty
-turbo_e_16	mapflag	nopenalty
-
-//Monster Races ================
-p_track01	mapflag	nopenalty
-p_track02	mapflag	nopenalty
-
-//Vision of Okolnir =============
-que_qsch01	mapflag	nopenalty
-que_qsch02	mapflag	nopenalty
-que_qsch03	mapflag	nopenalty
-que_qsch04	mapflag	nopenalty
-que_qsch05	mapflag	nopenalty
-que_qaru01	mapflag	nopenalty
-que_qaru02	mapflag	nopenalty
-que_qaru03	mapflag	nopenalty
-que_qaru04	mapflag	nopenalty
-que_qaru05	mapflag	nopenalty
-
-// Battle Grounds ==============
-bat_c01	mapflag	nopenalty
-bat_c02	mapflag	nopenalty
-bat_c03	mapflag	nopenalty
-bat_room	mapflag	nopenalty
-bat_b01	mapflag	nopenalty
-bat_b02	mapflag	nopenalty
-bat_a01	mapflag	nopenalty
-bat_a02	mapflag	nopenalty
-
-//evt_zombie	mapflag	nopenalty
-
-// Poring War ==================
-poring_w02	mapflag	nopenalty
diff --git a/npc/mapflag/nopvp.txt b/npc/mapflag/nopvp.txt
deleted file mode 100644
index 41127332b..000000000
--- a/npc/mapflag/nopvp.txt
+++ /dev/null
@@ -1,177 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable Player versus Player mode.
-//================= Current Version =======================================
-//= 1.1a
-//================= Description ===========================================
-//= Prevents PvP mode on a map.
-//=========================================================================
-
-bat_a01	mapflag	pvp	off
-bat_a02	mapflag	pvp	off
-bat_b01	mapflag	pvp	off
-bat_b02	mapflag	pvp	off
-bat_c01	mapflag	pvp	off
-bat_c02	mapflag	pvp	off
-bat_c03	mapflag	pvp	off
-
-guild_vs1	mapflag	pvp	off
-guild_vs2	mapflag	pvp	off
-guild_vs3	mapflag	pvp	off
-guild_vs4	mapflag	pvp	off
-guild_vs5	mapflag	pvp	off
-
-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
-veins	mapflag	pvp	off
-ve_in	mapflag	pvp	off
-ve_in02	mapflag	pvp	off
-cave	mapflag	pvp	off
-
-e_tower	mapflag	pvp	off
-
-mid_camp	mapflag	pvp	off
-mid_campin	mapflag	pvp	off
-man_fild01	mapflag	pvp	off
-moc_fild22b	mapflag	pvp	off
-que_dan01	mapflag	pvp	off
-que_dan02	mapflag	pvp	off
-schg_que01	mapflag	pvp	off
-arug_que01	mapflag	pvp	off
-
-bat_room	mapflag	pvp	off
-
-manuk	mapflag	pvp	off
-man_in01	mapflag	pvp	off
-splendide	mapflag	pvp	off
-spl_in01	mapflag	pvp	off
-spl_in02	mapflag	pvp	off
-
-moc_para01	mapflag	pvp	off
-
-brasilis	mapflag	pvp	off
-bra_in01	mapflag	pvp	off
-
-dicastes01	mapflag	pvp	off
-dicastes02	mapflag	pvp	off
-dic_in01	mapflag	pvp	off
-
-s_atelier	mapflag	pvp	off
-
-mora	mapflag	pvp	off
-
-dewata	mapflag	pvp	off
-dew_in01	mapflag	pvp	off
-
-malangdo	mapflag	pvp	off
-mal_in01	mapflag	pvp	off
-mal_in02	mapflag	pvp	off
-
-malaya	mapflag	pvp	off
-ma_scene01	mapflag	pvp	off
-ma_in01	mapflag	pvp	off
-
-eclage	mapflag	pvp	off
-ecl_in01	mapflag	pvp	off
-ecl_in02	mapflag	pvp	off
-ecl_in03	mapflag	pvp	off
-ecl_in04	mapflag	pvp	off
-ecl_hub01	mapflag	pvp	off
-
-//evt_zombie	mapflag	pvp	off
diff --git a/npc/mapflag/noreturn.txt b/npc/mapflag/noreturn.txt
deleted file mode 100644
index a606926c3..000000000
--- a/npc/mapflag/noreturn.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//= Copyright (C)  Samuray22
-//= Copyright (C)  Skotlex
-//= Copyright (C)  Lupus
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable return warp.
-//================= Current Version =======================================
-//= 1.6
-//================= Description ===========================================
-//= Disables the following items:
-//=   Butterfly Wing (602), Siege Teleport Scroll (14591),
-//=   Yellow/Green/Red/Blue Butterfly Wings (14582-14585),
-//=   Dungeon Teleport Scrolls (14527/14581)
-//= Also restricts "warpparty" and "warpguild" script commands.
-//=========================================================================
-
-// 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_knt	mapflag	noreturn
-//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
-
-// Battle Grounds ==============
-bat_c01	mapflag	noreturn
-bat_c02	mapflag	noreturn
-bat_c03	mapflag	noreturn
-bat_b01	mapflag	noreturn
-bat_b02	mapflag	noreturn
-bat_a01	mapflag	noreturn
-bat_a02	mapflag	noreturn
-
-//evt_zombie	mapflag	noreturn
diff --git a/npc/mapflag/nosave.txt b/npc/mapflag/nosave.txt
deleted file mode 100644
index 8137e500b..000000000
--- a/npc/mapflag/nosave.txt
+++ /dev/null
@@ -1,312 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  Lupus
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable auto-save.
-//================= Current Version =======================================
-//= 1.7
-//================= Description ===========================================
-//= Characters logging out on the specified map will be warped
-//= to the map specified in the last field, or "SavePoint".
-//=========================================================================
-
-// 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
-in_rogue	mapflag	nosave	SavePoint
-job_sage	mapflag	nosave	SavePoint
-// Ext
-job_star	mapflag	nosave	SavePoint
-job_soul	mapflag	nosave	SavePoint
-job3_sha01	mapflag	nosave	SavePoint
-job_ko	mapflag	nosave	SavePoint
-// 3-1
-job3_arch01	mapflag	nosave	SavePoint
-job3_arch02	mapflag	nosave	SavePoint
-job3_arch03	mapflag	nosave	SavePoint
-job3_guil01	mapflag	nosave	SavePoint
-job3_guil02	mapflag	nosave	SavePoint
-job3_guil03	mapflag	nosave	SavePoint
-job3_rang01	mapflag	nosave	SavePoint
-job3_rang02	mapflag	nosave	SavePoint
-job3_rune01	mapflag	nosave	SavePoint
-job3_rune02	mapflag	nosave	SavePoint
-job3_rune03	mapflag	nosave	SavePoint
-job3_war01	mapflag	nosave	SavePoint
-job3_war02	mapflag	nosave	SavePoint
-// 3-2
-job3_gen01	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
-force_4-1	mapflag	nosave	SavePoint
-force_5-1	mapflag	nosave	SavePoint
-prt_are_in	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
-arug_cas01	mapflag	nosave	SavePoint
-arug_cas02	mapflag	nosave	SavePoint
-arug_cas03	mapflag	nosave	SavePoint
-arug_cas04	mapflag	nosave	SavePoint
-arug_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
-gld_dun01_2	mapflag	nosave	SavePoint
-gld_dun02_2	mapflag	nosave	SavePoint
-gld_dun03_2	mapflag	nosave	SavePoint
-gld_dun04_2	mapflag	nosave	SavePoint
-gld2_ald	mapflag	nosave	SavePoint
-gld2_gef	mapflag	nosave	SavePoint
-gld2_pay	mapflag	nosave	SavePoint
-gld2_prt	mapflag	nosave	SavePoint
-
-//Normal Maps =================================
-yggdrasil01	mapflag	nosave	SavePoint
-thana_boss	mapflag	nosave	SavePoint
-
-//Aldebaran Turbo Track
-turbo_n_1	mapflag	nosave	SavePoint
-turbo_n_4	mapflag	nosave	SavePoint
-turbo_n_8	mapflag	nosave	SavePoint
-turbo_n_16	mapflag	nosave	SavePoint
-turbo_e_4	mapflag	nosave	SavePoint
-turbo_e_8	mapflag	nosave	SavePoint
-turbo_e_16	mapflag	nosave	SavePoint
-
-//Monster Races ================
-p_track01	mapflag	nosave	SavePoint
-p_track02	mapflag	nosave	SavePoint
-
-//Vision of Okolnir ===========================
-que_qsch01	mapflag	nosave	SavePoint
-que_qsch02	mapflag	nosave	SavePoint
-que_qsch03	mapflag	nosave	SavePoint
-que_qsch04	mapflag	nosave	SavePoint
-que_qsch05	mapflag	nosave	SavePoint
-que_qaru01	mapflag	nosave	SavePoint
-que_qaru02	mapflag	nosave	SavePoint
-que_qaru03	mapflag	nosave	SavePoint
-que_qaru04	mapflag	nosave	SavePoint
-que_qaru05	mapflag	nosave	SavePoint
-
-// Endless Tower ==================
-e_tower	mapflag	nosave	SavePoint
-
-// Battle Grounds ==============
-bat_c01	mapflag	nosave	SavePoint
-bat_c02	mapflag	nosave	SavePoint
-bat_c03	mapflag	nosave	SavePoint
-bat_b01	mapflag	nosave	SavePoint
-bat_b02	mapflag	nosave	SavePoint
-bat_a01	mapflag	nosave	SavePoint
-bat_a02	mapflag	nosave	SavePoint
-
-// Episode 13 ====================
-moc_fild22b	mapflag	nosave	SavePoint
-que_dan01	mapflag	nosave	SavePoint
-que_dan02	mapflag	nosave	SavePoint
-schg_que01	mapflag	nosave	SavePoint
-schg_dun01	mapflag	nosave	SavePoint
-arug_que01	mapflag	nosave	SavePoint
-arug_dun01	mapflag	nosave	SavePoint
-
-// Somatology Laboratory ===========
-que_lhz	mapflag	nosave	SavePoint
-
-//evt_zombie	mapflag	nosave	SavePoint
-
-// Poring War ====================
-poring_w01	mapflag	nosave	SavePoint
-poring_w02	mapflag	nosave	SavePoint
diff --git a/npc/mapflag/noskill.txt b/npc/mapflag/noskill.txt
deleted file mode 100644
index ae492def1..000000000
--- a/npc/mapflag/noskill.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  L0ne_W0lf
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable skill use.
-//================= Current Version =======================================
-//= 1.1
-//================= Description ===========================================
-//= Disables all skills on the map.
-//=========================================================================
-
-//Prontera Arena ===============
-prt_are_in	mapflag	noskill
-
-//The Sign Quest ===============
-himinn	mapflag	noskill
-
-// Quiz Maps ===================
-quiz_00	mapflag	noskill
-quiz_01	mapflag	noskill
-quiz_02	mapflag	noskill
-quiz_test	mapflag	noskill
-
-//Hugel Minigames ==============
-que_bingo	mapflag	noskill
-p_track01	mapflag	noskill
-p_track02	mapflag	noskill
-
-//evt_zombie	mapflag	noskill
diff --git a/npc/mapflag/noteleport.txt b/npc/mapflag/noteleport.txt
deleted file mode 100644
index b80498f89..000000000
--- a/npc/mapflag/noteleport.txt
+++ /dev/null
@@ -1,431 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//= Copyright (C)  Lupus
-//= Copyright (C)  Nova
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable teleportation.
-//================= Current Version =======================================
-//= 1.6.2
-//================= Description ===========================================
-//= Disables all means of teleportation within a map.
-//= Script commands 'warp', 'areawarp', 'warpchar',
-//=   'warpparty', 'warpguild', 'warpwaitingpc' will not
-//=   work with "Random" destination.
-//= Disables skills AL_TELEPORT and TK_HIGHJUMP.
-//= Disables the following items:
-//=   Fly Wing (601), Giant Fly Wing (12212)
-//=========================================================================
-
-// 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
-new_1-1	mapflag	noteleport
-new_1-2	mapflag	noteleport
-new_1-3	mapflag	noteleport
-new_1-4	mapflag	noteleport
-new_2-1	mapflag	noteleport
-new_2-2	mapflag	noteleport
-new_2-3	mapflag	noteleport
-new_2-4	mapflag	noteleport
-new_3-1	mapflag	noteleport
-new_3-2	mapflag	noteleport
-new_3-3	mapflag	noteleport
-new_3-4	mapflag	noteleport
-new_4-1	mapflag	noteleport
-new_4-2	mapflag	noteleport
-new_4-3	mapflag	noteleport
-new_4-4	mapflag	noteleport
-new_5-1	mapflag	noteleport
-new_5-2	mapflag	noteleport
-new_5-3	mapflag	noteleport
-new_5-4	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
-ve_in	mapflag	noteleport
-ve_in02	mapflag	noteleport
-thor_camp	mapflag	noteleport
-moc_para01	mapflag	noteleport
-
-// Job Quests ====================
-pay_arche	mapflag	noteleport
-job_sword1	mapflag	noteleport
-job_thief1	mapflag	noteleport
-// 2-1 -----------------------
-job_knt	mapflag	noteleport
-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
-cave	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
-arug_cas01	mapflag	noteleport
-arug_cas02	mapflag	noteleport
-arug_cas03	mapflag	noteleport
-arug_cas04	mapflag	noteleport
-arug_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
-force_1-1	mapflag	noteleport
-force_2-1	mapflag	noteleport
-force_3-1	mapflag	noteleport
-force_4-1	mapflag	noteleport
-force_5-1	mapflag	noteleport
-force_1-2	mapflag	noteleport
-force_1-3	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
-
-//Aldebaran Turbo Track ==========
-turbo_room	mapflag	noteleport
-turbo_n_1	mapflag	noteleport
-turbo_n_4	mapflag	noteleport
-turbo_n_8	mapflag	noteleport
-turbo_n_16	mapflag	noteleport
-turbo_e_4	mapflag	noteleport
-turbo_e_8	mapflag	noteleport
-turbo_e_16	mapflag	noteleport
-
-//Monster Races ================
-p_track01	mapflag	noteleport
-p_track02	mapflag	noteleport
-
-//Vision of Okolnir ==============
-que_qsch01	mapflag	noteleport
-que_qsch01	mapflag	monster_noteleport
-que_qsch02	mapflag	noteleport
-que_qsch02	mapflag	monster_noteleport
-que_qsch03	mapflag	noteleport
-que_qsch03	mapflag	monster_noteleport
-que_qsch04	mapflag	noteleport
-que_qsch04	mapflag	monster_noteleport
-que_qsch05	mapflag	noteleport
-que_qsch05	mapflag	monster_noteleport
-que_qaru01	mapflag	noteleport
-que_qaru01	mapflag	monster_noteleport
-que_qaru02	mapflag	noteleport
-que_qaru02	mapflag	monster_noteleport
-que_qaru03	mapflag	noteleport
-que_qaru03	mapflag	monster_noteleport
-que_qaru04	mapflag	noteleport
-que_qaru04	mapflag	monster_noteleport
-que_qaru05	mapflag	noteleport
-que_qaru05	mapflag	monster_noteleport
-
-//Endless Tower ==================
-e_tower	mapflag	noteleport
-
-// Battle Grounds ==============
-bat_c01	mapflag	noteleport
-bat_c02	mapflag	noteleport
-bat_c03	mapflag	noteleport
-bat_room	mapflag	noteleport
-bat_b01	mapflag	noteleport
-bat_b02	mapflag	noteleport
-bat_a01	mapflag	noteleport
-bat_a02	mapflag	noteleport
-
-// Episode 13 ====================
-mid_campin	mapflag	noteleport
-moc_fild22b	mapflag	noteleport
-que_dan01	mapflag	noteleport
-que_dan02	mapflag	noteleport
-schg_que01	mapflag	noteleport
-arug_que01	mapflag	noteleport
-man_in01	mapflag	noteleport
-spl_in01	mapflag	noteleport
-s_atelier	mapflag	noteleport
-bra_in01	mapflag	noteleport
-dic_in01	mapflag	noteleport
-
-// Episode 14 ====================
-dew_in01	mapflag	noteleport
-mal_in01	mapflag	noteleport
-mal_in02	mapflag	noteleport
-que_lhz	mapflag	noteleport
-que_lhz	mapflag	monster_noteleport
-ma_scene01	mapflag	noteleport
-ma_in01	mapflag	noteleport
-ma_zif01	mapflag	noteleport
-ma_zif02	mapflag	noteleport
-ma_zif03	mapflag	noteleport
-ma_zif04	mapflag	noteleport
-ma_zif05	mapflag	noteleport
-ma_zif06	mapflag	noteleport
-ma_zif07	mapflag	noteleport
-ma_zif08	mapflag	noteleport
-ma_zif09	mapflag	noteleport
-ecl_in01	mapflag	noteleport
-ecl_in02	mapflag	noteleport
-ecl_in03	mapflag	noteleport
-ecl_in04	mapflag	noteleport
-ecl_hub01	mapflag	noteleport
-dali	mapflag	noteleport
-dali02	mapflag	noteleport
-
-// Yggdrasil Dungeon =============
-nyd_dun02	mapflag	noteleport
-
-//evt_zombie	mapflag	noteleport
-
-// Poring War ====================
-poring_w01	mapflag	noteleport
-poring_w02	mapflag	noteleport
-poring_w02	mapflag	monster_noteleport
diff --git a/npc/mapflag/notomb.txt b/npc/mapflag/notomb.txt
deleted file mode 100644
index a56f60112..000000000
--- a/npc/mapflag/notomb.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  CairoLee
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable MVP Tomb.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= Disables MVP tomb on some maps.
-//=========================================================================
-
-// Bossnia =====
-bossnia_01	mapflag	notomb
-bossnia_02	mapflag	notomb
-bossnia_03	mapflag	notomb
-bossnia_04	mapflag	notomb
diff --git a/npc/mapflag/novending.txt b/npc/mapflag/novending.txt
deleted file mode 100644
index 0047b0cb1..000000000
--- a/npc/mapflag/novending.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Epoque
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable vending.
-//================= Current Version =======================================
-//= 1.0a
-//================= Description ===========================================
-//= Disables skill MC_VENDING on a map.
-//=========================================================================
-
-//prontera	mapflag	novending
-//prt_in	mapflag	novending
diff --git a/npc/mapflag/nowarp.txt b/npc/mapflag/nowarp.txt
deleted file mode 100644
index 4682f1d8d..000000000
--- a/npc/mapflag/nowarp.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable warping.
-//================= Current Version =======================================
-//= 1.3
-//================= Description ===========================================
-//= Disables use of @go to a map.
-//=========================================================================
-
-// 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
-arug_cas01	mapflag	nowarp
-arug_cas02	mapflag	nowarp
-arug_cas03	mapflag	nowarp
-arug_cas04	mapflag	nowarp
-arug_cas05	mapflag	nowarp
-n_castle	mapflag	nowarp
-nguild_alde	mapflag	nowarp
-nguild_gef	mapflag	nowarp
-nguild_pay	mapflag	nowarp
-nguild_prt	mapflag	nowarp
-//Aldebaran Turbo Track ======
-turbo_n_1	mapflag	nowarp
-turbo_n_4	mapflag	nowarp
-turbo_n_8	mapflag	nowarp
-turbo_n_16	mapflag	nowarp
-turbo_e_4	mapflag	nowarp
-turbo_e_8	mapflag	nowarp
-turbo_e_16	mapflag	nowarp
-//Monster Races ================
-p_track01	mapflag	nowarp
-p_track02	mapflag	nowarp
-// Battle Grounds ==============
-bat_c01	mapflag	nowarp
-bat_c02	mapflag	nowarp
-bat_c03	mapflag	nowarp
-bat_b01	mapflag	nowarp
-bat_b02	mapflag	nowarp
-bat_a01	mapflag	nowarp
-bat_a02	mapflag	nowarp
-
-// Poring War ==================
-poring_w01	mapflag	nowarp
-poring_w02	mapflag	nowarp
diff --git a/npc/mapflag/nowarpto.txt b/npc/mapflag/nowarpto.txt
deleted file mode 100644
index 783dc8cc9..000000000
--- a/npc/mapflag/nowarpto.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Disable warpto.
-//================= Current Version =======================================
-//= 1.3
-//================= Description ===========================================
-//= Disables use of @warp to a map.
-//=========================================================================
-
-// 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
-arug_cas01	mapflag	nowarpto
-arug_cas02	mapflag	nowarpto
-arug_cas03	mapflag	nowarpto
-arug_cas04	mapflag	nowarpto
-arug_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
-cave	mapflag	nowarpto
-//Aldebaran Turbo Track ========
-turbo_n_1	mapflag	nowarpto
-turbo_n_4	mapflag	nowarpto
-turbo_n_8	mapflag	nowarpto
-turbo_n_16	mapflag	nowarpto
-turbo_e_4	mapflag	nowarpto
-turbo_e_8	mapflag	nowarpto
-turbo_e_16	mapflag	nowarpto
-// Izlude Battle Arena =========
-force_1-1	mapflag	nowarpto
-force_2-1	mapflag	nowarpto
-force_3-1	mapflag	nowarpto
-force_4-1	mapflag	nowarpto
-force_5-1	mapflag	nowarpto
-force_1-2	mapflag	nowarpto
-force_1-3	mapflag	nowarpto
-prt_are_in	mapflag	nowarpto
-
-//Monster Races ================
-p_track01	mapflag	nowarpto
-p_track02	mapflag	nowarpto
-
-//Vision of Okolnir ============
-que_qsch01	mapflag	nowarpto
-que_qsch02	mapflag	nowarpto
-que_qsch03	mapflag	nowarpto
-que_qsch04	mapflag	nowarpto
-que_qsch05	mapflag	nowarpto
-que_qaru01	mapflag	nowarpto
-que_qaru02	mapflag	nowarpto
-que_qaru03	mapflag	nowarpto
-que_qaru04	mapflag	nowarpto
-que_qaru05	mapflag	nowarpto
-
-//Endless Tower ==================
-e_tower	mapflag	nowarpto
-
-// Battle Grounds ==============
-bat_c01	mapflag	nowarpto
-bat_c02	mapflag	nowarpto
-bat_c03	mapflag	nowarpto
-bat_room	mapflag	nowarpto
-bat_b01	mapflag	nowarpto
-bat_b02	mapflag	nowarpto
-bat_a01	mapflag	nowarpto
-bat_a02	mapflag	nowarpto
-
-// Episode 13 ====================
-mid_campin	mapflag	nowarpto
-man_fild01	mapflag	nowarpto
-man_fild03	mapflag	nowarpto
-spl_fild02	mapflag	nowarpto
-spl_fild03	mapflag	nowarpto
-moc_fild22b	mapflag	nowarpto
-que_dan01	mapflag	nowarpto
-que_dan02	mapflag	nowarpto
-schg_que01	mapflag	nowarpto
-schg_dun01	mapflag	nowarpto
-arug_que01	mapflag	nowarpto
-arug_dun01	mapflag	nowarpto
-nyd_dun01	mapflag	nowarpto
-nyd_dun02	mapflag	nowarpto
-manuk	mapflag	nowarpto
-man_fild02	mapflag	nowarpto
-man_in01	mapflag	nowarpto
-splendide	mapflag	nowarpto
-spl_fild01	mapflag	nowarpto
-spl_in01	mapflag	nowarpto
-
-// Poring War ====================
-poring_w01	mapflag	nowarpto
-poring_w02	mapflag	nowarpto
-
-// Bossnia (custom) ==============
-bossnia_01	mapflag	nowarpto
-bossnia_02	mapflag	nowarpto
-bossnia_03	mapflag	nowarpto
-bossnia_04	mapflag	nowarpto
diff --git a/npc/mapflag/partylock.txt b/npc/mapflag/partylock.txt
deleted file mode 100644
index 1aa9d4991..000000000
--- a/npc/mapflag/partylock.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Party lock.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= Blocks all party modifications on a map:
-//=   /organize, /leave, /invite, @changeleader
-//=========================================================================
diff --git a/npc/mapflag/private_airship.txt b/npc/mapflag/private_airship.txt
deleted file mode 100644
index 4258f486d..000000000
--- a/npc/mapflag/private_airship.txt
+++ /dev/null
@@ -1,725 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2018 Hercules Dev Team
-//= Copyright (C) Asheraf
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-
-// Private Airship Startable Maps
-abbey01	mapflag	pairship_startable
-abbey02	mapflag	pairship_startable
-abbey03	mapflag	pairship_startable
-abyss_01	mapflag	pairship_startable
-abyss_02	mapflag	pairship_startable
-abyss_03	mapflag	pairship_startable
-alb2trea	mapflag	pairship_startable
-alberta	mapflag	pairship_startable
-alde_dun01	mapflag	pairship_startable
-alde_dun02	mapflag	pairship_startable
-alde_dun03	mapflag	pairship_startable
-alde_dun04	mapflag	pairship_startable
-alde_gld	mapflag	pairship_startable
-aldebaran	mapflag	pairship_startable
-ama_dun01	mapflag	pairship_startable
-ama_dun02	mapflag	pairship_startable
-ama_dun03	mapflag	pairship_startable
-ama_fild01	mapflag	pairship_startable
-amatsu	mapflag	pairship_startable
-anthell01	mapflag	pairship_startable
-anthell02	mapflag	pairship_startable
-aru_gld	mapflag	pairship_startable
-ayo_dun01	mapflag	pairship_startable
-ayo_dun02	mapflag	pairship_startable
-ayo_fild01	mapflag	pairship_startable
-ayothaya	mapflag	pairship_startable
-beach_dun	mapflag	pairship_startable
-beach_dun2	mapflag	pairship_startable
-beach_dun3	mapflag	pairship_startable
-bif_fild01	mapflag	pairship_startable
-bif_fild02	mapflag	pairship_startable
-bra_dun01	mapflag	pairship_startable
-bra_dun02	mapflag	pairship_startable
-bra_fild01	mapflag	pairship_startable
-brasilis	mapflag	pairship_startable
-c_tower1	mapflag	pairship_startable
-c_tower2	mapflag	pairship_startable
-c_tower3	mapflag	pairship_startable
-c_tower4	mapflag	pairship_startable
-cmd_fild01	mapflag	pairship_startable
-cmd_fild02	mapflag	pairship_startable
-cmd_fild03	mapflag	pairship_startable
-cmd_fild04	mapflag	pairship_startable
-cmd_fild06	mapflag	pairship_startable
-cmd_fild07	mapflag	pairship_startable
-cmd_fild08	mapflag	pairship_startable
-cmd_fild09	mapflag	pairship_startable
-comodo	mapflag	pairship_startable
-dali	mapflag	pairship_startable
-dali02	mapflag	pairship_startable
-dew_dun01	mapflag	pairship_startable
-dew_dun02	mapflag	pairship_startable
-dew_fild01	mapflag	pairship_startable
-dewata	mapflag	pairship_startable
-dic_dun01	mapflag	pairship_startable
-dic_dun02	mapflag	pairship_startable
-dic_dun03	mapflag	pairship_startable
-dic_fild01	mapflag	pairship_startable
-dic_fild02	mapflag	pairship_startable
-dicastes01	mapflag	pairship_startable
-dicastes02	mapflag	pairship_startable
-ecl_fild01	mapflag	pairship_startable
-ecl_tdun01	mapflag	pairship_startable
-ecl_tdun02	mapflag	pairship_startable
-ecl_tdun03	mapflag	pairship_startable
-eclage	mapflag	pairship_startable
-ein_dun01	mapflag	pairship_startable
-ein_dun02	mapflag	pairship_startable
-ein_fild01	mapflag	pairship_startable
-ein_fild03	mapflag	pairship_startable
-ein_fild04	mapflag	pairship_startable
-ein_fild05	mapflag	pairship_startable
-ein_fild06	mapflag	pairship_startable
-ein_fild07	mapflag	pairship_startable
-ein_fild08	mapflag	pairship_startable
-ein_fild09	mapflag	pairship_startable
-einbech	mapflag	pairship_startable
-einbroch	mapflag	pairship_startable
-gef_dun00	mapflag	pairship_startable
-gef_dun01	mapflag	pairship_startable
-gef_dun02	mapflag	pairship_startable
-gef_fild00	mapflag	pairship_startable
-gef_fild01	mapflag	pairship_startable
-gef_fild02	mapflag	pairship_startable
-gef_fild03	mapflag	pairship_startable
-gef_fild04	mapflag	pairship_startable
-gef_fild05	mapflag	pairship_startable
-gef_fild06	mapflag	pairship_startable
-gef_fild07	mapflag	pairship_startable
-gef_fild08	mapflag	pairship_startable
-gef_fild09	mapflag	pairship_startable
-gef_fild10	mapflag	pairship_startable
-gef_fild11	mapflag	pairship_startable
-gef_fild12	mapflag	pairship_startable
-gef_fild13	mapflag	pairship_startable
-gef_fild14	mapflag	pairship_startable
-gefenia01	mapflag	pairship_startable
-gefenia02	mapflag	pairship_startable
-gefenia03	mapflag	pairship_startable
-gefenia04	mapflag	pairship_startable
-geffen	mapflag	pairship_startable
-gl_cas01	mapflag	pairship_startable
-gl_cas02	mapflag	pairship_startable
-gl_church	mapflag	pairship_startable
-gl_chyard	mapflag	pairship_startable
-gl_dun01	mapflag	pairship_startable
-gl_dun02	mapflag	pairship_startable
-gl_in01	mapflag	pairship_startable
-gl_knt01	mapflag	pairship_startable
-gl_knt02	mapflag	pairship_startable
-gl_prison	mapflag	pairship_startable
-gl_prison1	mapflag	pairship_startable
-gl_sew01	mapflag	pairship_startable
-gl_sew02	mapflag	pairship_startable
-gl_sew03	mapflag	pairship_startable
-gl_sew04	mapflag	pairship_startable
-gl_step	mapflag	pairship_startable
-glast_01	mapflag	pairship_startable
-gon_dun01	mapflag	pairship_startable
-gon_dun02	mapflag	pairship_startable
-gon_dun03	mapflag	pairship_startable
-gon_fild01	mapflag	pairship_startable
-gonryun	mapflag	pairship_startable
-hu_fild01	mapflag	pairship_startable
-hu_fild02	mapflag	pairship_startable
-hu_fild04	mapflag	pairship_startable
-hu_fild05	mapflag	pairship_startable
-hu_fild06	mapflag	pairship_startable
-hugel	mapflag	pairship_startable
-ice_dun01	mapflag	pairship_startable
-ice_dun02	mapflag	pairship_startable
-ice_dun03	mapflag	pairship_startable
-in_sphinx1	mapflag	pairship_startable
-in_sphinx2	mapflag	pairship_startable
-in_sphinx3	mapflag	pairship_startable
-in_sphinx4	mapflag	pairship_startable
-in_sphinx5	mapflag	pairship_startable
-iz_dun00	mapflag	pairship_startable
-iz_dun01	mapflag	pairship_startable
-iz_dun02	mapflag	pairship_startable
-iz_dun03	mapflag	pairship_startable
-iz_dun04	mapflag	pairship_startable
-iz_dun05	mapflag	pairship_startable
-izlu2dun	mapflag	pairship_startable
-izlude	mapflag	pairship_startable
-jupe_core	mapflag	pairship_startable
-juperos_01	mapflag	pairship_startable
-juperos_02	mapflag	pairship_startable
-kh_dun01	mapflag	pairship_startable
-kh_dun02	mapflag	pairship_startable
-lasa_dun01	mapflag	pairship_startable
-lasa_dun02	mapflag	pairship_startable
-lasa_dun03	mapflag	pairship_startable
-lasa_fild01	mapflag	pairship_startable
-lasa_fild02	mapflag	pairship_startable
-lasagna	mapflag	pairship_startable
-lhz_dun01	mapflag	pairship_startable
-lhz_dun02	mapflag	pairship_startable
-lhz_dun03	mapflag	pairship_startable
-lhz_fild01	mapflag	pairship_startable
-lhz_fild02	mapflag	pairship_startable
-lhz_fild03	mapflag	pairship_startable
-lighthalzen	mapflag	pairship_startable
-lou_dun01	mapflag	pairship_startable
-lou_dun02	mapflag	pairship_startable
-lou_dun03	mapflag	pairship_startable
-lou_fild01	mapflag	pairship_startable
-louyang	mapflag	pairship_startable
-ma_dun01	mapflag	pairship_startable
-ma_fild01	mapflag	pairship_startable
-ma_fild02	mapflag	pairship_startable
-ma_scene01	mapflag	pairship_startable
-mag_dun01	mapflag	pairship_startable
-mag_dun02	mapflag	pairship_startable
-mal_dun01	mapflag	pairship_startable
-malangdo	mapflag	pairship_startable
-malaya	mapflag	pairship_startable
-man_fild01	mapflag	pairship_startable
-man_fild02	mapflag	pairship_startable
-man_fild03	mapflag	pairship_startable
-manuk	mapflag	pairship_startable
-mid_camp	mapflag	pairship_startable
-mjo_dun01	mapflag	pairship_startable
-mjo_dun02	mapflag	pairship_startable
-mjo_dun03	mapflag	pairship_startable
-mjolnir_01	mapflag	pairship_startable
-mjolnir_02	mapflag	pairship_startable
-mjolnir_03	mapflag	pairship_startable
-mjolnir_04	mapflag	pairship_startable
-mjolnir_05	mapflag	pairship_startable
-mjolnir_06	mapflag	pairship_startable
-mjolnir_07	mapflag	pairship_startable
-mjolnir_08	mapflag	pairship_startable
-mjolnir_09	mapflag	pairship_startable
-mjolnir_10	mapflag	pairship_startable
-mjolnir_11	mapflag	pairship_startable
-mjolnir_12	mapflag	pairship_startable
-moc_fild01	mapflag	pairship_startable
-moc_fild02	mapflag	pairship_startable
-moc_fild03	mapflag	pairship_startable
-moc_fild04	mapflag	pairship_startable
-moc_fild05	mapflag	pairship_startable
-moc_fild06	mapflag	pairship_startable
-moc_fild07	mapflag	pairship_startable
-moc_fild08	mapflag	pairship_startable
-moc_fild09	mapflag	pairship_startable
-moc_fild10	mapflag	pairship_startable
-moc_fild11	mapflag	pairship_startable
-moc_fild12	mapflag	pairship_startable
-moc_fild13	mapflag	pairship_startable
-moc_fild14	mapflag	pairship_startable
-moc_fild15	mapflag	pairship_startable
-moc_fild16	mapflag	pairship_startable
-moc_fild17	mapflag	pairship_startable
-moc_fild18	mapflag	pairship_startable
-moc_fild19	mapflag	pairship_startable
-moc_pryd01	mapflag	pairship_startable
-moc_pryd02	mapflag	pairship_startable
-moc_pryd03	mapflag	pairship_startable
-moc_pryd04	mapflag	pairship_startable
-moc_pryd05	mapflag	pairship_startable
-moc_pryd06	mapflag	pairship_startable
-moc_ruins	mapflag	pairship_startable
-mora	mapflag	pairship_startable
-moro_cav	mapflag	pairship_startable
-moro_vol	mapflag	pairship_startable
-morocc	mapflag	pairship_startable
-moscovia	mapflag	pairship_startable
-mosk_dun01	mapflag	pairship_startable
-mosk_dun02	mapflag	pairship_startable
-mosk_dun03	mapflag	pairship_startable
-mosk_fild02	mapflag	pairship_startable
-nameless_n	mapflag	pairship_startable
-nif_fild01	mapflag	pairship_startable
-nif_fild02	mapflag	pairship_startable
-niflheim	mapflag	pairship_startable
-odin_tem01	mapflag	pairship_startable
-odin_tem02	mapflag	pairship_startable
-odin_tem03	mapflag	pairship_startable
-orcsdun01	mapflag	pairship_startable
-orcsdun02	mapflag	pairship_startable
-pay_arche	mapflag	pairship_startable
-pay_dun00	mapflag	pairship_startable
-pay_dun01	mapflag	pairship_startable
-pay_dun02	mapflag	pairship_startable
-pay_dun03	mapflag	pairship_startable
-pay_dun04	mapflag	pairship_startable
-pay_fild01	mapflag	pairship_startable
-pay_fild02	mapflag	pairship_startable
-pay_fild03	mapflag	pairship_startable
-pay_fild04	mapflag	pairship_startable
-pay_fild05	mapflag	pairship_startable
-pay_fild06	mapflag	pairship_startable
-pay_fild07	mapflag	pairship_startable
-pay_fild08	mapflag	pairship_startable
-pay_fild09	mapflag	pairship_startable
-pay_fild10	mapflag	pairship_startable
-pay_fild11	mapflag	pairship_startable
-payon	mapflag	pairship_startable
-prontera	mapflag	pairship_startable
-prt_fild00	mapflag	pairship_startable
-prt_fild01	mapflag	pairship_startable
-prt_fild02	mapflag	pairship_startable
-prt_fild03	mapflag	pairship_startable
-prt_fild04	mapflag	pairship_startable
-prt_fild05	mapflag	pairship_startable
-prt_fild06	mapflag	pairship_startable
-prt_fild07	mapflag	pairship_startable
-prt_fild08	mapflag	pairship_startable
-prt_fild09	mapflag	pairship_startable
-prt_fild10	mapflag	pairship_startable
-prt_fild11	mapflag	pairship_startable
-prt_maze01	mapflag	pairship_startable
-prt_maze02	mapflag	pairship_startable
-prt_maze03	mapflag	pairship_startable
-prt_monk	mapflag	pairship_startable
-prt_sewb1	mapflag	pairship_startable
-prt_sewb2	mapflag	pairship_startable
-prt_sewb3	mapflag	pairship_startable
-prt_sewb4	mapflag	pairship_startable
-ra_fild01	mapflag	pairship_startable
-ra_fild03	mapflag	pairship_startable
-ra_fild04	mapflag	pairship_startable
-ra_fild05	mapflag	pairship_startable
-ra_fild06	mapflag	pairship_startable
-ra_fild08	mapflag	pairship_startable
-ra_fild12	mapflag	pairship_startable
-ra_san01	mapflag	pairship_startable
-ra_san02	mapflag	pairship_startable
-ra_san03	mapflag	pairship_startable
-ra_san04	mapflag	pairship_startable
-ra_san05	mapflag	pairship_startable
-ra_temple	mapflag	pairship_startable
-rachel	mapflag	pairship_startable
-spl_fild01	mapflag	pairship_startable
-spl_fild02	mapflag	pairship_startable
-spl_fild03	mapflag	pairship_startable
-splendide	mapflag	pairship_startable
-tha_t01	mapflag	pairship_startable
-tha_t02	mapflag	pairship_startable
-tha_t03	mapflag	pairship_startable
-tha_t04	mapflag	pairship_startable
-tha_t05	mapflag	pairship_startable
-tha_t06	mapflag	pairship_startable
-tha_t07	mapflag	pairship_startable
-tha_t08	mapflag	pairship_startable
-tha_t09	mapflag	pairship_startable
-tha_t10	mapflag	pairship_startable
-tha_t11	mapflag	pairship_startable
-tha_t12	mapflag	pairship_startable
-thor_v01	mapflag	pairship_startable
-thor_v02	mapflag	pairship_startable
-thor_v03	mapflag	pairship_startable
-treasure01	mapflag	pairship_startable
-treasure02	mapflag	pairship_startable
-tur_dun01	mapflag	pairship_startable
-tur_dun02	mapflag	pairship_startable
-tur_dun03	mapflag	pairship_startable
-tur_dun04	mapflag	pairship_startable
-tur_dun05	mapflag	pairship_startable
-um_fild01	mapflag	pairship_startable
-um_fild02	mapflag	pairship_startable
-um_fild03	mapflag	pairship_startable
-um_fild04	mapflag	pairship_startable
-umbala	mapflag	pairship_startable
-ve_fild01	mapflag	pairship_startable
-ve_fild02	mapflag	pairship_startable
-ve_fild03	mapflag	pairship_startable
-ve_fild04	mapflag	pairship_startable
-ve_fild06	mapflag	pairship_startable
-ve_fild07	mapflag	pairship_startable
-veins	mapflag	pairship_startable
-ver_eju	mapflag	pairship_startable
-ver_tunn	mapflag	pairship_startable
-verus03	mapflag	pairship_startable
-verus04	mapflag	pairship_startable
-yuno	mapflag	pairship_startable
-yuno_fild01	mapflag	pairship_startable
-yuno_fild02	mapflag	pairship_startable
-yuno_fild03	mapflag	pairship_startable
-yuno_fild04	mapflag	pairship_startable
-yuno_fild06	mapflag	pairship_startable
-yuno_fild07	mapflag	pairship_startable
-yuno_fild08	mapflag	pairship_startable
-yuno_fild09	mapflag	pairship_startable
-yuno_fild11	mapflag	pairship_startable
-yuno_fild12	mapflag	pairship_startable
-
-// Private Airship Endable Maps
-abbey01	mapflag	pairship_endable
-abbey02	mapflag	pairship_endable
-abbey03	mapflag	pairship_endable
-abyss_01	mapflag	pairship_endable
-abyss_02	mapflag	pairship_endable
-abyss_03	mapflag	pairship_endable
-alb2trea	mapflag	pairship_endable
-alberta	mapflag	pairship_endable
-alde_dun01	mapflag	pairship_endable
-alde_dun02	mapflag	pairship_endable
-alde_dun03	mapflag	pairship_endable
-alde_dun04	mapflag	pairship_endable
-alde_gld	mapflag	pairship_endable
-aldebaran	mapflag	pairship_endable
-ama_dun01	mapflag	pairship_endable
-ama_dun02	mapflag	pairship_endable
-ama_dun03	mapflag	pairship_endable
-ama_fild01	mapflag	pairship_endable
-amatsu	mapflag	pairship_endable
-anthell01	mapflag	pairship_endable
-anthell02	mapflag	pairship_endable
-aru_gld	mapflag	pairship_endable
-ayo_dun01	mapflag	pairship_endable
-ayo_dun02	mapflag	pairship_endable
-ayo_fild01	mapflag	pairship_endable
-ayothaya	mapflag	pairship_endable
-beach_dun	mapflag	pairship_endable
-beach_dun2	mapflag	pairship_endable
-beach_dun3	mapflag	pairship_endable
-bif_fild01	mapflag	pairship_endable
-bif_fild02	mapflag	pairship_endable
-bra_dun01	mapflag	pairship_endable
-bra_dun02	mapflag	pairship_endable
-bra_fild01	mapflag	pairship_endable
-brasilis	mapflag	pairship_endable
-c_tower1	mapflag	pairship_endable
-c_tower2	mapflag	pairship_endable
-c_tower3	mapflag	pairship_endable
-c_tower4	mapflag	pairship_endable
-cmd_fild01	mapflag	pairship_endable
-cmd_fild02	mapflag	pairship_endable
-cmd_fild03	mapflag	pairship_endable
-cmd_fild04	mapflag	pairship_endable
-cmd_fild06	mapflag	pairship_endable
-cmd_fild07	mapflag	pairship_endable
-cmd_fild08	mapflag	pairship_endable
-cmd_fild09	mapflag	pairship_endable
-comodo	mapflag	pairship_endable
-dali	mapflag	pairship_endable
-dali02	mapflag	pairship_endable
-dew_dun01	mapflag	pairship_endable
-dew_dun02	mapflag	pairship_endable
-dew_fild01	mapflag	pairship_endable
-dewata	mapflag	pairship_endable
-dic_dun01	mapflag	pairship_endable
-dic_dun02	mapflag	pairship_endable
-dic_dun03	mapflag	pairship_endable
-dic_fild01	mapflag	pairship_endable
-dic_fild02	mapflag	pairship_endable
-dicastes01	mapflag	pairship_endable
-dicastes02	mapflag	pairship_endable
-ecl_fild01	mapflag	pairship_endable
-ecl_tdun01	mapflag	pairship_endable
-ecl_tdun02	mapflag	pairship_endable
-ecl_tdun03	mapflag	pairship_endable
-eclage	mapflag	pairship_endable
-ein_dun01	mapflag	pairship_endable
-ein_dun02	mapflag	pairship_endable
-ein_fild01	mapflag	pairship_endable
-ein_fild03	mapflag	pairship_endable
-ein_fild04	mapflag	pairship_endable
-ein_fild05	mapflag	pairship_endable
-ein_fild06	mapflag	pairship_endable
-ein_fild07	mapflag	pairship_endable
-ein_fild08	mapflag	pairship_endable
-ein_fild09	mapflag	pairship_endable
-einbech	mapflag	pairship_endable
-einbroch	mapflag	pairship_endable
-gef_dun00	mapflag	pairship_endable
-gef_dun01	mapflag	pairship_endable
-gef_dun02	mapflag	pairship_endable
-gef_fild00	mapflag	pairship_endable
-gef_fild01	mapflag	pairship_endable
-gef_fild02	mapflag	pairship_endable
-gef_fild03	mapflag	pairship_endable
-gef_fild04	mapflag	pairship_endable
-gef_fild05	mapflag	pairship_endable
-gef_fild06	mapflag	pairship_endable
-gef_fild07	mapflag	pairship_endable
-gef_fild08	mapflag	pairship_endable
-gef_fild09	mapflag	pairship_endable
-gef_fild10	mapflag	pairship_endable
-gef_fild11	mapflag	pairship_endable
-gef_fild12	mapflag	pairship_endable
-gef_fild13	mapflag	pairship_endable
-gef_fild14	mapflag	pairship_endable
-gefenia01	mapflag	pairship_endable
-gefenia02	mapflag	pairship_endable
-gefenia03	mapflag	pairship_endable
-gefenia04	mapflag	pairship_endable
-geffen	mapflag	pairship_endable
-gl_cas01	mapflag	pairship_endable
-gl_cas02	mapflag	pairship_endable
-gl_church	mapflag	pairship_endable
-gl_chyard	mapflag	pairship_endable
-gl_dun01	mapflag	pairship_endable
-gl_dun02	mapflag	pairship_endable
-gl_in01	mapflag	pairship_endable
-gl_knt01	mapflag	pairship_endable
-gl_knt02	mapflag	pairship_endable
-gl_prison	mapflag	pairship_endable
-gl_prison1	mapflag	pairship_endable
-gl_sew01	mapflag	pairship_endable
-gl_sew02	mapflag	pairship_endable
-gl_sew03	mapflag	pairship_endable
-gl_sew04	mapflag	pairship_endable
-gl_step	mapflag	pairship_endable
-glast_01	mapflag	pairship_endable
-gon_dun01	mapflag	pairship_endable
-gon_dun02	mapflag	pairship_endable
-gon_dun03	mapflag	pairship_endable
-gon_fild01	mapflag	pairship_endable
-gonryun	mapflag	pairship_endable
-hu_fild01	mapflag	pairship_endable
-hu_fild02	mapflag	pairship_endable
-hu_fild04	mapflag	pairship_endable
-hu_fild05	mapflag	pairship_endable
-hu_fild06	mapflag	pairship_endable
-hugel	mapflag	pairship_endable
-ice_dun01	mapflag	pairship_endable
-ice_dun02	mapflag	pairship_endable
-ice_dun03	mapflag	pairship_endable
-in_sphinx1	mapflag	pairship_endable
-in_sphinx2	mapflag	pairship_endable
-in_sphinx3	mapflag	pairship_endable
-in_sphinx4	mapflag	pairship_endable
-in_sphinx5	mapflag	pairship_endable
-iz_dun00	mapflag	pairship_endable
-iz_dun01	mapflag	pairship_endable
-iz_dun02	mapflag	pairship_endable
-iz_dun03	mapflag	pairship_endable
-iz_dun04	mapflag	pairship_endable
-iz_dun05	mapflag	pairship_endable
-izlu2dun	mapflag	pairship_endable
-izlude	mapflag	pairship_endable
-jupe_core	mapflag	pairship_endable
-juperos_01	mapflag	pairship_endable
-juperos_02	mapflag	pairship_endable
-kh_dun01	mapflag	pairship_endable
-kh_dun02	mapflag	pairship_endable
-lasa_dun01	mapflag	pairship_endable
-lasa_dun02	mapflag	pairship_endable
-lasa_dun03	mapflag	pairship_endable
-lasa_fild01	mapflag	pairship_endable
-lasa_fild02	mapflag	pairship_endable
-lasagna	mapflag	pairship_endable
-lhz_dun01	mapflag	pairship_endable
-lhz_dun02	mapflag	pairship_endable
-lhz_dun03	mapflag	pairship_endable
-lhz_fild01	mapflag	pairship_endable
-lhz_fild02	mapflag	pairship_endable
-lhz_fild03	mapflag	pairship_endable
-lighthalzen	mapflag	pairship_endable
-lou_dun01	mapflag	pairship_endable
-lou_dun02	mapflag	pairship_endable
-lou_dun03	mapflag	pairship_endable
-lou_fild01	mapflag	pairship_endable
-louyang	mapflag	pairship_endable
-ma_dun01	mapflag	pairship_endable
-ma_fild01	mapflag	pairship_endable
-ma_fild02	mapflag	pairship_endable
-ma_scene01	mapflag	pairship_endable
-mag_dun01	mapflag	pairship_endable
-mag_dun02	mapflag	pairship_endable
-mal_dun01	mapflag	pairship_endable
-malangdo	mapflag	pairship_endable
-malaya	mapflag	pairship_endable
-man_fild01	mapflag	pairship_endable
-man_fild02	mapflag	pairship_endable
-man_fild03	mapflag	pairship_endable
-manuk	mapflag	pairship_endable
-mid_camp	mapflag	pairship_endable
-mjo_dun01	mapflag	pairship_endable
-mjo_dun02	mapflag	pairship_endable
-mjo_dun03	mapflag	pairship_endable
-mjolnir_01	mapflag	pairship_endable
-mjolnir_02	mapflag	pairship_endable
-mjolnir_03	mapflag	pairship_endable
-mjolnir_04	mapflag	pairship_endable
-mjolnir_05	mapflag	pairship_endable
-mjolnir_06	mapflag	pairship_endable
-mjolnir_07	mapflag	pairship_endable
-mjolnir_08	mapflag	pairship_endable
-mjolnir_09	mapflag	pairship_endable
-mjolnir_10	mapflag	pairship_endable
-mjolnir_11	mapflag	pairship_endable
-mjolnir_12	mapflag	pairship_endable
-moc_fild01	mapflag	pairship_endable
-moc_fild02	mapflag	pairship_endable
-moc_fild03	mapflag	pairship_endable
-moc_fild04	mapflag	pairship_endable
-moc_fild05	mapflag	pairship_endable
-moc_fild06	mapflag	pairship_endable
-moc_fild07	mapflag	pairship_endable
-moc_fild08	mapflag	pairship_endable
-moc_fild09	mapflag	pairship_endable
-moc_fild10	mapflag	pairship_endable
-moc_fild11	mapflag	pairship_endable
-moc_fild12	mapflag	pairship_endable
-moc_fild13	mapflag	pairship_endable
-moc_fild14	mapflag	pairship_endable
-moc_fild15	mapflag	pairship_endable
-moc_fild16	mapflag	pairship_endable
-moc_fild17	mapflag	pairship_endable
-moc_fild18	mapflag	pairship_endable
-moc_fild19	mapflag	pairship_endable
-moc_pryd01	mapflag	pairship_endable
-moc_pryd02	mapflag	pairship_endable
-moc_pryd03	mapflag	pairship_endable
-moc_pryd04	mapflag	pairship_endable
-moc_pryd05	mapflag	pairship_endable
-moc_pryd06	mapflag	pairship_endable
-moc_ruins	mapflag	pairship_endable
-mora	mapflag	pairship_endable
-moro_cav	mapflag	pairship_endable
-moro_vol	mapflag	pairship_endable
-morocc	mapflag	pairship_endable
-moscovia	mapflag	pairship_endable
-mosk_dun01	mapflag	pairship_endable
-mosk_dun02	mapflag	pairship_endable
-mosk_dun03	mapflag	pairship_endable
-mosk_fild02	mapflag	pairship_endable
-nameless_n	mapflag	pairship_endable
-nif_fild01	mapflag	pairship_endable
-nif_fild02	mapflag	pairship_endable
-niflheim	mapflag	pairship_endable
-odin_tem01	mapflag	pairship_endable
-odin_tem02	mapflag	pairship_endable
-odin_tem03	mapflag	pairship_endable
-orcsdun01	mapflag	pairship_endable
-orcsdun02	mapflag	pairship_endable
-pay_arche	mapflag	pairship_endable
-pay_dun00	mapflag	pairship_endable
-pay_dun01	mapflag	pairship_endable
-pay_dun02	mapflag	pairship_endable
-pay_dun03	mapflag	pairship_endable
-pay_dun04	mapflag	pairship_endable
-pay_fild01	mapflag	pairship_endable
-pay_fild02	mapflag	pairship_endable
-pay_fild03	mapflag	pairship_endable
-pay_fild04	mapflag	pairship_endable
-pay_fild05	mapflag	pairship_endable
-pay_fild06	mapflag	pairship_endable
-pay_fild07	mapflag	pairship_endable
-pay_fild08	mapflag	pairship_endable
-pay_fild09	mapflag	pairship_endable
-pay_fild10	mapflag	pairship_endable
-pay_fild11	mapflag	pairship_endable
-payon	mapflag	pairship_endable
-prontera	mapflag	pairship_endable
-prt_fild00	mapflag	pairship_endable
-prt_fild01	mapflag	pairship_endable
-prt_fild02	mapflag	pairship_endable
-prt_fild03	mapflag	pairship_endable
-prt_fild04	mapflag	pairship_endable
-prt_fild05	mapflag	pairship_endable
-prt_fild06	mapflag	pairship_endable
-prt_fild07	mapflag	pairship_endable
-prt_fild08	mapflag	pairship_endable
-prt_fild09	mapflag	pairship_endable
-prt_fild10	mapflag	pairship_endable
-prt_fild11	mapflag	pairship_endable
-prt_maze01	mapflag	pairship_endable
-prt_maze02	mapflag	pairship_endable
-prt_maze03	mapflag	pairship_endable
-prt_monk	mapflag	pairship_endable
-prt_sewb1	mapflag	pairship_endable
-prt_sewb2	mapflag	pairship_endable
-prt_sewb3	mapflag	pairship_endable
-prt_sewb4	mapflag	pairship_endable
-ra_fild01	mapflag	pairship_endable
-ra_fild03	mapflag	pairship_endable
-ra_fild04	mapflag	pairship_endable
-ra_fild05	mapflag	pairship_endable
-ra_fild06	mapflag	pairship_endable
-ra_fild08	mapflag	pairship_endable
-ra_fild12	mapflag	pairship_endable
-ra_san01	mapflag	pairship_endable
-ra_san02	mapflag	pairship_endable
-ra_san03	mapflag	pairship_endable
-ra_san04	mapflag	pairship_endable
-ra_san05	mapflag	pairship_endable
-ra_temple	mapflag	pairship_endable
-rachel	mapflag	pairship_endable
-spl_fild01	mapflag	pairship_endable
-spl_fild02	mapflag	pairship_endable
-spl_fild03	mapflag	pairship_endable
-splendide	mapflag	pairship_endable
-tha_t01	mapflag	pairship_endable
-tha_t02	mapflag	pairship_endable
-tha_t03	mapflag	pairship_endable
-tha_t04	mapflag	pairship_endable
-tha_t05	mapflag	pairship_endable
-tha_t06	mapflag	pairship_endable
-tha_t07	mapflag	pairship_endable
-tha_t08	mapflag	pairship_endable
-tha_t09	mapflag	pairship_endable
-tha_t10	mapflag	pairship_endable
-tha_t11	mapflag	pairship_endable
-tha_t12	mapflag	pairship_endable
-thor_v01	mapflag	pairship_endable
-thor_v02	mapflag	pairship_endable
-thor_v03	mapflag	pairship_endable
-treasure01	mapflag	pairship_endable
-treasure02	mapflag	pairship_endable
-tur_dun01	mapflag	pairship_endable
-tur_dun02	mapflag	pairship_endable
-tur_dun03	mapflag	pairship_endable
-tur_dun04	mapflag	pairship_endable
-tur_dun05	mapflag	pairship_endable
-um_fild01	mapflag	pairship_endable
-um_fild02	mapflag	pairship_endable
-um_fild03	mapflag	pairship_endable
-um_fild04	mapflag	pairship_endable
-umbala	mapflag	pairship_endable
-ve_fild01	mapflag	pairship_endable
-ve_fild02	mapflag	pairship_endable
-ve_fild03	mapflag	pairship_endable
-ve_fild04	mapflag	pairship_endable
-ve_fild06	mapflag	pairship_endable
-ve_fild07	mapflag	pairship_endable
-veins	mapflag	pairship_endable
-ver_eju	mapflag	pairship_endable
-ver_tunn	mapflag	pairship_endable
-verus03	mapflag	pairship_endable
-verus04	mapflag	pairship_endable
-yuno	mapflag	pairship_endable
-yuno_fild01	mapflag	pairship_endable
-yuno_fild02	mapflag	pairship_endable
-yuno_fild03	mapflag	pairship_endable
-yuno_fild04	mapflag	pairship_endable
-yuno_fild06	mapflag	pairship_endable
-yuno_fild07	mapflag	pairship_endable
-yuno_fild08	mapflag	pairship_endable
-yuno_fild09	mapflag	pairship_endable
-yuno_fild11	mapflag	pairship_endable
-yuno_fild12	mapflag	pairship_endable
diff --git a/npc/mapflag/pvp.txt b/npc/mapflag/pvp.txt
deleted file mode 100644
index 7f671b49a..000000000
--- a/npc/mapflag/pvp.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Player versus Player mode.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= Enables PvP on a map.
-//=========================================================================
-
-// 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
-
-//Aldebaran Turbo Track
-turbo_e_4	mapflag	pvp
-turbo_e_8	mapflag	pvp
-turbo_e_16	mapflag	pvp
diff --git a/npc/mapflag/pvp_noguild.txt b/npc/mapflag/pvp_noguild.txt
deleted file mode 100644
index b7305c16f..000000000
--- a/npc/mapflag/pvp_noguild.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Ignore guilds.
-//================= Current Version =======================================
-//= 1.1
-//================= Description ===========================================
-//= Ignores guild alliances on GvG-enabled maps.
-//=========================================================================
-
-// 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/npc/mapflag/pvp_noparty.txt b/npc/mapflag/pvp_noparty.txt
deleted file mode 100644
index f948a1db7..000000000
--- a/npc/mapflag/pvp_noparty.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  rAthena Dev Team
-//= Copyright (C)  eAthena Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Ignore parties.
-//================= Current Version =======================================
-//= 1.2
-//================= Description ===========================================
-//= Ignores party alliances on PvP-enabled maps.
-//=========================================================================
-
-// 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/npc/mapflag/reset.txt b/npc/mapflag/reset.txt
deleted file mode 100644
index 21a0b04f8..000000000
--- a/npc/mapflag/reset.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Daegaladh
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Enable Neuralizer use.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= Maps where Neuralizer (12213) can be used.
-//=========================================================================
-
-alberta	mapflag	reset
-aldebaran	mapflag	reset
-amatsu	mapflag	reset
-ayothaya	mapflag	reset
-brasilis	mapflag	reset
-comodo	mapflag	reset
-dewata	mapflag	reset
-dicastes01	mapflag	reset
-dicastes02	mapflag	reset
-eclage	mapflag	reset
-einbroch	mapflag	reset
-einbech	mapflag	reset
-geffen	mapflag	reset
-gonryun	mapflag	reset
-izlude	mapflag	reset
-jawaii	mapflag	reset
-hugel	mapflag	reset
-lighthalzen	mapflag	reset
-louyang	mapflag	reset
-malangdo	mapflag	reset
-malaya	mapflag	reset
-manuk	mapflag	reset
-mid_camp	mapflag	reset
-moc_ruins	mapflag	reset
-mora	mapflag	reset
-morocc	mapflag	reset
-moscovia	mapflag	reset
-niflheim	mapflag	reset
-prontera	mapflag	reset
-payon	mapflag	reset
-pay_arche	mapflag	reset
-rachel	mapflag	reset
-splendide	mapflag	reset
-umbala	mapflag	reset
-veins	mapflag	reset
-xmas	mapflag	reset
-yuno	mapflag	reset
diff --git a/npc/mapflag/skillduration.txt b/npc/mapflag/skillduration.txt
deleted file mode 100644
index e11278b44..000000000
--- a/npc/mapflag/skillduration.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Adjust Skill Duration.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= This mapflag allows you to control the duration of unit
-//= skills in any map.
-//= Example (1):
-//= prontera	mapflag	adjust_unit_duration	PR_SANCTUARY	50
-//= Halves the duration of Sanctuary in Prontera.
-//=
-//= Example (2):
-//= prontera	mapflag	adjust_unit_duration	WZ_QUAGMIRE	250
-//= Increases duration of Quagmire by 2.5 times in Prontera.
-//================= Additional Notes ======================================
-//= Be aware that some skill units have their visual effect
-//= durations not controlled by the server (e.g. Storm Gust).
-//=========================================================================
diff --git a/npc/mapflag/skillmodifier.txt b/npc/mapflag/skillmodifier.txt
deleted file mode 100644
index 7354f4656..000000000
--- a/npc/mapflag/skillmodifier.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Adjust Skill Damage.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= This mapflag allows you to modify the damage of any skill
-//= in any map.
-//= Example (1):
-//= prontera	mapflag	adjust_skill_damage	MG_FIREBOLT	50
-//= Halves the damage of Firebolt in Prontera.
-//=
-//= Example (2):
-//= prontera	mapflag	adjust_skill_damage	MG_FIREBOLT	200
-//= Doubles the damage of Firebolt in Prontera.
-//=========================================================================
diff --git a/npc/mapflag/town.txt b/npc/mapflag/town.txt
deleted file mode 100644
index 463b7390c..000000000
--- a/npc/mapflag/town.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2012-2015  Hercules Dev Team
-//= Copyright (C)  Epoque
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Town.
-//================= Current Version =======================================
-//= 1.0a
-//================= Description ===========================================
-//= Designates a map as a town, granting mailbox access.
-//=========================================================================
-
-prontera	mapflag	town
-izlude	mapflag	town
-moc_ruins	mapflag	town
-geffen	mapflag	town
-payon	mapflag	town
-pay_arche	mapflag	town
-alberta	mapflag	town
-aldebaran	mapflag	town
-yuno	mapflag	town
-lighthalzen	mapflag	town
-einbroch	mapflag	town
-einbech	mapflag	town
-comodo	mapflag	town
-umbala	mapflag	town
-amatsu	mapflag	town
-gonryun	mapflag	town
-ayothaya	mapflag	town
-louyang	mapflag	town
-hugel	mapflag	town
-rachel	mapflag	town
-veins	mapflag	town
-brasilis	mapflag	town
-dicastes01	mapflag	town
-mora	mapflag	town
-dewata	mapflag	town
-malangdo	mapflag	town
-malaya	mapflag	town
-eclage	mapflag	town
diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt
deleted file mode 100644
index b90116911..000000000
--- a/npc/mapflag/zone.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-//================= Hercules Script =======================================
-//=       _   _                     _
-//=      | | | |                   | |
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___
-//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
-//=      | | | |  __/ | | (__| |_| | |  __/\__ \
-//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//================= License ===============================================
-//= This file is part of Hercules.
-//= http://herc.ws - http://github.com/HerculesWS/Hercules
-//=
-//= Copyright (C) 2013-2015  Hercules Dev Team
-//= Copyright (C)  Ind
-//=
-//= Hercules is free software: you can redistribute it and/or modify
-//= it under the terms of the GNU General Public License as published by
-//= the Free Software Foundation, either version 3 of the License, or
-//= (at your option) any later version.
-//=
-//= This program is distributed in the hope that it will be useful,
-//= but WITHOUT ANY WARRANTY; without even the implied warranty of
-//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//= GNU General Public License for more details.
-//=
-//= You should have received a copy of the GNU General Public License
-//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//=========================================================================
-//= Mapflag: Zone.
-//================= Current Version =======================================
-//= 1.0
-//================= Description ===========================================
-//= Flags maps as part of zones defined in map_zone_db.txt
-//=========================================================================
-
-//Aldebaran Turbo Track
-alde_tt02	mapflag	zone	Aldebaran Turbo Track
-turbo_n_1	mapflag	zone	Aldebaran Turbo Track
-turbo_n_4	mapflag	zone	Aldebaran Turbo Track
-turbo_n_8	mapflag	zone	Aldebaran Turbo Track
-turbo_n_16	mapflag	zone	Aldebaran Turbo Track
-turbo_e_4	mapflag	zone	Aldebaran Turbo Track
-turbo_e_8	mapflag	zone	Aldebaran Turbo Track
-turbo_e_16	mapflag	zone	Aldebaran Turbo Track
-
-//Jail
-sec_pri	mapflag	zone	Jail
-
-//Izlude Battle Arena
-force_1-1	mapflag	zone	Izlude Battle Arena
-force_2-1	mapflag	zone	Izlude Battle Arena
-force_3-1	mapflag	zone	Izlude Battle Arena
-force_4-1	mapflag	zone	Izlude Battle Arena
-force_5-1	mapflag	zone	Izlude Battle Arena
-force_1-2	mapflag	zone	Izlude Battle Arena
-force_1-3	mapflag	zone	Izlude Battle Arena
-prt_are_in	mapflag	zone	Izlude Battle Arena
-
-//Sealed Shrine ==================
-1@cata	mapflag	zone	Sealed Shrine
-2@cata	mapflag	zone	Sealed Shrine
-
-//Endless Tower ==================
-1@tower	mapflag	zone	Memorial Dungeon
-2@tower	mapflag	zone	Memorial Dungeon
-3@tower	mapflag	zone	Memorial Dungeon
-4@tower	mapflag	zone	Memorial Dungeon
-5@tower	mapflag	zone	Memorial Dungeon
-6@tower	mapflag	zone	Memorial Dungeon
-
-//Orc's Memory ===================
-1@orcs	mapflag	zone	Memorial Dungeon
-2@orcs	mapflag	zone	Memorial Dungeon
-
-// Nidhoggr's Instance ===========
-1@nyd	mapflag	zone	Memorial Dungeon
-2@nyd	mapflag	zone	Memorial Dungeon
-
-//Towns
-alberta	mapflag	zone	Towns
-aldebaran	mapflag	zone	Towns
-amatsu	mapflag	zone	Towns
-ayothaya	mapflag	zone	Towns
-brasilis	mapflag	zone	Towns
-comodo	mapflag	zone	Towns
-einbroch	mapflag	zone	Towns
-einbech	mapflag	zone	Towns
-geffen	mapflag	zone	Towns
-gonryun	mapflag	zone	Towns
-izlude	mapflag	zone	Towns
-jawaii	mapflag	zone	Towns
-hugel	mapflag	zone	Towns
-lighthalzen	mapflag	zone	Towns
-louyang	mapflag	zone	Towns
-manuk	mapflag	zone	Towns
-mid_camp	mapflag	zone	Towns
-moc_ruins	mapflag	zone	Towns
-morocc	mapflag	zone	Towns
-moscovia	mapflag	zone	Towns
-niflheim	mapflag	zone	Towns
-prontera	mapflag	zone	Towns
-payon	mapflag	zone	Towns
-pay_arche	mapflag	zone	Towns
-rachel	mapflag	zone	Towns
-splendide	mapflag	zone	Towns
-umbala	mapflag	zone	Towns
-veins	mapflag	zone	Towns
-xmas	mapflag	zone	Towns
-yuno	mapflag	zone	Towns
-
-// WoE SE
-arug_cas01	mapflag	zone	GvG2
-arug_cas02	mapflag	zone	GvG2
-arug_cas03	mapflag	zone	GvG2
-arug_cas04	mapflag	zone	GvG2
-arug_cas05	mapflag	zone	GvG2
-schg_cas01	mapflag	zone	GvG2
-schg_cas02	mapflag	zone	GvG2
-schg_cas03	mapflag	zone	GvG2
-schg_cas04	mapflag	zone	GvG2
-schg_cas05	mapflag	zone	GvG2