Add some renewal maps to zones

Adjust map ID lookup to be primary
* Resolves a few cases of where a map may be defined in the index/cache but not enabled from the config. * Comment out a few pre-renewal maps that are not enabled.
2024-09-20 13:25:46 -04:00 · 2024-09-20 10:12:23 -04:00 · 2024-09-20 09:38:17 -04:00 · 2024-09-20 10:23:53 +02:00 · 2024-09-18 17:28:21 +02:00 · 2024-09-17 17:10:27 +02:00
113 changed files with 9500 additions and 11650 deletions
--- a/conf/battle/battleground.conf
+++ b/conf/battle/battleground.conf
@@ -9,25 +9,6 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
 //--------------------------------------------------------------

-// Melee damage adjustments (non skills) for Battleground maps (Note 2)
-bg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for Battleground maps (Note 2)
-bg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for Battleground maps (Note 2)
-bg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for Battleground maps (Note 2)
-bg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for Battleground maps (Note 2)
-bg_misc_attack_damage_rate: 60
-
-// Flee penalty on BG grounds.
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-bg_flee_penalty: 20
-
 // Interval before updating the bg-member map mini-dots (milliseconds)
 bg_update_interval: 1000

--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -27,25 +27,6 @@ guild_max_castles: 0
 // Note: This was changed in renewal in favor of individual skill cooldown.
 guild_skill_relog_delay: 300000

-// Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_misc_attack_damage_rate: 60
-
-// Flee penalty on gvg grounds. Official value is 20 (Note 2)
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-gvg_flee_penalty: 20
-
 // Can the 'Glory of Guild' skill be learnt in the Guild window,
 // and does changing emblems require it? (Note 1)
 // P.S: This skill is not implemented on official servers
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -39,14 +39,6 @@ pk_min_level: 55
 // players to let them attack each other. 0 disables said limit.
 pk_level_range: 0

-// For PK servers. Damage adjustment settings, these follow the same logic
-// as their WoE counterparts (see guild.conf)  
-pk_short_attack_damage_rate: 80
-pk_long_attack_damage_rate: 70
-pk_weapon_attack_damage_rate: 60
-pk_magic_attack_damage_rate: 60
-pk_misc_attack_damage_rate: 60
-
 // Display skill usage in console? (for debug only) (default: off) (Note 3)
 skill_log: off

--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -936,7 +936,11 @@
 // @reloadcashdb
 832: Cash shop database has been reloaded.

-//833-899 free
+// Map Zones
+833: This command is disabled on this map.
+834: Map Zone database has been reloaded.
+
+//835-899 free

 //------------------------------------
 // More atcommands message
@@ -1127,9 +1131,9 @@
 // @mapinfo
 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: Map: %s (Zone: %s) | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Damage Rate Adjustments:
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)
--- a/conf/msg_conf/map_msg_chn.conf
+++ b/conf/msg_conf/map_msg_chn.conf
@@ -871,9 +871,9 @@
 // @mapinfo
 1038: 請至少輸入一個有效的列表數字 (使用方法: @mapinfo <0-3> [地圖名稱])
 1039: ------ 地圖資訊 ------
-1040: 地圖名: %s | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d
+1040: 地圖名: %s (Zone: %s) | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d | Vendings: %d
 1041: ------ 地圖旗標 ------
-1042: 城市地圖
+1042: Damage Rate Adjustments:
 1043: 可離線掛店
 1044: 不可離線掛店
 1045: 戰場 (類型 %d)
--- a/conf/msg_conf/map_msg_frn.conf
+++ b/conf/msg_conf/map_msg_frn.conf
@@ -883,9 +883,9 @@
 // @mapinfo
 1038: Entrez un numéro de la liste (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Nom de la Map: %s | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d
+1040: Nom de la Map: %s (Zone: %s) | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Damage Rate Adjustments:
 1043: Autotrade Activé
 1044: Autotrade Désactivé
 1045: Battlegrounds ON (type %d)
--- a/conf/msg_conf/map_msg_idn.conf
+++ b/conf/msg_conf/map_msg_idn.conf
@@ -970,9 +970,9 @@
 // @mapinfo
 1038: Harap masukkan setidaknya 1 pilihan. (Penggunaan: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
+1040: Map: %s (Zone: %s) | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
 1041: ------ Map Flags ------
-1042: Kota
+1042: Damage Rate Adjustments:
 1043: Autotrade diaktifkan
 1044: Autotrade dinonaktifkan
 1045: Battleground ON (tipe %d)
--- a/conf/msg_conf/map_msg_por.conf
+++ b/conf/msg_conf/map_msg_por.conf
@@ -1052,9 +1052,9 @@
 // @mapinfo
 1038: Digite pelo menos um número válido da lista (uso: @mapinfo <0-3> <mapa>).
 1039: ------ Informação do Mapa ------
-1040: Mapa: %s | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
+1040: Mapa: %s (Zona: %s) | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
 1041: ------ Map Flags ------
-1042: Mapa de Cidade
+1042: Ajustes na taxa de dano:
 1043: Autotrade Habilitado
 1044: Autotrade Desabilitado
 1045: Battlegrounds Habilitado (tipo %d)
--- a/conf/msg_conf/map_msg_rus.conf
+++ b/conf/msg_conf/map_msg_rus.conf
@@ -884,9 +884,9 @@
 // @mapinfo
 1038: Введите хотя бы один номер (Использование: @mapinfo <0-3> <локация>).
 1039: ------ Информация о локации ------
-1040: Название локации: %s | Игроки: %d | НИП: %d | Чаты: %d
+1040: Название локации: %s (Zone: %s) | Игроки: %d | НИП: %d | Чаты: %d | Vendings: %d
 1041: ------ Мапфлаги ------
-1042: Столица
+1042: Damage Rate Adjustments:
 1043: Autotrade Разрешён
 1044: Autotrade Запрещён
 1045: Battlegrounds ВКЛЮЧЕНО (тип %d)
--- a/conf/msg_conf/map_msg_spn.conf
+++ b/conf/msg_conf/map_msg_spn.conf
@@ -1124,9 +1124,9 @@
 // @mapinfo
 1038: Introduce un número de la lista (instrucciones: @mapinfo <0-3> <mapa>).
 1039: ------ Información del mapa ------
-1040: Mapa: %s | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
+1040: Mapa: %s (Zona: %s) | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
 1041: ------ Opciones del mapa ------
-1042: Mapa de ciudad
+1042: Ajuste de ratios de daño:
 1043: Autotrade activado
 1044: Autotrade desactivado
 1045: Battleground activado (tipo %d)
--- a/conf/msg_conf/map_msg_tha.conf
+++ b/conf/msg_conf/map_msg_tha.conf
@@ -877,9 +877,9 @@
 // @mapinfo
 1038: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>א<EFBFBD>¢<EFBFBD><C2A2>ט<EFBFBD>§<EFBFBD>¹ט<C2B9><D798><EFBFBD>¹<EFBFBD>ט§¤ט<C2A4>¨<EFBFBD><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>¸<EFBFBD>ד×י: @mapinfo <0-3> <map>).
 1039: ------ <20><><EFBFBD><EFBFBD><EFBFBD>א<EFBFBD><D790><EFBFBD>´ב¼¹·<C2B9>ט ------
-1040: ב¼¹·<C2B9>ט: %s | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: ב¼¹·<C2B9>ט: %s (Zone: %s) | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Damage Rate Adjustments:
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)
--- a/db/import-tmpl/item_noequip.txt
+++ b/db/import-tmpl/item_noequip.txt
@@ -1,30 +0,0 @@
-// Forbidden Items Database
-// Defines restrictions on equipment, items, and cards in map types and zones.
-//
-// Structure of Database:
-// ItemID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-//
-// Passing negative value as flag will unset the flag instead.
-//
-// Examples:
-// 1201,1   // Knife can't be worn on normal maps
-// 608,4    // Yggdrasil Seed can't be consumed in both GvG and WoE Castles
-// 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
-// 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
-// 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
-// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
-
--- a/db/import-tmpl/job_noenter_map.txt
+++ b/db/import-tmpl/job_noenter_map.txt
@@ -1,28 +0,0 @@
-// Defines Job(s) that are restricted to enter map (by flag/zones)
-//
-// Structure of Database:
-// JobID,FlagZone,GroupLevelBypass
-//
-// JobID: See JOB_* constants or use job number
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
-//
-// NOTES:
-// - Restriction will be overwritten for multiple defines with the same Job ID
-// - The flag is used by 'jobcanentermap' script.
--- a/db/import-tmpl/map_zones.yml
+++ b/db/import-tmpl/map_zones.yml
@@ -0,0 +1,39 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2024 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program 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/>.
+#
+###########################################################################
+# Map Zone Database
+###########################################################################
+#
+# Map Zone Settings
+#
+###########################################################################
+# - Id                        Zone ID.
+#   DisabledCommands:         List of disabled @commands. (Default: null)
+#   DisabledSkills:           List of disabled skills. (Default: null)
+#   DisabledItems:            List of disabled items. (Default: null)
+#   DisabledStatuses:         List of disabled statuses. (Default: null)
+#   RestrictedJobs:           List of restricted jobs from entering zone. (Default: null)
+#   Maps:                     List of maps to apply the zone to.
+#   Mapflags:                 List of mapflags. (Default: null)
+#     - Flag                  Mapflag name.
+#       Value                 Value assigned to mapflag. (Default: true)
+###########################################################################
+
+Header:
+  Type: MAP_ZONES
+  Version: 1
--- a/db/import-tmpl/skill_nocast_db.txt
+++ b/db/import-tmpl/skill_nocast_db.txt
@@ -1,24 +0,0 @@
-// Forbidden Skills Database
-// Defines unusable skills in map types and zones.
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - cannot be used in normal maps
-// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-// 4    - cannot be used in GvG maps
-// 8    - cannot be used in Battleground maps
-// 16   - cannot be cloned (clones will not copy this skill)
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - cannot be used in zone 1 maps
-// 64   - cannot be used in zone 2 maps
-// 128  - cannot be used in zone 3 maps
-// 256  - cannot be used in zone 4 maps
-// 512  - cannot be used in zone 5 maps
-// 1024 - cannot be used in zone 6 maps
-// 2048 - cannot be used in zone 7 maps
-//
-// Example:
-// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
-
--- a/db/import-tmpl/status_disabled.txt
+++ b/db/import-tmpl/status_disabled.txt
@@ -1,25 +0,0 @@
-// Status Change Restriction Database
-//
-// Defines restrictions of status changes (SC).
-// Disabled SC will always be removed or fail to be inflicted on this map.
-//
-// Structure of Database:
-// SCType,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-//
-// Example:
-// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
-
--- a/db/map_zones.yml
+++ b/db/map_zones.yml
@@ -0,0 +1,47 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2024 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program 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/>.
+#
+###########################################################################
+# Map Zone Database
+###########################################################################
+#
+# Map Zone Settings
+#
+###########################################################################
+# - Id                        Zone ID.
+#   DisabledCommands:         List of disabled @commands. (Default: null)
+#   DisabledSkills:           List of disabled skills. (Default: null)
+#   DisabledItems:            List of disabled items. (Default: null)
+#   DisabledStatuses:         List of disabled statuses. (Default: null)
+#   RestrictedJobs:           List of restricted jobs from entering zone. (Default: null)
+#   Maps:                     List of maps to apply the zone to.
+#   Mapflags:                 List of mapflags. (Default: null)
+#     - Flag                  Mapflag name.
+#       Value                 Value assigned to mapflag. (Default: true)
+###########################################################################
+
+Header:
+  Type: MAP_ZONES
+  Version: 1
+
+Footer:
+  Imports:
+  - Path: db/pre-re/map_zones.yml
+    Mode: Prerenewal
+  - Path: db/re/map_zones.yml
+    Mode: Renewal
+  - Path: db/import/map_zones.yml
--- a/db/pre-re/item_noequip.txt
+++ b/db/pre-re/item_noequip.txt
@@ -1,83 +0,0 @@
-// Forbidden Items Database
-// Defines restrictions on equipment, items, and cards in map types and zones.
-//
-// Structure of Database:
-// ItemID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// Passing negative value as flag will unset the flag instead.
-//
-// Examples:
-// 1201,1   // Knife can't be worn on normal maps
-// 608,4    // Yggdrasil Seed can't be consumed in both GvG and WoE Castles
-// 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
-// 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
-// 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
-// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
-
-//----------------------------------------------------------------------------
-// Normal maps
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// PVP
-//----------------------------------------------------------------------------
-14529,2	//Greed_Scroll
-
-//----------------------------------------------------------------------------
-// GVG
-//----------------------------------------------------------------------------
-12218,4	//Assumptio_5_Scroll
-14529,4	//Greed_Scroll
-14590,4	//Pty_Assumptio_Scroll
-
-//----------------------------------------------------------------------------
-// Battlegrounds
-//----------------------------------------------------------------------------
-12218,8	//Assumptio_5_Scroll
-14590,8	//Pty_Assumptio_Scroll
-
-//----------------------------------------------------------------------------
-// Zone 1 - Aldebaran Turbo Track
-//----------------------------------------------------------------------------
-601,32	//Wing_Of_Fly
-605,32	//Anodyne
-506,32	//Green_Potion
-525,32	//Panacea
-
-//----------------------------------------------------------------------------
-// Zone 2 - Jail
-//----------------------------------------------------------------------------
-601,64	//Wing_Of_Fly
-602,64	//Wing_Of_Butterfly
-12212,64	//Giant_Fly_Wing
-14582,64	//WOB_Rune
-14583,64	//WOB_Schwaltz
-14584,64	//WOB_Rachel
-14585,64	//WOB_Local
-
-//----------------------------------------------------------------------------
-// Zone 3 - Izlude Battle Arena
-//----------------------------------------------------------------------------
-601,128	//Wing_Of_Fly
-
-//----------------------------------------------------------------------------
-// Zone 7 - Towns
-//----------------------------------------------------------------------------
-14529,2048	//Greed_Scroll
--- a/db/pre-re/job_noenter_map.txt
+++ b/db/pre-re/job_noenter_map.txt
@@ -1,28 +0,0 @@
-// Defines Job(s) that are restricted to enter map (by flag/zones)
-//
-// Structure of Database:
-// JobID,FlagZone,GroupLevelBypass
-//
-// JobID: See JOB_* constants or use job number
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
-//
-// NOTES:
-// - Restriction will be overwritten for multiple defines with the same Job ID
-// - The flag is used by 'jobcanentermap' script.
--- a/db/pre-re/map_zones.yml
+++ b/db/pre-re/map_zones.yml
--- a/db/pre-re/skill_nocast_db.txt
+++ b/db/pre-re/skill_nocast_db.txt
@@ -1,176 +0,0 @@
-// Forbidden Skills Database
-// Defines unusable skills in map types and zones.
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - cannot be used in normal maps
-// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-// 4    - cannot be used in GvG maps
-// 8    - cannot be used in Battleground maps
-// 16   - cannot be used in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - cannot be used in zone 1 maps
-// 64   - cannot be used in zone 2 maps
-// 128  - cannot be used in zone 3 maps
-// 256  - cannot be used in zone 4 maps
-// 512  - cannot be used in zone 5 maps
-// 1024 - cannot be used in zone 6 maps
-// 2048 - cannot be used in zone 7 maps
-// 4096 - cannot be used in zone 8 maps
-//
-// Example:
-// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
-
-//----------------------------------------------------------------------------
-// Normal
-//----------------------------------------------------------------------------
-2422,1	//WM_LULLABY_DEEPSLEEP
-2423,1	//WM_SIRCLEOFNATURE
-2430,1	//WM_SATURDAY_NIGHT_FEVER
-2455,1	//SO_ARRULLO
-
-//----------------------------------------------------------------------------
-// PVP
-//----------------------------------------------------------------------------
-1013,2	//BS_GREED
-
-//----------------------------------------------------------------------------
-// GVG
-//----------------------------------------------------------------------------
-26,4	//AL_TELEPORT
-27,4	//AL_WARP
-87,4	//WZ_ICEWALL
-150,4	//TF_BACKSLIDING
-219,4	//RG_INTIMIDATE
-336,4	//WE_CALLPARTNER
-361,4	//HP_ASSUMPTIO
-362,4	//HP_BASILICA
-395,4	//CG_MOONLIT
-409,4	//WE_CALLPARENT
-410,4	//WE_CALLBABY
-491,4	//CR_CULTIVATION
-530,4	//NJ_KIRIKAGE
-691,4	//CASH_ASSUMPTIO
-1013,4	//BS_GREED
-2300,4	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Battlegrounds
-//----------------------------------------------------------------------------
-26,8	//AL_TELEPORT
-27,8	//AL_WARP
-87,8	//WZ_ICEWALL
-150,8	//TF_BACKSLIDING
-219,8	//RG_INTIMIDATE
-264,8	//MO_BODYRELOCATION
-336,8	//WE_CALLPARTNER
-361,8	//HP_ASSUMPTIO
-362,8	//HP_BASILICA
-395,8	//CG_MOONLIT
-409,8	//WE_CALLPARENT
-410,8	//WE_CALLBABY
-491,8	//CR_CULTIVATION
-411,8	//TK_RUN
-426,8	//TK_HIGHJUMP
-427,8	//SG_FEEL
-428,8	//SG_SUN_WARM
-429,8	//SG_MOON_WARM
-430,8	//SG_STAR_WARM
-431,8	//SG_SUN_COMFORT
-432,8	//SG_MOON_COMFORT
-433,8	//SG_STAR_COMFORT
-434,8	//SG_HATE
-435,8	//SG_SUN_ANGER
-436,8	//SG_MOON_ANGER
-437,8	//SG_STAR_ANGER
-438,8	//SG_SUN_BLESS
-439,8	//SG_MOON_BLESS
-440,8	//SG_STAR_BLESS
-530,8	//NJ_KIRIKAGE
-691,8	//CASH_ASSUMPITO
-2300,8	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Mixed
-//----------------------------------------------------------------------------
-488,3	//CG_HERMODE
-3013,3	//KO_KYOUGAKU
-
-//----------------------------------------------------------------------------
-// Zone 1 - Aldebaran Turbo Track
-//----------------------------------------------------------------------------
-8,32	//SM_ENDURE
-26,32	//AL_TELEPORT
-27,32	//AL_WARP
-35,32	//AL_CURE
-51,32	//TF_HIDING
-87,32	//WZ_ICEWALL
-135,32	//AS_CLOAKING
-219,32	//RG_INTIMIDATE
-264,32	//MO_BODYRELOCATION
-357,32	//LK_CONCENTRATION
-359,32	//LK_BERSERK
-362,32	//HP_BASILICA
-387,32	//WS_CARTBOOST
-389,32	//ST_CHASEWALK
-395,32	//CG_MOONLIT
-2300,32	//SC_DIMENSIONDOOR
-2478,32	//GN_CARTBOOST
-
-//----------------------------------------------------------------------------
-// Zone 2 - Jail
-//----------------------------------------------------------------------------
-421,64	//TK_JUMPKICK
-426,64	//TK_HIGHJUMP
-
-//----------------------------------------------------------------------------
-// Zone 3 - Izlude Battle Arena
-//----------------------------------------------------------------------------
-219,128 //RG_INTIMIDATE
-26,128	//AL_TELEPORT
-2300,128	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 4 - WoE:SE
-//----------------------------------------------------------------------------
-426,256 //TK_HIGHJUMP
-290,256	//SA_ABRACADABRA
-
-//----------------------------------------------------------------------------
-// Zone 5 - Sealed Shrine
-//----------------------------------------------------------------------------
-12,512	//MG_SAFETYWALL
-26,512	//AL_TELEPORT
-219,512	//RG_INTIMIDATE
-361,512	//HP_ASSUMPTIO
-691,512	//CASH_ASSUMPTIO
-2294,512	//SC_IGNORANCE
-2300,512	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
-//----------------------------------------------------------------------------
-26,1024	//AL_TELEPORT
-87,1024	//WZ_ICEWALL
-219,1024	//RG_INTIMIDATE
-405,1024	//PF_SPIDERWEB
-674,1024	//NPC_EXPULSION
-2294,1024	//SC_IGNORANCE
-2300,1024	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 7 - Towns
-//----------------------------------------------------------------------------
-232,2048	//AM_CANNIBALIZE
-233,2048	//AM_SPHEREMINE
-491,2048	//CR_CULTIVATION
-1013,2048	//BS_GREED
-2299,2048	//SC_MANHOLE
-2300,2048	//SC_DIMENSIONDOOR
-2301,2048	//SC_CHAOSPANIC
-2303,2048	//SC_BLOODYLUST
-2419,2048	//WM_POEMOFNETHERWORLD
-2482,2048	//GN_WALLOFTHORN
-2493,2048	//GN_SLINGITEM
--- a/db/re/item_db_equip.yml
+++ b/db/re/item_db_equip.yml
@@ -83053,7 +83053,7 @@ Body:
      Hunter: true
      Rogue: true
    Locations:
-      Right_Hand: true
+      Both_Hand: true
    WeaponLevel: 4
    EquipLevelMin: 70
    Refineable: true
--- a/db/re/job_noenter_map.txt
+++ b/db/re/job_noenter_map.txt
@@ -1,136 +0,0 @@
-// Defines Job(s) that are restricted to enter map (by flag/zones)
-//
-// Structure of Database:
-// JobID,FlagZone,GroupLevelBypass
-//
-// JobID: See JOB_* constants or use job number
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
-//
-// NOTES:
-// - Restriction will be overwritten for multiple defines with the same Job ID
-// - The flag is used by 'jobcanentermap' script.
-
-JOB_RUNE_KNIGHT,4112,100
-JOB_WARLOCK,4112,100
-JOB_RANGER,4112,100
-JOB_ARCH_BISHOP,4112,100
-JOB_MECHANIC,4112,100
-JOB_GUILLOTINE_CROSS,4112,100
-
-JOB_RUNE_KNIGHT_T,4112,100
-JOB_WARLOCK_T,4112,100
-JOB_RANGER_T,4112,100
-JOB_ARCH_BISHOP_T,4112,100
-JOB_MECHANIC_T,4112,100
-JOB_GUILLOTINE_CROSS_T,4112,100
-
-JOB_ROYAL_GUARD,4112,100
-JOB_SORCERER,4112,100
-JOB_MINSTREL,4112,100
-JOB_WANDERER,4112,100
-JOB_SURA,4112,100
-JOB_GENETIC,4112,100
-JOB_SHADOW_CHASER,4112,100
-
-JOB_ROYAL_GUARD_T,4112,100
-JOB_SORCERER_T,4112,100
-JOB_MINSTREL_T,4112,100
-JOB_WANDERER_T,4112,100
-JOB_SURA_T,4112,100
-JOB_GENETIC_T,4112,100
-JOB_SHADOW_CHASER_T,4112,100
-
-JOB_RUNE_KNIGHT2,4112,100
-JOB_RUNE_KNIGHT_T2,4112,100
-JOB_ROYAL_GUARD2,4112,100
-JOB_ROYAL_GUARD_T2,4112,100
-JOB_RANGER2,4112,100
-JOB_RANGER_T2,4112,100
-JOB_MECHANIC2,4112,100
-JOB_MECHANIC_T2,4112,100
-
-JOB_BABY_RUNE_KNIGHT,4112,100
-JOB_BABY_WARLOCK,4112,100
-JOB_BABY_RANGER,4112,100
-JOB_BABY_ARCH_BISHOP,4112,100
-JOB_BABY_MECHANIC,4112,100
-JOB_BABY_GUILLOTINE_CROSS,4112,100
-JOB_BABY_ROYAL_GUARD,4112,100
-JOB_BABY_SORCERER,4112,100
-JOB_BABY_MINSTREL,4112,100
-JOB_BABY_WANDERER,4112,100
-JOB_BABY_SURA,4112,100
-JOB_BABY_GENETIC,4112,100
-JOB_BABY_SHADOW_CHASER,4112,100
-
-JOB_BABY_RUNE_KNIGHT2,4112,100
-JOB_BABY_ROYAL_GUARD2,4112,100
-JOB_BABY_RANGER2,4112,100
-JOB_BABY_MECHANIC2,4112,100
-
-JOB_SUPER_NOVICE_E,4112,100
-JOB_SUPER_BABY_E,4112,100
-
-JOB_KAGEROU,4112,100
-JOB_BABY_KAGEROU,4112,100
-JOB_OBORO,4112,100
-JOB_BABY_OBORO,4112,100
-
-JOB_REBELLION,4112,100
-JOB_BABY_REBELLION,4112,100
-
-JOB_SUMMONER,4112,100
-JOB_BABY_SUMMONER,4112,100
-
-JOB_STAR_EMPEROR,4112,100
-JOB_SOUL_REAPER,4112,100
-JOB_BABY_STAR_EMPEROR,4112,100
-JOB_BABY_SOUL_REAPER,4112,100
-JOB_STAR_EMPEROR2,4112,100
-JOB_BABY_STAR_EMPEROR2,4112,100
-
-JOB_DRAGON_KNIGHT,4112,100
-JOB_MEISTER,4112,100
-JOB_SHADOW_CROSS,4112,100
-JOB_ARCH_MAGE,4112,100
-JOB_CARDINAL,4112,100
-JOB_WINDHAWK,4112,100
-JOB_IMPERIAL_GUARD,4112,100
-JOB_BIOLO,4112,100
-JOB_ABYSS_CHASER,4112,100
-JOB_ELEMENTAL_MASTER,4112,100
-JOB_INQUISITOR,4112,100
-JOB_TROUBADOUR,4112,100
-JOB_TROUVERE,4112,100
-
-JOB_WINDHAWK2,4112,100
-JOB_MEISTER2,4112,100
-JOB_DRAGON_KNIGHT2,4112,100
-JOB_IMPERIAL_GUARD2,4112,100
-
-JOB_SKY_EMPEROR,4112,100
-JOB_SOUL_ASCETIC,4112,100
-JOB_SHINKIRO,4112,100
-JOB_SHIRANUI,4112,100
-JOB_NIGHT_WATCH,4112,100
-JOB_HYPER_NOVICE,4112,100
-JOB_SPIRIT_HANDLER,4112,100
-
-JOB_SKY_EMPEROR2,4112,100
--- a/db/re/map_zones.yml
+++ b/db/re/map_zones.yml
--- a/db/re/skill_nocast_db.txt
+++ b/db/re/skill_nocast_db.txt
@@ -1,249 +0,0 @@
-// Forbidden Skills Database
-// Defines unusable skills in map types and zones.
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - cannot be used in normal maps
-// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-// 4    - cannot be used in GvG maps
-// 8    - cannot be used in Battleground maps
-// 16   - cannot be used in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - cannot be used in zone 1 maps
-// 64   - cannot be used in zone 2 maps
-// 128  - cannot be used in zone 3 maps
-// 256  - cannot be used in zone 4 maps
-// 512  - cannot be used in zone 5 maps
-// 1024 - cannot be used in zone 6 maps
-// 2048 - cannot be used in zone 7 maps
-// 4096 - cannot be used in zone 8 maps
-// 8192 - cannot be used in zone 9 maps
-//
-// Example:
-// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
-
-//----------------------------------------------------------------------------
-// Normal
-//----------------------------------------------------------------------------
-308,1	//BD_ETERNALCHAOS
-311,1	//BD_ROKISWEIL
-317,1	//BA_DISSONANCE
-325,1	//DC_UGLYDANCE
-328,1	//DC_DONTFORGETME
-2422,1	//WM_LULLABY_DEEPSLEEP
-2423,1	//WM_SIRCLEOFNATURE
-2425,1	//WM_GLOOMYDAY
-2429,1	//WM_SOUND_OF_DESTRUCTION
-2430,1	//WM_SATURDAY_NIGHT_FEVER
-2432,1	//WM_MELODYOFSINK
-2433,1	//WM_BEYOND_OF_WARCRY
-2455,1	//SO_ARRULLO
-2299,1	//SC_MANHOLE
-5359,1	//TR_ROKI_CAPRICCIO
-5363,1	//TR_NIPELHEIM_REQUIEM
-5367,1	//EM_ACTIVITY_BURN
-
-//----------------------------------------------------------------------------
-// PVP
-//----------------------------------------------------------------------------
-2300,2	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// GVG
-//----------------------------------------------------------------------------
-26,4	//AL_TELEPORT
-27,4	//AL_WARP
-87,4	//WZ_ICEWALL
-150,4	//TF_BACKSLIDING
-219,4	//RG_INTIMIDATE
-336,4	//WE_CALLPARTNER
-361,4	//HP_ASSUMPTIO
-362,4	//HP_BASILICA
-395,4	//CG_MOONLIT
-409,4	//WE_CALLPARENT
-410,4	//WE_CALLBABY
-491,4	//CR_CULTIVATION
-530,4	//NJ_KIRIKAGE
-691,4	//CASH_ASSUMPTIO
-2300,4	//SC_DIMENSIONDOOR
-5063,4	//WE_CALLALLFAMILY
-462,4	//SL_KAIZEL
-
-//----------------------------------------------------------------------------
-// Battlegrounds
-//----------------------------------------------------------------------------
-26,8	//AL_TELEPORT
-27,8	//AL_WARP
-87,8	//WZ_ICEWALL
-150,8	//TF_BACKSLIDING
-219,8	//RG_INTIMIDATE
-264,8	//MO_BODYRELOCATION
-336,8	//WE_CALLPARTNER
-361,8	//HP_ASSUMPTIO
-362,8	//HP_BASILICA
-395,8	//CG_MOONLIT
-409,8	//WE_CALLPARENT
-410,8	//WE_CALLBABY
-411,8	//TK_RUN
-426,8	//TK_HIGHJUMP
-427,8	//SG_FEEL
-428,8	//SG_SUN_WARM
-429,8	//SG_MOON_WARM
-430,8	//SG_STAR_WARM
-431,8	//SG_SUN_COMFORT
-432,8	//SG_MOON_COMFORT
-433,8	//SG_STAR_COMFORT
-434,8	//SG_HATE
-435,8	//SG_SUN_ANGER
-436,8	//SG_MOON_ANGER
-437,8	//SG_STAR_ANGER
-438,8	//SG_SUN_BLESS
-439,8	//SG_MOON_BLESS
-440,8	//SG_STAR_BLESS
-491,8	//CR_CULTIVATION
-530,8	//NJ_KIRIKAGE
-691,8	//CASH_ASSUMPITO
-2300,8	//SC_DIMENSIONDOOR
-5063,8	//WE_CALLALLFAMILY
-5023,8	//SU_LOPE
-462,8	//SL_KAIZEL
-
-//----------------------------------------------------------------------------
-// Mixed
-//----------------------------------------------------------------------------
-488,3	//CG_HERMODE
-3013,3	//KO_KYOUGAKU
-
-//----------------------------------------------------------------------------
-// Restricted in WOE:TE Castles
-//----------------------------------------------------------------------------
-8,16	// SM_ENDURE
-26,16	// AL_TELEPORT
-27,16	// AL_WARP
-41,16	// MC_VENDING
-87,16	// WZ_ICEWALL
-147,16	// AC_MAKINGARROW
-150,16	// TF_BACKSLIDING
-211,16	// RG_STEALCOIN
-219,16	// RG_INTIMIDATE
-336,16	// WE_CALLPARTNER
-359,16	// LK_BERSERK
-361,16	// HP_ASSUMPTIO
-362,16	// HP_BASILICA
-389,16	// ST_CHASEWALK
-395,16	// CG_MOONLIT
-396,16	// CG_MARIONETTE
-409,16	// WE_CALLPARENT
-410,16	// WE_CALLBABY
-426,16	// TK_HIGHJUMP
-491,16	//CR_CULTIVATION
-529,16	// NJ_SHADOWJUMP
-// 530,16	// NJ_KIRIKAGE
-691,16	// CASH_ASSUMPTIO
-2300,16	// SC_DIMENSIONDOOR
-//!TODO: More 3rd Class skills
-// 2293,16	// SC_GROOMY
-// 2296,16	// SC_UNLUCKY
-// 2494,16	// GN_CHANGEMATERIAL
-// 2462,16	// SO_EL_ANALYSIS
-5063,16	//WE_CALLALLFAMILY
-
-//----------------------------------------------------------------------------
-// Zone 1 - Aldebaran Turbo Track
-//----------------------------------------------------------------------------
-8,32	//SM_ENDURE
-26,32	//AL_TELEPORT
-27,32	//AL_WARP
-35,32	//AL_CURE
-51,32	//TF_HIDING
-87,32	//WZ_ICEWALL
-135,32	//AS_CLOAKING
-219,32	//RG_INTIMIDATE
-264,32	//MO_BODYRELOCATION
-357,32	//LK_CONCENTRATION
-359,32	//LK_BERSERK
-362,32	//HP_BASILICA
-387,32	//WS_CARTBOOST
-389,32	//ST_CHASEWALK
-395,32	//CG_MOONLIT
-2300,32	//SC_DIMENSIONDOOR
-2478,32	//GN_CARTBOOST
-
-//----------------------------------------------------------------------------
-// Zone 2 - Jail
-//----------------------------------------------------------------------------
-421,64	//TK_JUMPKICK
-426,64	//TK_HIGHJUMP
-5023,64	//SU_LOPE
-
-//----------------------------------------------------------------------------
-// Zone 3 - Izlude Battle Arena
-//----------------------------------------------------------------------------
-219,128 //RG_INTIMIDATE
-26,128	//AL_TELEPORT
-2300,128	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 4 - WoE:SE
-//----------------------------------------------------------------------------
-426,256 //TK_HIGHJUMP
-290,256	//SA_ABRACADABRA
-5023,256	//SU_LOPE
-462,256	//SL_KAIZEL
-
-//----------------------------------------------------------------------------
-// Zone 5 - Sealed Shrine
-//----------------------------------------------------------------------------
-12,512	//MG_SAFETYWALL
-26,512	//AL_TELEPORT
-219,512	//RG_INTIMIDATE
-361,512	//HP_ASSUMPTIO
-691,512	//CASH_ASSUMPTIO
-2294,512	//SC_IGNORANCE
-2300,512	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
-//----------------------------------------------------------------------------
-26,1024	//AL_TELEPORT
-87,1024	//WZ_ICEWALL
-219,1024	//RG_INTIMIDATE
-405,1024	//PF_SPIDERWEB
-674,1024	//NPC_EXPULSION
-2294,1024	//SC_IGNORANCE
-2300,1024	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 7 - Towns
-//----------------------------------------------------------------------------
-232,2048	//AM_CANNIBALIZE
-233,2048	//AM_SPHEREMINE
-491,2048	//CR_CULTIVATION
-1013,2048	//BS_GREED
-2419,2048	//WM_POEMOFNETHERWORLD
-2482,2048	//GN_WALLOFTHORN
-2493,2048	//GN_SLINGITEM
-
-//----------------------------------------------------------------------------
-// Zone 8 - WOE:TE Dungeons
-//----------------------------------------------------------------------------
-336,4096 // WE_CALLPARTNER
-409,4096 // WE_CALLPARENT
-410,4096 // WE_CALLBABY
-5063,4096	//WE_CALLALLFAMILY
-
-//----------------------------------------------------------------------------
-// Zone 9 - Wave Mode
-//----------------------------------------------------------------------------
-26,8192	//AL_TELEPORT
-87,8192	//WZ_ICEWALL
-197,8192	//NPC_EMOTION
-219,8192	//RG_INTIMIDATE
-405,8192	//PF_SPIDERWEB
-474,8192	//NPC_EMOTION_ON
-674,8192	//NPC_EXPULSION
-2284,8192	//SC_FATALMENACE
-2294,8192	//SC_IGNORANCE
-2300,8192	//SC_DIMENSIONDOOR
--- a/db/status_disabled.txt
+++ b/db/status_disabled.txt
@@ -1,505 +0,0 @@
-// Status Change Restriction Database
-//
-// Defines restrictions of status changes (SC).
-// Disabled SC will always be removed or fail to be inflicted on this map.
-//
-// Structure of Database:
-// SCType,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// Example:
-// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
-
-//----------------------------------------------------------------------------
-// Disabled/Removed statuses in WoE:TE Castles (16)
-//----------------------------------------------------------------------------
-SC_ENDURE,16
-SC_BERSERK,16
-SC_ASSUMPTIO,16
-
-// RUNE_KNIGHT
-SC_ENCHANTBLADE,16
-SC_DEATHBOUND,16
-SC_MILLENNIUMSHIELD,16
-SC_CRUSHSTRIKE,16
-SC_REFRESH,16
-SC_REUSE_REFRESH,16
-SC_GIANTGROWTH,16
-SC_STONEHARDSKIN,16
-SC_VITALITYACTIVATION,16
-SC_STORMBLAST,16
-SC_FIGHTINGSPIRIT,16
-SC_ABUNDANCE,16
-
-// ARCH_BISHOP
-SC_ADORAMUS,16
-SC_EPICLESIS,16
-SC_ORATIO,16
-SC_LAUDAAGNUS,16
-SC_LAUDARAMUS,16
-SC_RENOVATIO,16
-SC_EXPIATIO,16
-SC_DUPLELIGHT,16
-SC_SECRAMENT,16
-
-// WARLOCK
-SC_WHITEIMPRISON,16
-SC_MARSHOFABYSS,16
-SC_RECOGNIZEDSPELL,16
-SC_STASIS,16
-SC_SPHERE_1,16
-SC_SPHERE_2,16
-SC_SPHERE_3,16
-SC_SPHERE_4,16
-SC_SPHERE_5,16
-SC_READING_SB,16
-SC_FREEZE_SP,16
-SC_SPELLBOOK1,16
-SC_SPELLBOOK2,16
-SC_SPELLBOOK3,16
-SC_SPELLBOOK4,16
-SC_SPELLBOOK5,16
-SC_SPELLBOOK6,16
-SC_MAXSPELLBOOK,16
-
-// RANGER
-SC_FEARBREEZE,16
-SC_ELECTRICSHOCKER,16
-SC_WUGDASH,16
-SC_BITE,16
-SC_CAMOUFLAGE,16
-
-// MECHANIC
-SC_ACCELERATION,16
-SC_HOVERING,16
-SC_SHAPESHIFT,16
-SC_INFRAREDSCAN,16
-SC_ANALYZE,16
-SC_MAGNETICFIELD,16
-SC_NEUTRALBARRIER,16
-SC_NEUTRALBARRIER_MASTER,16
-SC_STEALTHFIELD,16
-SC_STEALTHFIELD_MASTER,16
-SC_OVERHEAT,16
-SC_OVERHEAT_LIMITPOINT,16
-
-// GUILLOTINE_CROSS
-SC_VENOMIMPRESS,16
-SC_POISONINGWEAPON,16
-SC_WEAPONBLOCKING,16
-SC_CLOAKINGEXCEED,16
-SC_HALLUCINATIONWALK,16
-SC_HALLUCINATIONWALK_POSTDELAY,16
-SC_ROLLINGCUTTER,16
-SC_TOXIN,16
-SC_PARALYSE,16
-SC_VENOMBLEED,16
-SC_MAGICMUSHROOM,16
-SC_DEATHHURT,16
-SC_PYREXIA,16
-SC_OBLIVIONCURSE,16
-SC_LEECHESEND,16
-
-// ROYAL_GUARD
-SC_REFLECTDAMAGE,16
-SC_FORCEOFVANGUARD,16
-SC_SHIELDSPELL_HP,16
-SC_SHIELDSPELL_SP,16
-SC_SHIELDSPELL_ATK,16
-SC_EXEEDBREAK,16
-SC_PRESTIGE,16
-SC_BANDING,16
-SC_BANDING_DEFENCE,16
-SC_EARTHDRIVE,16
-SC_INSPIRATION,16
-
-// SORCERER
-SC_SPELLFIST,16
-SC_CRYSTALIZE,16
-SC_STRIKING,16
-SC_WARMER,16
-SC_VACUUM_EXTREME,16
-SC_PROPERTYWALK,16
-SC_VACUUM_EXTREME_POSTDELAY,16
-
-// MINSTREL
-SC_SWINGDANCE,16
-SC_SYMPHONYOFLOVER,16
-SC_MOONLITSERENADE,16
-SC_RUSHWINDMILL,16
-SC_ECHOSONG,16
-SC_HARMONIZE,16
-
-// WANDERER
-SC_VOICEOFSIREN,16
-SC_DEEPSLEEP,16
-SC_SIRCLEOFNATURE,16
-SC_GLOOMYDAY,16
-SC_GLOOMYDAY_SK,16
-
-// MINSTREL & WANDERER
-SC_SONGOFMANA,16
-SC_DANCEWITHWUG,16
-SC_SATURDAYNIGHTFEVER,16
-SC_LERADSDEW,16
-SC_MELODYOFSINK,16
-SC_BEYONDOFWARCRY,16
-SC_UNLIMITEDHUMMINGVOICE,16
-
-// SURA
-SC_SITDOWN_FORCE,16
-SC_NETHERWORLD,16
-SC_CRESCENTELBOW,16
-SC_CURSEDCIRCLE_ATKER,16
-SC_CURSEDCIRCLE_TARGET,16
-SC_LIGHTNINGWALK,16
-SC_RAISINGDRAGON,16
-SC_GT_ENERGYGAIN,16
-SC_GT_CHANGE,16
-SC_GT_REVITALIZE,16
-SC_GN_CARTBOOST,16
-
-// GENETIC
-SC_THORNSTRAP,16
-SC_BLOODSUCKER,16
-SC_SMOKEPOWDER,16
-SC_TEARGAS,16
-SC_MANDRAGORA,16
-SC_STOMACHACHE,16
-SC_MYSTERIOUS_POWDER,16
-SC_MELON_BOMB,16
-SC_BANANA_BOMB,16
-SC_BANANA_BOMB_SITDOWN,16
-SC_SAVAGE_STEAK,16
-SC_COCKTAIL_WARG_BLOOD,16
-SC_MINOR_BBQ,16
-SC_SIROMA_ICE_TEA,16
-SC_DROCERA_HERB_STEAMED,16
-SC_PUTTI_TAILS_NOODLES,16
-SC_BOOST500,16
-SC_FULL_SWING_K,16
-SC_MANA_PLUS,16
-SC_MUSTLE_M,16
-SC_LIFE_FORCE_F,16
-SC_EXTRACT_WHITE_POTION_Z,16
-SC_VITATA_500,16
-SC_EXTRACT_SALAMINE_JUICE,16
-
-// Homunculus
-SC_STYLE_CHANGE,16
-SC_TINDER_BREAKER,16
-SC_TINDER_BREAKER2,16
-SC_CBC,16
-SC_EQC,16
-SC_GOLDENE_FERSE,16
-SC_ANGRIFFS_MODUS,16
-SC_OVERED_BOOST,16
-SC_LIGHT_OF_REGENE,16
-SC_ASH,16
-SC_GRANITIC_ARMOR,16
-SC_MAGMA_FLOW,16
-SC_PYROCLASTIC,16
-SC_PARALYSIS,16
-SC_PAIN_KILLER,16
-
-// SHADOW_CHASER
-SC__REPRODUCE,16
-SC__AUTOSHADOWSPELL,16
-SC__SHADOWFORM,16
-SC__BODYPAINT,16
-SC__INVISIBILITY,16
-SC__DEADLYINFECT,16
-SC__ENERVATION,16
-SC__GROOMY,16
-SC__IGNORANCE,16
-SC__LAZINESS,16
-SC__UNLUCKY,16
-SC__WEAKNESS,16
-SC__STRIPACCESSORY,16
-SC__MANHOLE,16
-SC__BLOODYLUST,16
-
-// Elemental SORCERER
-SC_CIRCLE_OF_FIRE,16
-SC_CIRCLE_OF_FIRE_OPTION,16
-SC_FIRE_CLOAK,16
-SC_FIRE_CLOAK_OPTION,16
-SC_WATER_SCREEN,16
-SC_WATER_SCREEN_OPTION,16
-SC_WATER_DROP,16
-SC_WATER_DROP_OPTION,16
-SC_WATER_BARRIER,16
-SC_WIND_STEP,16
-SC_WIND_STEP_OPTION,16
-SC_WIND_CURTAIN,16
-SC_WIND_CURTAIN_OPTION,16
-SC_ZEPHYR,16
-SC_SOLID_SKIN,16
-SC_SOLID_SKIN_OPTION,16
-SC_STONE_SHIELD,16
-SC_STONE_SHIELD_OPTION,16
-SC_POWER_OF_GAIA,16
-SC_PYROTECHNIC,16
-SC_PYROTECHNIC_OPTION,16
-SC_HEATER,16
-SC_HEATER_OPTION,16
-SC_TROPIC,16
-SC_TROPIC_OPTION,16
-SC_AQUAPLAY,16
-SC_AQUAPLAY_OPTION,16
-SC_COOLER,16
-SC_COOLER_OPTION,16
-SC_CHILLY_AIR,16
-SC_CHILLY_AIR_OPTION,16
-SC_GUST,16
-SC_GUST_OPTION,16
-SC_BLAST,16
-SC_BLAST_OPTION,16
-SC_WILD_STORM,16
-SC_WILD_STORM_OPTION,16
-SC_PETROLOGY,16
-SC_PETROLOGY_OPTION,16
-SC_CURSED_SOIL,16
-SC_CURSED_SOIL_OPTION,16
-SC_UPHEAVAL,16
-SC_UPHEAVAL_OPTION,16
-SC_TIDAL_WEAPON,16
-SC_TIDAL_WEAPON_OPTION,16
-SC_ROCK_CRUSHER,16
-SC_ROCK_CRUSHER_ATK,16
-SC_FIRE_INSIGNIA,16
-SC_WATER_INSIGNIA,16
-SC_WIND_INSIGNIA,16
-SC_EARTH_INSIGNIA,16
-
-// KAGEROU / OBORO
-SC_MEIKYOUSISUI,16
-SC_JYUMONJIKIRI,16
-SC_KYOUGAKU,16
-SC_IZAYOI,16
-SC_ZENKAI,16
-SC_KAGEHUMI,16
-SC_KYOMU,16
-SC_KAGEMUSYA,16
-SC_ZANGETSU,16
-SC_GENSOU,16
-SC_AKAITSUKI,16
-
-//Summoner
-SC_SUHIDE,16
-SC_SU_STOOP,16
-SC_SPRITEMABLE,16
-SC_CATNIPPOWDER,16
-SC_SV_ROOTTWIST,16
-SC_BITESCAR,16
-SC_ARCLOUSEDASH,16
-SC_TUNAPARTY,16
-SC_SHRIMP,16
-SC_FRESHSHRIMP,16
-
-// Rebellion
-SC_HEAT_BARREL,16
-SC_MAGICALBULLET,16
-SC_P_ALTER,16
-SC_E_CHAIN,16
-SC_C_MARKER,16
-SC_ANTI_M_BLAST,16
-SC_B_TRAP,16
-SC_H_MINE,16
-SC_QD_SHOT_READY,16
-
-// Star Emperor
-SC_LIGHTOFMOON,16
-SC_LIGHTOFSUN,16
-SC_LIGHTOFSTAR,16
-SC_LUNARSTANCE,16
-SC_UNIVERSESTANCE,16
-SC_SUNSTANCE,16
-SC_FLASHKICK,16
-SC_NEWMOON,16
-SC_STARSTANCE,16
-SC_DIMENSION,16
-SC_DIMENSION1,16
-SC_DIMENSION2,16
-SC_CREATINGSTAR,16
-SC_FALLINGSTAR,16
-SC_NOVAEXPLOSING,16
-SC_GRAVITYCONTROL,16
-
-// Soul Reaper
-SC_SOULCOLLECT,16
-SC_SOULREAPER,16
-SC_SOULUNITY,16
-SC_SOULSHADOW,16
-SC_SOULFAIRY,16
-SC_SOULFALCON,16
-SC_SOULGOLEM,16
-SC_SOULDIVISION,16
-SC_SOULENERGY,16
-SC_USE_SKILL_SP_SPA,16
-SC_USE_SKILL_SP_SHA,16
-SC_SP_SHA,16
-SC_SOULCURSE,16
-
-// Others
-SC_FEAR,16
-SC_BURNING,16
-SC_FREEZING,16
-SC_TEARGAS_SOB,16
-SC__FEINTBOMB,16
-SC__CHAOS,16
-
-// 4th Job Common Status
-SC_HANDICAPSTATE_DEEPBLIND,16
-SC_HANDICAPSTATE_DEEPSILENCE,16
-SC_HANDICAPSTATE_LASSITUDE,16
-SC_HANDICAPSTATE_FROSTBITE,16
-SC_HANDICAPSTATE_SWOONING,16
-SC_HANDICAPSTATE_LIGHTNINGSTRIKE,16
-SC_HANDICAPSTATE_CRYSTALLIZATION,16
-SC_HANDICAPSTATE_CONFLAGRATION,16
-SC_HANDICAPSTATE_MISFORTUNE,16
-SC_HANDICAPSTATE_DEADLYPOISON,16
-SC_HANDICAPSTATE_DEPRESSION,16
-SC_HANDICAPSTATE_HOLYFLAME,16
-
-// Dragon Knight
-SC_SERVANTWEAPON,16
-SC_SERVANT_SIGN,16
-SC_CHARGINGPIERCE,16
-SC_CHARGINGPIERCE_COUNT,16
-SC_DRAGONIC_AURA,16
-SC_VIGOR,16
-
-// Arch Mage
-SC_DEADLY_DEFEASANCE,16
-SC_CLIMAX_DES_HU,16
-SC_CLIMAX,16
-SC_CLIMAX_EARTH,16
-SC_CLIMAX_BLOOM,16
-SC_CLIMAX_CRYIMP,16
-
-// Windhawk
-SC_WINDSIGN,16
-SC_CRESCIVEBOLT,16
-SC_CALAMITYGALE,16
-
-// Cardinal
-SC_MEDIALE,16
-SC_A_VITA,16
-SC_A_TELUM,16
-SC_PRE_ACIES,16
-SC_COMPETENTIA,16
-SC_RELIGIO,16
-SC_BENEDICTUM,16
-
-// Meister
-SC_AXE_STOMP,16
-SC_A_MACHINE,16
-SC_D_MACHINE,16
-SC_ABR_BATTLE_WARIOR,16
-SC_ABR_DUAL_CANNON,16
-SC_ABR_MOTHER_NET,16
-SC_ABR_INFINITY,16
-
-// Shadow Cross
-SC_SHADOW_EXCEED,16
-SC_DANCING_KNIFE,16
-SC_POTENT_VENOM,16
-SC_SHADOW_SCAR,16
-SC_E_SLASH_COUNT,16
-SC_SHADOW_WEAPON,16
-
-// Imperial Guard
-SC_GUARD_STANCE,16
-SC_ATTACK_STANCE,16
-SC_GUARDIAN_S,16
-SC_REBOUND_S,16
-SC_HOLY_S,16
-SC_ULTIMATE_S,16
-SC_SPEAR_SCAR,16
-SC_SHIELD_POWER,16
-
-// Elemental Master
-SC_SPELL_ENCHANTING,16
-SC_SUMMON_ELEMENTAL_ARDOR,16
-SC_SUMMON_ELEMENTAL_DILUVIO,16
-SC_SUMMON_ELEMENTAL_PROCELLA,16
-SC_SUMMON_ELEMENTAL_TERREMOTUS,16
-SC_SUMMON_ELEMENTAL_SERPENS,16
-SC_ELEMENTAL_VEIL,16
-
-// Troubadour/Trouvere
-SC_MYSTIC_SYMPHONY,16
-SC_KVASIR_SONATA,16
-SC_SOUNDBLEND,16
-SC_GEF_NOCTURN,16
-SC_AIN_RHAPSODY,16
-SC_MUSICAL_INTERLUDE,16
-SC_JAWAII_SERENADE,16
-SC_PRON_MARCH,16
-SC_ROSEBLOSSOM,16
-
-// Inquisitor
-SC_POWERFUL_FAITH,16
-SC_SINCERE_FAITH,16
-SC_FIRM_FAITH,16
-SC_HOLY_OIL,16
-SC_FIRST_BRAND,16
-SC_SECOND_BRAND,16
-SC_SECOND_JUDGE,16
-SC_THIRD_EXOR_FLAME,16
-SC_FIRST_FAITH_POWER,16
-SC_MASSIVE_F_BLASTER,16
-
-// Biolo
-SC_PROTECTSHADOWEQUIP,16
-SC_RESEARCHREPORT,16
-SC_BO_HELL_DUSTY,16
-SC_BIONIC_WOODENWARRIOR,16
-SC_BIONIC_WOODEN_FAIRY,16
-SC_BIONIC_CREEPER,16
-SC_BIONIC_HELLTREE,16
-
-// Abyss Chaser
-SC_SHADOW_STRIP,16
-SC_ABYSS_DAGGER,16
-SC_ABYSSFORCEWEAPON,16
-SC_ABYSS_SLAYER,16
-
-// Super Elementals
-SC_FLAMETECHNIC,16
-SC_FLAMETECHNIC_OPTION,16
-SC_FLAMEARMOR,16
-SC_FLAMEARMOR_OPTION,16
-SC_COLD_FORCE,16
-SC_COLD_FORCE_OPTION,16
-SC_CRYSTAL_ARMOR,16
-SC_CRYSTAL_ARMOR_OPTION,16
-SC_GRACE_BREEZE,16
-SC_GRACE_BREEZE_OPTION,16
-SC_EYES_OF_STORM,16
-SC_EYES_OF_STORM_OPTION,16
-SC_EARTH_CARE,16
-SC_EARTH_CARE_OPTION,16
-SC_STRONG_PROTECTION,16
-SC_STRONG_PROTECTION_OPTION,16
-SC_DEEP_POISONING,16
-SC_DEEP_POISONING_OPTION,16
-SC_POISON_SHIELD,16
-SC_POISON_SHIELD_OPTION,16
--- a/doc/map_zones.txt
+++ b/doc/map_zones.txt
@@ -0,0 +1,76 @@
+//===== rAthena Documentation ================================
+//= Map Zone Structure
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Last Updated: ========================================
+//= 20240112
+//===== Description: =========================================
+//= This file describes the functions of map zones, which
+//= determine the behavior of a map in various situations.
+//============================================================
+
+---------------------------------------
+
+Id: Zone ID (constant). These are defined in e_map_type::clif.hpp.
+
+---------------------------------------
+
+DisabledCommands: @commands can be disabled for players below a certain group level.
+Setting the group level to 0 will remove from the DisabledCommands list. Useful for imports.
+
+  heal: 70 # Makes @heal usable only to those group level 70 and above.
+
+---------------------------------------
+
+DisabledSkills: Skills can be disabled for different game object types below a certain group level.
+Setting the group level to 0 will remove from the DisabledSkills list. Useful for imports.
+
+Object Types:
+Pc   - Player
+Mob  - Monster
+Hom  - Homunculus
+Mer  - Mercenary
+Elem - Elemental
+Npc  - NPC
+
+  - Skill: AL_TELEPORT #  Disables Teleport for players, monsters, homunculi, and mercenary.
+    Pc: 100
+    Mob: 100
+    Hom: 100
+    Mer: 100
+  - Skill: AL_WARP # Disables Warp Portal for players.
+    Pc: 100
+
+---------------------------------------
+
+DisabledItems: Items can be disabled from being used or equipped for players below a certain group level.
+Setting the group level to 0 will remove from the DisabledItems list. Useful for imports.
+
+  Apple: 100 # Apple will not be able to be consumed by anyone.
+  Cap: 100 # Cap will not be able to be equipped by anyone.
+  Hat: 0 # Hat will be able to be equipped by all. Useful for import.
+
+---------------------------------------
+
+DisabledStatuses: Statuses can be disabled in a zone for players below a certain group level. These
+statuses, if active, will be removed when entering a zone and will not be able to be re-applied while in the zone.
+Setting the group level to 0 will remove from the DisabledStatuses list. Useful for imports.
+
+  Endure: 100 # Endure will be disabled from activing and being applied within the zone.
+
+---------------------------------------
+
+RestrictedJobs: Jobs can be disabled from entering a zone for players below a certain group level.
+Setting the group level to 0 will remove from the RestrictedJobs list. Useful for imports.
+
+  Priest: 30 # Makes the Priest job unable to enter the map zone to those group level less than 30.
+
+---------------------------------------
+
+Mapflags: Mapflags that are applies to a zone. By default, the Value label is 1/true/on.
+
+  - Flag: NoTeleport # Sets the 'noteleport' mapflag to the zone.
+  - Flag: Skill_Duration
+	Value: AL_SANCTUARY,400 # Sets the 'skill_duration' mapflag to the zone.
+  - Flag: NoMemo # Removes the 'nomemo' mapflag to the zone. Useful for import.
+    Clear: true
--- a/doc/mapflags.txt
+++ b/doc/mapflags.txt
@@ -174,24 +174,6 @@ Disables skill usage on a map.

 ---------------------------------------

-*restricted	<zone>
-
-Disables certain items and skills on a map through a specified zone number. The zone databases are
-located in 'db/(pre-)re/item_noequip.txt' and 'db/(pre-)re/skill_nocast_db.txt', both of which
-contain explanations and examples of how this mapflag is used.
-
-Restricted Zones:
-1 - Aldebaran Turbo Track
-2 - Jail
-3 - Izlude Battle Arena
-4 - WoE:SE Maps
-5 - Sealed Shrine
-6 - Instances: Endless Tower, Orc's Memory, Nidhoggr's Instance
-7 - Towns
-8 - WOE:TE Dungeons
-
---------------------------------------
-
 *monster_noteleport

 Prevents monsters from teleporting on a map, including through the skill RG_INTIMIDATE.
@@ -300,6 +282,16 @@ Disable RODex on a map.

 ---------------------------------------

+*nobonusitemdrop
+
+Disable the following item bonuses on a map.
+ - bAddMonsterDropItem
+ - bAddClassDropItem
+ - bAddMonsterDropItemGroup
+ - bAddClassDropItemGroup
+
+---------------------------------------
+
 =====================
 | 2. Battle-related |
 =====================
@@ -396,6 +388,69 @@ prtg_cas01	mapflag	skill_duration	HT_ANKLESNARE,400

 ---------------------------------------

+*invincible_time {<duration>}
+
+Sets the duration (in milliseconds) for when a player loads onto a map with how long they are invincible for.
+The duration is cancelled if the player walks or interacts in any fashion.
+
+Duration defaults to 5 seconds if the value is not specified.
+
+---------------------------------------
+
+*noknockback
+
+Disables knockback on a map.
+
+---------------------------------------
+
+*hidedamage
+
+Disables the damage display on a map.
+
+---------------------------------------
+
+*weapon_damage_rate	{<rate>}
+
+Weapon skills damage adjustments.
+<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
+
+---------------------------------------
+
+*magic_damage_rate	{<rate>}
+
+Magic skills damage adjustments.
+<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
+
+---------------------------------------
+
+*misc_damage_rate	{<rate>}
+
+Misc skills damage adjustments.
+<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
+
+---------------------------------------
+
+*short_damage_rate	{<rate>}
+
+Melee damage adjustments (non-skill).
+<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
+
+---------------------------------------
+
+*long_damage_rate	{<rate>}
+
+Ranged damage adjustments (non-skill).
+<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
+
+---------------------------------------
+
+*flee_penalty	{<rate>}
+
+Flee penalty applied to players.
+<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 20.
+
+---------------------------------------
+
 ==================
 | 3. Map Effects |
 ==================
@@ -424,12 +479,6 @@ Displays night mode effects on a map. This is used on most outdoor maps.
 ====================
 ---------------------------------------

-*town
-
-Marks a map as a town. This allows players to access their mail and disables kill stealing.
-
---------------------------------------
-
 *reset

 Allows usage of item Neuralizer (ID 12213).
--- a/doc/skill_db.txt
+++ b/doc/skill_db.txt
@@ -81,6 +81,7 @@ IsShadowSpell				- Make skill available for SC_AUTOSHADOWSPELL.
 IsChorus					- Chorus skill.
 IgnoreBgReduction			- Ignore Battleground reduction.
 IgnoreGvgReduction			- Ignore GvG reduction.
+IgnorePKReduction			- Ignore PK reduction.
 DisableNearNpc				- Disable self/ground skills near NPC. In tandem with NoNearNpc node.
 TargetTrap					- Damage traps. If TargetType is Trap.
 IgnoreLandProtector			- Ignore SA_LANDPROTECTOR.
--- a/npc/custom/battleground/bg_pvp.txt
+++ b/npc/custom/battleground/bg_pvp.txt
@@ -14,6 +14,19 @@
 //= 1.1 Use up to date battleground script commands [AnnieRuru]
 //============================================================

+//= Enable applicable mapflags
+//guild_vs3	mapflag	gvg	off
+//guild_vs3	mapflag	battleground	2
+//guild_vs3	mapflag	nosave	SavePoint
+//guild_vs3	mapflag	nowarp
+//guild_vs3	mapflag	nowarpto
+//guild_vs3	mapflag	noteleport
+//guild_vs3	mapflag	nomemo
+//guild_vs3	mapflag	nopenalty
+//guild_vs3	mapflag	nobranch
+//guild_vs3	mapflag	noicewall
+//guild_vs3	mapflag	hidemobhpbar
+
 -	script	bg_pvp#control	-1,{
 OnInit:
 	.minplayer2start = 2;      // minimum players to start (ex. if 3vs3, set to 3)
@@ -107,15 +120,3 @@ OnStart:
 	waitingroom "Blue Team", getvariableofnpc( .minplayer2start, "bg_pvp#control" ) +1, "bg_pvp#control::OnStart", getvariableofnpc( .minplayer2start, "bg_pvp#control" );
 	end;
 }
-
-guild_vs3	mapflag	gvg	off
-guild_vs3	mapflag	battleground	2
-guild_vs3	mapflag	nosave	SavePoint
-guild_vs3	mapflag	nowarp
-guild_vs3	mapflag	nowarpto
-guild_vs3	mapflag	noteleport
-guild_vs3	mapflag	nomemo
-guild_vs3	mapflag	nopenalty
-guild_vs3	mapflag	nobranch
-guild_vs3	mapflag	noicewall
-guild_vs3	mapflag	hidemobhpbar
--- a/npc/custom/official/GeffenMagicTournament.txt
+++ b/npc/custom/official/GeffenMagicTournament.txt
@@ -4830,33 +4830,3 @@ OnInstanceInit:
 	hideonnpc instance_npcname("Handsome Adventurer#gef");
 	end;
 }
-
-1@gef	mapflag	nowarp
-1@gef	mapflag	nomemo
-1@gef	mapflag	noteleport
-1@gef	mapflag	monster_noteleport
-1@gef	mapflag	nosave
-1@gef	mapflag	nobranch
-1@gef	mapflag	nowarpto
-1@gef	mapflag	noicewall
-1@gef	mapflag	restricted	9
-
-1@ge_st	mapflag	nowarp
-1@ge_st	mapflag	nomemo
-1@ge_st	mapflag	noteleport
-1@ge_st	mapflag	monster_noteleport
-1@ge_st	mapflag	nosave
-1@ge_st	mapflag	nobranch
-1@ge_st	mapflag	nowarpto
-1@ge_st	mapflag	noicewall
-1@ge_st	mapflag	restricted	9
-
-1@gef_in	mapflag	nowarp
-1@gef_in	mapflag	nomemo
-1@gef_in	mapflag	noteleport
-1@gef_in	mapflag	monster_noteleport
-1@gef_in	mapflag	nosave
-1@gef_in	mapflag	nobranch
-1@gef_in	mapflag	nowarpto
-1@gef_in	mapflag	noicewall
-1@gef_in	mapflag	restricted	9
--- a/npc/mapflag/gvg.txt
+++ b/npc/mapflag/gvg.txt
@@ -1,99 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Guild versus Guild mode.
-//===== 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_dungeon: Describes dungeon maps for WoE.
-//= gvg_te: Turns on GvG mode for WoE:TE.
-//= gvg_te_castle: Describes castle maps for WoE:TE.
-//===== Changelogs: ==========================================
-//= 1.1 Added Novice Guild Castles.
-//= 1.2 Updated with new meanings of gvg and gvg_castle.
-//= 1.3 Renewal split. [Euphy]
-//= 1.4 Disable costumes in GvG castles. [Aleos]
-//============================================================
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	gvg
-guild_vs2	mapflag	gvg
-guild_vs3	mapflag	gvg
-guild_vs4	mapflag	gvg
-guild_vs5	mapflag	gvg
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-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
-
-//============================================================
-// WoE:Novice 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
-
-//============================================================
-// Guild Dungeons
-//============================================================
-arug_dun01	mapflag	gvg_dungeon
-schg_dun01	mapflag	gvg_dungeon
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	gvg
-2009rwc_02	mapflag	gvg
-2009rwc_03	mapflag	gvg
-2009rwc_04	mapflag	gvg
-2009rwc_05	mapflag	gvg
-2009rwc_06	mapflag	gvg
-2009rwc_07	mapflag	gvg
-2009rwc_08	mapflag	gvg
-2009rwc_f01	mapflag	gvg
-2012rwc_01	mapflag	gvg
-2012rwc_02	mapflag	gvg
-2012rwc_03	mapflag	gvg
-2012rwc_04	mapflag	gvg
-2012rwc_05	mapflag	gvg
-2012rwc_06	mapflag	gvg
-2012rwc_07	mapflag	gvg
-2012rwc_08	mapflag	gvg
--- a/npc/mapflag/gvg_noparty.txt
+++ b/npc/mapflag/gvg_noparty.txt
@@ -1,37 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: gvg_noparty.
-//===== Description: =========================================
-//= Ignores party alliances on GvG-enabled maps.
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Capuche]
-//============================================================
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	gvg_noparty
-guild_vs2	mapflag	gvg_noparty
-guild_vs3	mapflag	gvg_noparty
-guild_vs4	mapflag	gvg_noparty
-guild_vs5	mapflag	gvg_noparty
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	gvg_noparty
-2009rwc_02	mapflag	gvg_noparty
-2009rwc_03	mapflag	gvg_noparty
-2009rwc_04	mapflag	gvg_noparty
-2009rwc_05	mapflag	gvg_noparty
-2009rwc_06	mapflag	gvg_noparty
-2009rwc_07	mapflag	gvg_noparty
-2009rwc_08	mapflag	gvg_noparty
-2009rwc_f01	mapflag	gvg_noparty
-2012rwc_01	mapflag	gvg_noparty
-2012rwc_02	mapflag	gvg_noparty
-2012rwc_03	mapflag	gvg_noparty
-2012rwc_04	mapflag	gvg_noparty
-2012rwc_05	mapflag	gvg_noparty
-2012rwc_06	mapflag	gvg_noparty
-2012rwc_07	mapflag	gvg_noparty
-2012rwc_08	mapflag	gvg_noparty
--- a/npc/mapflag/hidemobhpbar.txt
+++ b/npc/mapflag/hidemobhpbar.txt
@@ -1,193 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: hidemobhpbar.
-//===== Description: =========================================
-//= Hide monster's HP bar (added in episode 14.2).
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Lemongrass]
-//============================================================
-
-//============================================================
-// PvP Arenas
-//============================================================
-pvp_y_1-1	mapflag	hidemobhpbar
-pvp_y_1-2	mapflag	hidemobhpbar
-pvp_y_1-3	mapflag	hidemobhpbar
-pvp_y_1-4	mapflag	hidemobhpbar
-pvp_y_1-5	mapflag	hidemobhpbar
-pvp_y_2-1	mapflag	hidemobhpbar
-pvp_y_2-2	mapflag	hidemobhpbar
-pvp_y_2-3	mapflag	hidemobhpbar
-pvp_y_2-4	mapflag	hidemobhpbar
-pvp_y_2-5	mapflag	hidemobhpbar
-pvp_y_3-1	mapflag	hidemobhpbar
-pvp_y_3-2	mapflag	hidemobhpbar
-pvp_y_3-3	mapflag	hidemobhpbar
-pvp_y_3-4	mapflag	hidemobhpbar
-pvp_y_3-5	mapflag	hidemobhpbar
-pvp_y_4-1	mapflag	hidemobhpbar
-pvp_y_4-2	mapflag	hidemobhpbar
-pvp_y_4-3	mapflag	hidemobhpbar
-pvp_y_4-4	mapflag	hidemobhpbar
-pvp_y_4-5	mapflag	hidemobhpbar
-pvp_y_5-1	mapflag	hidemobhpbar
-pvp_y_5-2	mapflag	hidemobhpbar
-pvp_y_5-3	mapflag	hidemobhpbar
-pvp_y_5-4	mapflag	hidemobhpbar
-pvp_y_5-5	mapflag	hidemobhpbar
-pvp_y_6-1	mapflag	hidemobhpbar
-pvp_y_6-2	mapflag	hidemobhpbar
-pvp_y_6-3	mapflag	hidemobhpbar
-pvp_y_6-4	mapflag	hidemobhpbar
-pvp_y_6-5	mapflag	hidemobhpbar
-pvp_y_7-1	mapflag	hidemobhpbar
-pvp_y_7-2	mapflag	hidemobhpbar
-pvp_y_7-3	mapflag	hidemobhpbar
-pvp_y_7-4	mapflag	hidemobhpbar
-pvp_y_7-5	mapflag	hidemobhpbar
-pvp_y_8-1	mapflag	hidemobhpbar
-pvp_y_8-2	mapflag	hidemobhpbar
-pvp_y_8-3	mapflag	hidemobhpbar
-pvp_y_8-4	mapflag	hidemobhpbar
-pvp_y_8-5	mapflag	hidemobhpbar
-pvp_n_1-1	mapflag	hidemobhpbar
-pvp_n_1-2	mapflag	hidemobhpbar
-pvp_n_1-3	mapflag	hidemobhpbar
-pvp_n_1-4	mapflag	hidemobhpbar
-pvp_n_1-5	mapflag	hidemobhpbar
-pvp_n_2-1	mapflag	hidemobhpbar
-pvp_n_2-2	mapflag	hidemobhpbar
-pvp_n_2-3	mapflag	hidemobhpbar
-pvp_n_2-4	mapflag	hidemobhpbar
-pvp_n_2-5	mapflag	hidemobhpbar
-pvp_n_3-1	mapflag	hidemobhpbar
-pvp_n_3-2	mapflag	hidemobhpbar
-pvp_n_3-3	mapflag	hidemobhpbar
-pvp_n_3-4	mapflag	hidemobhpbar
-pvp_n_3-5	mapflag	hidemobhpbar
-pvp_n_4-1	mapflag	hidemobhpbar
-pvp_n_4-2	mapflag	hidemobhpbar
-pvp_n_4-3	mapflag	hidemobhpbar
-pvp_n_4-4	mapflag	hidemobhpbar
-pvp_n_4-5	mapflag	hidemobhpbar
-pvp_n_5-1	mapflag	hidemobhpbar
-pvp_n_5-2	mapflag	hidemobhpbar
-pvp_n_5-3	mapflag	hidemobhpbar
-pvp_n_5-4	mapflag	hidemobhpbar
-pvp_n_5-5	mapflag	hidemobhpbar
-pvp_n_6-1	mapflag	hidemobhpbar
-pvp_n_6-2	mapflag	hidemobhpbar
-pvp_n_6-3	mapflag	hidemobhpbar
-pvp_n_6-4	mapflag	hidemobhpbar
-pvp_n_6-5	mapflag	hidemobhpbar
-pvp_n_7-1	mapflag	hidemobhpbar
-pvp_n_7-2	mapflag	hidemobhpbar
-pvp_n_7-3	mapflag	hidemobhpbar
-pvp_n_7-4	mapflag	hidemobhpbar
-pvp_n_7-5	mapflag	hidemobhpbar
-pvp_n_8-1	mapflag	hidemobhpbar
-pvp_n_8-2	mapflag	hidemobhpbar
-pvp_n_8-3	mapflag	hidemobhpbar
-pvp_n_8-4	mapflag	hidemobhpbar
-pvp_n_8-5	mapflag	hidemobhpbar
-pvp_2vs2	mapflag	hidemobhpbar
-
-//============================================================
-// Aldebaran Turbo Track
-//============================================================
-turbo_e_4	mapflag	hidemobhpbar
-turbo_e_8	mapflag	hidemobhpbar
-turbo_e_16	mapflag	hidemobhpbar
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	hidemobhpbar
-guild_vs2	mapflag	hidemobhpbar
-guild_vs3	mapflag	hidemobhpbar
-guild_vs4	mapflag	hidemobhpbar
-guild_vs5	mapflag	hidemobhpbar
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	hidemobhpbar
-aldeg_cas02	mapflag	hidemobhpbar
-aldeg_cas03	mapflag	hidemobhpbar
-aldeg_cas04	mapflag	hidemobhpbar
-aldeg_cas05	mapflag	hidemobhpbar
-gefg_cas01	mapflag	hidemobhpbar
-gefg_cas02	mapflag	hidemobhpbar
-gefg_cas03	mapflag	hidemobhpbar
-gefg_cas04	mapflag	hidemobhpbar
-gefg_cas05	mapflag	hidemobhpbar
-payg_cas01	mapflag	hidemobhpbar
-payg_cas02	mapflag	hidemobhpbar
-payg_cas03	mapflag	hidemobhpbar
-payg_cas04	mapflag	hidemobhpbar
-payg_cas05	mapflag	hidemobhpbar
-prtg_cas01	mapflag	hidemobhpbar
-prtg_cas02	mapflag	hidemobhpbar
-prtg_cas03	mapflag	hidemobhpbar
-prtg_cas04	mapflag	hidemobhpbar
-prtg_cas05	mapflag	hidemobhpbar
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	hidemobhpbar
-schg_cas02	mapflag	hidemobhpbar
-schg_cas03	mapflag	hidemobhpbar
-schg_cas04	mapflag	hidemobhpbar
-schg_cas05	mapflag	hidemobhpbar
-arug_cas01	mapflag	hidemobhpbar
-arug_cas02	mapflag	hidemobhpbar
-arug_cas03	mapflag	hidemobhpbar
-arug_cas04	mapflag	hidemobhpbar
-arug_cas05	mapflag	hidemobhpbar
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-//n_castle	mapflag	hidemobhpbar
-nguild_alde	mapflag	hidemobhpbar
-nguild_gef	mapflag	hidemobhpbar
-nguild_pay	mapflag	hidemobhpbar
-nguild_prt	mapflag	hidemobhpbar
-
-//============================================================
-// Guild Dungeons
-//============================================================
-arug_dun01	mapflag	hidemobhpbar
-schg_dun01	mapflag	hidemobhpbar
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_c01	mapflag	hidemobhpbar
-bat_c02	mapflag	hidemobhpbar
-bat_c03	mapflag	hidemobhpbar
-bat_b01	mapflag	hidemobhpbar
-bat_b02	mapflag	hidemobhpbar
-bat_a01	mapflag	hidemobhpbar
-bat_a02	mapflag	hidemobhpbar
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	hidemobhpbar
-2009rwc_02	mapflag	hidemobhpbar
-2009rwc_03	mapflag	hidemobhpbar
-2009rwc_04	mapflag	hidemobhpbar
-2009rwc_05	mapflag	hidemobhpbar
-2009rwc_06	mapflag	hidemobhpbar
-2009rwc_07	mapflag	hidemobhpbar
-2009rwc_08	mapflag	hidemobhpbar
-2009rwc_f01	mapflag	hidemobhpbar
-2012rwc_01	mapflag	hidemobhpbar
-2012rwc_02	mapflag	hidemobhpbar
-2012rwc_03	mapflag	hidemobhpbar
-2012rwc_04	mapflag	hidemobhpbar
-2012rwc_05	mapflag	hidemobhpbar
-2012rwc_06	mapflag	hidemobhpbar
-2012rwc_07	mapflag	hidemobhpbar
-2012rwc_08	mapflag	hidemobhpbar
--- a/npc/mapflag/jail.txt
+++ b/npc/mapflag/jail.txt
@@ -1,48 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Jail.
-//===== Description: ========================================= 
-//= Jail specific restrictions, only for map sec_pri
-//= pvp: Turns on PvP mode
-//= pvp_noparty: Can't attack player in same party
-//= nomemo: No Warp Portal Memory Point allowed.
-//= nowarp: Disables warping from the map.
-//= noreturn: Disables specific warp consumables.
-//= pvp_nightmaredrop: Players drop items/equipment on death.
-//= nosave: No respawn point saving allowed.
-//= noteleport: No Teleporting allowed.  No fly wings or butterfly wings.
-//= hidemobhpbar: No HP bar will be displayed for monsters.
-//= restricted: Disables items configured in item_noequip.txt
-//=				and skills configured in skill_nocast_db.txt.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//============================================================
-
-// 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
-sec_pri	mapflag	noreturn
-
-// PvP
-sec_pri	mapflag	pvp
-
-// No Party
-sec_pri	mapflag	pvp_noparty
-
-// Nightmare Equipment Drops
-sec_pri	mapflag	pvp_nightmaredrop	random,equip,300
-
-// Hide Monster HP bar
-sec_pri	mapflag	hidemobhpbar
-
-// Item and Skill restrictions
-sec_pri	mapflag	restricted	2
--- a/npc/mapflag/night.txt
+++ b/npc/mapflag/night.txt
@@ -1,310 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Night mode.
-//===== Description: ========================================= 
-//= Enables night mode effects.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Skotlex]
-//= 1.1 Renewal split. [Euphy]
-//============================================================
-
-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
-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
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-//============================================================
-brasilis	mapflag	nightenabled
-bra_fild01	mapflag	nightenabled
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	nightenabled
--- a/npc/mapflag/nightmare.txt
+++ b/npc/mapflag/nightmare.txt
@@ -1,52 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Nightmare mode.
-//===== 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.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//============================================================
-
-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
--- a/npc/mapflag/nobranch.txt
+++ b/npc/mapflag/nobranch.txt
@@ -1,404 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Dead Branch use.
-//===== Description: ========================================= 
-//= Disables the following items:
-//=   Dead Branch (604), Bloody Branch (12103),
-//=   Red Pouch (12024), Poring Box (12109)
-//===== Additional Comments: ================================= 
-//= 1.3 Updated. [massdriller]
-//= 1.6a Updated. [Lupus]
-//= 1.7 Added all novice maps. [L0ne_W0lf]
-//= 1.8 Removed restriction on PVP maps. [L0ne_W0lf]
-//= 1.9 Updated. [L0ne_W0lf]
-//= 2.0 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-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
-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
-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
-ein_in01	mapflag	nobranch
-yuno_pre	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
-
-//============================================================
-// Airport
-//============================================================
-airport	mapflag	nobranch
-airplane	mapflag	nobranch
-airplane_01	mapflag	nobranch
-y_airport	mapflag	nobranch
-lhz_airport	mapflag	nobranch
-
-//============================================================
-// Novice Starter Zone
-//============================================================
-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
-
-//============================================================
-// Job Quests
-//============================================================
-job_sword1	mapflag	nobranch
-job_thief1	mapflag	nobranch
-// 2-1 Classes
-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 Classes
-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
-
-//============================================================
-// Quest 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
-que_ba	mapflag	nobranch
-que_sign01	mapflag	nobranch
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-//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
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-//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
-
-//============================================================
-// 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
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	nobranch
-poring_w02	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
-//============================================================
-1@cata	mapflag	nobranch
-2@cata	mapflag	nobranch
-e_tower	mapflag	nobranch
-1@tower	mapflag	nobranch
-2@tower	mapflag	nobranch
-3@tower	mapflag	nobranch
-4@tower	mapflag	nobranch
-5@tower	mapflag	nobranch
-6@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
-1@orcs	mapflag	nobranch
-2@orcs	mapflag	nobranch
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-//============================================================
-1@nyd	mapflag	nobranch
-2@nyd	mapflag	nobranch
-manuk	mapflag	nobranch
-man_fild02	mapflag	nobranch
-man_in01	mapflag	nobranch
-splendide	mapflag	nobranch
-spl_in01	mapflag	nobranch
-spl_in02	mapflag	nobranch
-
-//============================================================
-// Brasilis
-//============================================================
-brasilis	mapflag	nobranch
-bra_in01	mapflag	nobranch
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nobranch
-2009rwc_02	mapflag	nobranch
-2009rwc_03	mapflag	nobranch
-2009rwc_04	mapflag	nobranch
-2009rwc_05	mapflag	nobranch
-2009rwc_06	mapflag	nobranch
-2009rwc_07	mapflag	nobranch
-2009rwc_08	mapflag	nobranch
-2009rwc_f01	mapflag	nobranch
-2012rwc_01	mapflag	nobranch
-2012rwc_02	mapflag	nobranch
-2012rwc_03	mapflag	nobranch
-2012rwc_04	mapflag	nobranch
-2012rwc_05	mapflag	nobranch
-2012rwc_06	mapflag	nobranch
-2012rwc_07	mapflag	nobranch
-2012rwc_08	mapflag	nobranch
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	nobranch
--- a/npc/mapflag/nocostume.txt
+++ b/npc/mapflag/nocostume.txt
@@ -1,167 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: nocostume
-//===== Description: =========================================
-//= A mapflag to disable costume's sprite on map.
-//= Usage:
-//=     [mapname]	mapflag	nocostume
-//===== Changelogs: ==========================================
-//= 1.0 Initial release. [Cydh]
-//= 1.1 Added arug_dun01 and schg_dun01. [Cydh]
-//============================================================
-
-//============================================================
-// Guild Dungeons
-//============================================================
-teg_dun01	mapflag	nocostume
-teg_dun02	mapflag	nocostume
-arug_dun01	mapflag	nocostume
-schg_dun01	mapflag	nocostume
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	nocostume
-aldeg_cas02	mapflag	nocostume
-aldeg_cas03	mapflag	nocostume
-aldeg_cas04	mapflag	nocostume
-aldeg_cas05	mapflag	nocostume
-gefg_cas01	mapflag	nocostume
-gefg_cas02	mapflag	nocostume
-gefg_cas03	mapflag	nocostume
-gefg_cas04	mapflag	nocostume
-gefg_cas05	mapflag	nocostume
-payg_cas01	mapflag	nocostume
-payg_cas02	mapflag	nocostume
-payg_cas03	mapflag	nocostume
-payg_cas04	mapflag	nocostume
-payg_cas05	mapflag	nocostume
-prtg_cas01	mapflag	nocostume
-prtg_cas02	mapflag	nocostume
-prtg_cas03	mapflag	nocostume
-prtg_cas04	mapflag	nocostume
-prtg_cas05	mapflag	nocostume
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	nocostume
-schg_cas02	mapflag	nocostume
-schg_cas03	mapflag	nocostume
-schg_cas04	mapflag	nocostume
-schg_cas05	mapflag	nocostume
-arug_cas01	mapflag	nocostume
-arug_cas02	mapflag	nocostume
-arug_cas03	mapflag	nocostume
-arug_cas04	mapflag	nocostume
-arug_cas05	mapflag	nocostume
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	nocostume
-te_prtcas02	mapflag	nocostume
-te_prtcas03	mapflag	nocostume
-te_prtcas04	mapflag	nocostume
-te_prtcas05	mapflag	nocostume
-te_aldecas1	mapflag	nocostume
-te_aldecas2	mapflag	nocostume
-te_aldecas3	mapflag	nocostume
-te_aldecas4	mapflag	nocostume
-te_aldecas5	mapflag	nocostume
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-//n_castle	mapflag	nocostume
-nguild_alde	mapflag	nocostume
-nguild_gef	mapflag	nocostume
-nguild_pay	mapflag	nocostume
-nguild_prt	mapflag	nocostume
-
-//============================================================
-// PvP Arenas
-//============================================================
-pvp_y_1-1	mapflag	nocostume
-pvp_y_1-2	mapflag	nocostume
-pvp_y_1-3	mapflag	nocostume
-pvp_y_1-4	mapflag	nocostume
-pvp_y_1-5	mapflag	nocostume
-pvp_y_2-1	mapflag	nocostume
-pvp_y_2-2	mapflag	nocostume
-pvp_y_2-3	mapflag	nocostume
-pvp_y_2-4	mapflag	nocostume
-pvp_y_2-5	mapflag	nocostume
-pvp_y_3-1	mapflag	nocostume
-pvp_y_3-2	mapflag	nocostume
-pvp_y_3-3	mapflag	nocostume
-pvp_y_3-4	mapflag	nocostume
-pvp_y_3-5	mapflag	nocostume
-pvp_y_4-1	mapflag	nocostume
-pvp_y_4-2	mapflag	nocostume
-pvp_y_4-3	mapflag	nocostume
-pvp_y_4-4	mapflag	nocostume
-pvp_y_4-5	mapflag	nocostume
-pvp_y_5-1	mapflag	nocostume
-pvp_y_5-2	mapflag	nocostume
-pvp_y_5-3	mapflag	nocostume
-pvp_y_5-4	mapflag	nocostume
-pvp_y_5-5	mapflag	nocostume
-pvp_y_6-1	mapflag	nocostume
-pvp_y_6-2	mapflag	nocostume
-pvp_y_6-3	mapflag	nocostume
-pvp_y_6-4	mapflag	nocostume
-pvp_y_6-5	mapflag	nocostume
-pvp_y_7-1	mapflag	nocostume
-pvp_y_7-2	mapflag	nocostume
-pvp_y_7-3	mapflag	nocostume
-pvp_y_7-4	mapflag	nocostume
-pvp_y_7-5	mapflag	nocostume
-pvp_y_8-1	mapflag	nocostume
-pvp_y_8-2	mapflag	nocostume
-pvp_y_8-3	mapflag	nocostume
-pvp_y_8-4	mapflag	nocostume
-pvp_y_8-5	mapflag	nocostume
-pvp_n_1-1	mapflag	nocostume
-pvp_n_1-2	mapflag	nocostume
-pvp_n_1-3	mapflag	nocostume
-pvp_n_1-4	mapflag	nocostume
-pvp_n_1-5	mapflag	nocostume
-pvp_n_2-1	mapflag	nocostume
-pvp_n_2-2	mapflag	nocostume
-pvp_n_2-3	mapflag	nocostume
-pvp_n_2-4	mapflag	nocostume
-pvp_n_2-5	mapflag	nocostume
-pvp_n_3-1	mapflag	nocostume
-pvp_n_3-2	mapflag	nocostume
-pvp_n_3-3	mapflag	nocostume
-pvp_n_3-4	mapflag	nocostume
-pvp_n_3-5	mapflag	nocostume
-pvp_n_4-1	mapflag	nocostume
-pvp_n_4-2	mapflag	nocostume
-pvp_n_4-3	mapflag	nocostume
-pvp_n_4-4	mapflag	nocostume
-pvp_n_4-5	mapflag	nocostume
-pvp_n_5-1	mapflag	nocostume
-pvp_n_5-2	mapflag	nocostume
-pvp_n_5-3	mapflag	nocostume
-pvp_n_5-4	mapflag	nocostume
-pvp_n_5-5	mapflag	nocostume
-pvp_n_6-1	mapflag	nocostume
-pvp_n_6-2	mapflag	nocostume
-pvp_n_6-3	mapflag	nocostume
-pvp_n_6-4	mapflag	nocostume
-pvp_n_6-5	mapflag	nocostume
-pvp_n_7-1	mapflag	nocostume
-pvp_n_7-2	mapflag	nocostume
-pvp_n_7-3	mapflag	nocostume
-pvp_n_7-4	mapflag	nocostume
-pvp_n_7-5	mapflag	nocostume
-pvp_n_8-1	mapflag	nocostume
-pvp_n_8-2	mapflag	nocostume
-pvp_n_8-3	mapflag	nocostume
-pvp_n_8-4	mapflag	nocostume
-pvp_n_8-5	mapflag	nocostume
-pvp_2vs2	mapflag	nocostume
-turbo_e_4	mapflag	nocostume
-turbo_e_8	mapflag	nocostume
-turbo_e_16	mapflag	nocostume
--- a/npc/mapflag/nodynamicnpc.txt
+++ b/npc/mapflag/nodynamicnpc.txt
@@ -1,27 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: No dynamic NPC map setting.
-//===== Description: ========================================= 
-//= Blocks the use of dynamic NPCs on a map.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Lemongrass]
-//============================================================
-
-// Endless Tower
-1@tower	mapflag	nodynamicnpc
-2@tower	mapflag	nodynamicnpc
-3@tower	mapflag	nodynamicnpc
-4@tower	mapflag	nodynamicnpc
-5@tower	mapflag	nodynamicnpc
-6@tower	mapflag	nodynamicnpc
-
-// Sealed Catacomb
-1@cata	mapflag	nodynamicnpc
-2@cata	mapflag	nodynamicnpc
-
-// Orc's Memory
-1@orcs	mapflag	nodynamicnpc
-2@orcs	mapflag	nodynamicnpc
-
-// Nidhoggur's Nest
-1@nyd	mapflag	nodynamicnpc
-2@nyd	mapflag	nodynamicnpc
--- a/npc/mapflag/noicewall.txt
+++ b/npc/mapflag/noicewall.txt
@@ -1,149 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Ice Wall.
-//===== Description: ========================================= 
-//= Blocks usage of WZ_ICEWALL.
-//===== Additional Comments: ================================= 
-//= 1.6a Re-enabled icewalls for cities [Lupus]
-//= 1.7 Officially icewall is allowed on interiors. [L0ne_w0lf]
-//= 1.8 Fixed arug_cas map names.
-//= 1.9 Renewal split. [Euphy]
-//============================================================
-
-//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
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-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
-
-//============================================================
-// WoE:Novice 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
--- a/npc/mapflag/nomemo.txt
+++ b/npc/mapflag/nomemo.txt
@@ -1,770 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Warp Portal memory.
-//===== Description: ========================================= 
-//= Prevents players from using /memo on a map.
-//= Also disables marriage warp skills.
-//===== Additional Comments: ================================= 
-//= 1.6a Added up to Hugel maps. [Lupus]
-//= 1.6b Added job_knt map. [Samuray22]
-//= 1.7 Added all novice maps. [L0ne_W0lf]
-//= 1.8 Added nameless_i location. [Lupus]
-//= 1.8a Removed duplicate gef_cas nomemo mapflags. [Yommy]
-//= 1.8b Removed duplicate arug_dun01 & schg_dun01 entries. [Gepard]
-//= 1.9 Updated. [L0ne_W0lf]
-//= 2.0 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-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
-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
-lighthalzen	mapflag	nomemo
-yuno_pre	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
-
-//============================================================
-// Airport
-//============================================================
-airport	mapflag	nomemo
-airplane	mapflag	nomemo
-airplane_01	mapflag	nomemo
-y_airport	mapflag	nomemo
-lhz_airport	mapflag	nomemo
-
-//============================================================
-// Novice Starter Zone
-//============================================================
-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
-
-//============================================================
-// 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_ba	mapflag	nomemo
-que_ng	mapflag	nomemo
-
-//============================================================
-// Quest 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 Dungeon
-gef_dun00	mapflag	nomemo
-gef_dun01	mapflag	nomemo
-gef_dun02	mapflag	nomemo
-gef_dun03	mapflag	nomemo
-// Glastheim
-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 Dungeon
-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
-// Luoyang Dungeon
-lou_dun03	mapflag	nomemo
-lou_dun02	mapflag	nomemo
-lou_dun01	mapflag	nomemo
-// Magma Dungeon
-mag_dun01	mapflag	nomemo
-mag_dun02	mapflag	nomemo
-// Pyramids
-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 Dungeon
-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
-// Kunlun Dungeon
-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 Dungeon
-um_dun01	mapflag	nomemo
-um_dun02	mapflag	nomemo
-// Toy Factory
-xmas_dun01	mapflag	nomemo
-xmas_dun02	mapflag	nomemo
-// Yggdrasil Tree Dungeon
-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
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-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
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-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
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	nomemo
-poring_w02	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
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	nomemo
-2@cata	mapflag	nomemo
-
-//============================================================
-// Endless Tower
-//============================================================
-e_tower	mapflag	nomemo
-1@tower	mapflag	nomemo
-2@tower	mapflag	nomemo
-3@tower	mapflag	nomemo
-4@tower	mapflag	nomemo
-5@tower	mapflag	nomemo
-6@tower	mapflag	nomemo
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-spl_in02	mapflag	nomemo
-
-//============================================================
-// Brasilis
-//============================================================
-bra_in01	mapflag	nomemo
-bra_dun01	mapflag	nomemo
-bra_dun02	mapflag	nomemo
-
-//evt_zombie	mapflag	nomemo
-
-//============================================================
-// Bossnia (Custom) #!todo Verify
-//============================================================
-bossnia_01	mapflag	nomemo
-bossnia_02	mapflag	nomemo
-bossnia_03	mapflag	nomemo
-bossnia_04	mapflag	nomemo
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nomemo
-2009rwc_02	mapflag	nomemo
-2009rwc_03	mapflag	nomemo
-2009rwc_04	mapflag	nomemo
-2009rwc_05	mapflag	nomemo
-2009rwc_06	mapflag	nomemo
-2009rwc_07	mapflag	nomemo
-2009rwc_08	mapflag	nomemo
-2009rwc_f01	mapflag	nomemo
-2012rwc_01	mapflag	nomemo
-2012rwc_02	mapflag	nomemo
-2012rwc_03	mapflag	nomemo
-2012rwc_04	mapflag	nomemo
-2012rwc_05	mapflag	nomemo
-2012rwc_06	mapflag	nomemo
-2012rwc_07	mapflag	nomemo
-2012rwc_08	mapflag	nomemo
--- a/npc/mapflag/nopenalty.txt
+++ b/npc/mapflag/nopenalty.txt
@@ -1,323 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable death penalty.
-//===== Description: ========================================= 
-//= Same as 'noexppenalty' and 'nozenypenalty' combined.
-//===== Additional Comments: ================================= 
-//= 1.2 Updated. [Lupus]
-//= 1.3 Added all novice maps. [L0ne_W0lf]
-//= 1.4 Removed Nightmare PVP maps. [L0ne_W0lf]
-//= 1.5 Updated. [L0ne_Wolf]
-//= 1.6 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-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
-brasilis	mapflag	nopenalty
-bra_in01	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
-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
-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
-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
-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
-
-//============================================================
-// Airport
-//============================================================
-airport	mapflag	nopenalty
-airplane	mapflag	nopenalty
-y_airport	mapflag	nopenalty
-lhz_airport	mapflag	nopenalty
-
-
-//============================================================
-// Novice Starter Zone
-//============================================================
-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
-
-//============================================================
-// Job Quests
-//============================================================
-job_sword1	mapflag	nopenalty
-job_thief1	mapflag	nopenalty
-// 2-1 Classes
-job_prist	mapflag	nopenalty
-job_wiz	mapflag	nopenalty
-job_hunte	mapflag	nopenalty
-in_hunter	mapflag	nopenalty
-in_moc_16	mapflag	nopenalty
-// 2-2 Classes
-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
-
-//============================================================
-// Quest Places
-//============================================================
-mosk_ship	mapflag	nopenalty
-que_sign01	mapflag	nopenalty
-que_sign02	mapflag	nopenalty
-que_ng	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 Battle 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
-
-//============================================================
-// Poring War
-//============================================================
-poring_w02	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
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nopenalty
-2009rwc_02	mapflag	nopenalty
-2009rwc_03	mapflag	nopenalty
-2009rwc_04	mapflag	nopenalty
-2009rwc_05	mapflag	nopenalty
-2009rwc_06	mapflag	nopenalty
-2009rwc_07	mapflag	nopenalty
-2009rwc_08	mapflag	nopenalty
-2009rwc_f01	mapflag	nopenalty
-2012rwc_01	mapflag	nopenalty
-2012rwc_02	mapflag	nopenalty
-2012rwc_03	mapflag	nopenalty
-2012rwc_04	mapflag	nopenalty
-2012rwc_05	mapflag	nopenalty
-2012rwc_06	mapflag	nopenalty
-2012rwc_07	mapflag	nopenalty
-2012rwc_08	mapflag	nopenalty
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	nopenalty
--- a/npc/mapflag/nopvp.txt
+++ b/npc/mapflag/nopvp.txt
@@ -1,151 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Player versus Player mode.
-//===== Description: ========================================= 
-//= Prevents PvP mode on a map.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//= 1.2 Updated. [L0ne_W0lf]
-//= 1.3 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Instances
-//============================================================
-1@cata	mapflag	pvp	off
-2@cata	mapflag	pvp	off
-1@nyd	mapflag	pvp	off
-2@nyd	mapflag	pvp	off
-1@orcs	mapflag	pvp	off
-2@orcs	mapflag	pvp	off
-1@tower	mapflag	pvp	off
-2@tower	mapflag	pvp	off
-3@tower	mapflag	pvp	off
-4@tower	mapflag	pvp	off
-5@tower	mapflag	pvp	off
-6@tower	mapflag	pvp	off
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_room	mapflag	pvp	off
-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
-
-//============================================================
-// GvG Arenas
-//============================================================
-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
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-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
-brasilis	mapflag	pvp	off
-bra_in01	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
-
-manuk	mapflag	pvp	off
-man_in01	mapflag	pvp	off
-splendide	mapflag	pvp	off
-spl_in01	mapflag	pvp	off
-spl_in02	mapflag	pvp	off
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	pvp	off
--- a/npc/mapflag/noreturn.txt
+++ b/npc/mapflag/noreturn.txt
@@ -1,263 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable return warp.
-//===== 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.
-//===== Additional Comments: ================================= 
-//= 1.3 According to the patch, enabled Butterfly wings in the Castles. [Lupus]
-//= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]
-//= 1.4a Added job_knt. [Samuray22]
-//= 1.5 Commented out new_zone entries. [L0ne_W0lf]
-//= 1.6 Enabled B. wings on all maps but que_hugel. [L0ne_W0lf]
-//============================================================
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-//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 Classes
-//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 Classes
-//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
-
-//============================================================
-// Quest 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
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	noreturn
--- a/npc/mapflag/nosave.txt
+++ b/npc/mapflag/nosave.txt
@@ -1,319 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable auto-save.
-//===== Description: ========================================= 
-//= Characters logging out on the specified map will be warped
-//= to the map specified in the last field, or "SavePoint".
-//===== Additional Comments: ================================= 
-//= 1.7 Updated. [Lupus]
-//= 1.8 Updated. [L0ne_W0lf]
-//= 1.9 Renewal split. [Euphy]
-//= 2.0 Moved instances to pre-renewal. [Lemongrass]
-//============================================================
-
-//============================================================
-// Job Quests
-//============================================================
-job_sword1	mapflag	nosave	SavePoint
-//job_thief1	mapflag	nosave	SavePoint
-// 2-1 Classes
-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 Classes
-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
-// Expanded Classes
-job_star	mapflag	nosave	SavePoint
-job_soul	mapflag	nosave	SavePoint
-
-//============================================================
-// Quest Places
-//============================================================
-ama_test	mapflag	nosave	SavePoint
-gef_dun03	mapflag	nosave	SavePoint
-que_ba	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
-
-//============================================================
-// Arenas
-//============================================================
-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:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-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
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-nguild_alde	mapflag	nosave	SavePoint
-nguild_gef	mapflag	nosave	SavePoint
-nguild_pay	mapflag	nosave	SavePoint
-nguild_prt	mapflag	nosave	SavePoint
-
-//============================================================
-// Guild Dungeons
-//============================================================
-gld_dun01	mapflag	nosave	SavePoint
-gld_dun02	mapflag	nosave	SavePoint
-gld_dun03	mapflag	nosave	SavePoint
-gld_dun04	mapflag	nosave	SavePoint
-
-//============================================================
-// Normal Maps
-//============================================================
-yggdrasil01	mapflag	nosave	SavePoint
-thana_boss	mapflag	nosave	SavePoint
-
-//============================================================
-// 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
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	nosave	SavePoint
-poring_w02	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
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nosave	SavePoint
-2009rwc_02	mapflag	nosave	SavePoint
-2009rwc_03	mapflag	nosave	SavePoint
-2009rwc_04	mapflag	nosave	SavePoint
-2009rwc_05	mapflag	nosave	SavePoint
-2009rwc_06	mapflag	nosave	SavePoint
-2009rwc_07	mapflag	nosave	SavePoint
-2009rwc_08	mapflag	nosave	SavePoint
-2009rwc_f01	mapflag	nosave	SavePoint
-2012rwc_01	mapflag	nosave	SavePoint
-2012rwc_02	mapflag	nosave	SavePoint
-2012rwc_03	mapflag	nosave	SavePoint
-2012rwc_04	mapflag	nosave	SavePoint
-2012rwc_05	mapflag	nosave	SavePoint
-2012rwc_06	mapflag	nosave	SavePoint
-2012rwc_07	mapflag	nosave	SavePoint
-2012rwc_08	mapflag	nosave	SavePoint
-
-//============================================================
-// Events
-//============================================================
-evt_bomb	mapflag	nosave	SavePoint
-//evt_zombie	mapflag	nosave	SavePoint
--- a/npc/mapflag/noskill.txt
+++ b/npc/mapflag/noskill.txt
@@ -1,37 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable skill use.
-//===== Description: ========================================= 
-//= Disables all skills on the map.
-//===== Additional Comments: ================================= 
-//= 1.1 Added additional maps. [L0ne_W0lf]
-//============================================================
-
-//============================================================
-// Arenas
-//============================================================
-prt_are_in	mapflag	noskill
-
-//============================================================
-// The Sign Quest
-//============================================================
-himinn	mapflag	noskill
-
-//============================================================
-// Quiz
-//============================================================
-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
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	noskill
--- a/npc/mapflag/noteleport.txt
+++ b/npc/mapflag/noteleport.txt
@@ -1,486 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable teleportation.
-//===== 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)
-//===== Additional Comments: ================================= 
-//= 1.6a Updated. [Lupus]
-//= 1.7 Updated. [L0ne_W0lf]
-//= 1.8 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-ayo_in01	mapflag	noteleport
-ayo_in02	mapflag	noteleport
-alb_ship	mapflag	noteleport
-alberta_in	mapflag	noteleport
-aldeba_in	mapflag	noteleport
-ama_in01	mapflag	noteleport
-ama_in02	mapflag	noteleport
-ama_test	mapflag	noteleport
-cmd_in01	mapflag	noteleport
-cmd_in02	mapflag	noteleport
-geffen_in	mapflag	noteleport
-gef_tower	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
-nif_in	mapflag	noteleport
-payon_in01	mapflag	noteleport
-payon_in02	mapflag	noteleport
-payon_in03	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
-ein_in01	mapflag	noteleport
-lighthalzen	mapflag	noteleport
-yuno	mapflag	noteleport
-yuno_pre	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
-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
-ve_in	mapflag	noteleport
-ve_in02	mapflag	noteleport
-thor_camp	mapflag	noteleport
-
-//============================================================
-// Dungeons
-//============================================================
-ama_dun01	mapflag	noteleport
-gef_dun03	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
-kh_dun01	mapflag	noteleport
-nyd_dun02	mapflag	noteleport
-
-//============================================================
-// Airport
-//============================================================
-airport	mapflag	noteleport
-airplane	mapflag	noteleport
-airplane_01	mapflag	noteleport
-y_airport	mapflag	noteleport
-lhz_airport	mapflag	noteleport
-
-//============================================================
-// Novice Starter Zone
-//============================================================
-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
-
-//============================================================
-// Job Quests
-//============================================================
-job_sword1	mapflag	noteleport
-job_thief1	mapflag	noteleport
-// 2-1 Classes
-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 Classes
-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
-
-//============================================================
-// Quest Places
-//============================================================
-que_ba	mapflag	noteleport
-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
-que_sign01	mapflag	noteleport
-que_sign02	mapflag	noteleport
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-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
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-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
-prt_are_in	mapflag	noteleport
-prt_are01	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
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	noteleport
-poring_w02	mapflag	noteleport
-poring_w02	mapflag	monster_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
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	noteleport
-1@cata	mapflag	monster_noteleport
-2@cata	mapflag	noteleport
-2@cata	mapflag	monster_noteleport
-
-//============================================================
-// Endless Tower
-//============================================================
-e_tower	mapflag	noteleport
-1@tower	mapflag	noteleport
-1@tower	mapflag	monster_noteleport
-2@tower	mapflag	noteleport
-2@tower	mapflag	monster_noteleport
-3@tower	mapflag	noteleport
-3@tower	mapflag	monster_noteleport
-4@tower	mapflag	noteleport
-4@tower	mapflag	monster_noteleport
-5@tower	mapflag	noteleport
-5@tower	mapflag	monster_noteleport
-6@tower	mapflag	noteleport
-6@tower	mapflag	monster_noteleport
-
-//============================================================
-// Battlegrounds
-//============================================================
-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.2
-//============================================================
-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
-spl_in02	mapflag	noteleport
-
-//============================================================
-// Brasilis
-//============================================================
-bra_in01	mapflag	noteleport
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	noteleport
-1@orcs	mapflag	monster_noteleport
-2@orcs	mapflag	noteleport
-2@orcs	mapflag	monster_noteleport
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	noteleport
-1@nyd	mapflag	monster_noteleport
-2@nyd	mapflag	noteleport
-2@nyd	mapflag	monster_noteleport
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	noteleport
-2009rwc_02	mapflag	noteleport
-2009rwc_03	mapflag	noteleport
-2009rwc_04	mapflag	noteleport
-2009rwc_05	mapflag	noteleport
-2009rwc_06	mapflag	noteleport
-2009rwc_07	mapflag	noteleport
-2009rwc_08	mapflag	noteleport
-2009rwc_f01	mapflag	noteleport
-2012rwc_01	mapflag	noteleport
-2012rwc_02	mapflag	noteleport
-2012rwc_03	mapflag	noteleport
-2012rwc_04	mapflag	noteleport
-2012rwc_05	mapflag	noteleport
-2012rwc_06	mapflag	noteleport
-2012rwc_07	mapflag	noteleport
-2012rwc_08	mapflag	noteleport
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	noteleport
--- a/npc/mapflag/nowarp.txt
+++ b/npc/mapflag/nowarp.txt
@@ -1,121 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable warping.
-//===== Description: ========================================= 
-//= Disables warping from a map.
-//= Script commands 'warpparty' and 'warpguild' will not warp
-//=   players.
-//= Atcommands @warp, @go, @load, @jump, @partyrecall,
-//=   @guildrecall, and @recallall will not warp players.
-//= GD_EMERGENCYCALL and UNT_CALLFAMILY will not warp players.
-//===== Additional Comments: ================================= 
-//= 1.3 Added WoE SE maps.
-//============================================================
-
-//============================================================
-// Quest Places
-//============================================================
-ama_test	mapflag	nowarp
-gon_test	mapflag	nowarp
-que_ba	mapflag	nowarp
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-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
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-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
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nowarp
-2009rwc_02	mapflag	nowarp
-2009rwc_03	mapflag	nowarp
-2009rwc_04	mapflag	nowarp
-2009rwc_05	mapflag	nowarp
-2009rwc_06	mapflag	nowarp
-2009rwc_07	mapflag	nowarp
-2009rwc_08	mapflag	nowarp
-2009rwc_f01	mapflag	nowarp
-2012rwc_01	mapflag	nowarp
-2012rwc_02	mapflag	nowarp
-2012rwc_03	mapflag	nowarp
-2012rwc_04	mapflag	nowarp
-2012rwc_05	mapflag	nowarp
-2012rwc_06	mapflag	nowarp
-2012rwc_07	mapflag	nowarp
-2012rwc_08	mapflag	nowarp
--- a/npc/mapflag/nowarpto.txt
+++ b/npc/mapflag/nowarpto.txt
@@ -1,219 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable warpto.
-//===== Description: ========================================= 
-//= Disables warping to a map.
-//= Atcommands @warp, @go, @load, @jump, @partyrecall,
-//=   @guildrecall, and @recallall are disabled.
-//= Command /memo is disabled.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//= 1.4 Updated. [L0ne_W0lf]
-//= 1.5 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// WoE:FE 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
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-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
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-n_castle	mapflag	nowarpto
-nguild_alde	mapflag	nowarpto
-nguild_gef	mapflag	nowarpto
-nguild_pay	mapflag	nowarpto
-nguild_prt	mapflag	nowarpto
-
-//============================================================
-// Lighthalzen Bio-Lab
-//============================================================
-lhz_dun03	mapflag	nowarpto
-
-//============================================================
-// Quest 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
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	nowarpto
-poring_w02	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
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	nowarpto
-2@cata	mapflag	nowarpto
-
-//============================================================
-// Endless Tower
-//============================================================
-e_tower	mapflag	nowarpto
-1@tower	mapflag	nowarpto
-2@tower	mapflag	nowarpto
-3@tower	mapflag	nowarpto
-4@tower	mapflag	nowarpto
-5@tower	mapflag	nowarpto
-6@tower	mapflag	nowarpto
-
-//============================================================
-// Battlegrounds
-//============================================================
-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
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	nowarpto
-2@orcs	mapflag	nowarpto
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	nowarpto
-2@nyd	mapflag	nowarpto
-
-//============================================================
-// Bossnia (Custom) #!todo Verify
-//============================================================
-bossnia_01	mapflag	nowarpto
-bossnia_02	mapflag	nowarpto
-bossnia_03	mapflag	nowarpto
-bossnia_04	mapflag	nowarpto
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nowarpto
-2009rwc_02	mapflag	nowarpto
-2009rwc_03	mapflag	nowarpto
-2009rwc_04	mapflag	nowarpto
-2009rwc_05	mapflag	nowarpto
-2009rwc_06	mapflag	nowarpto
-2009rwc_07	mapflag	nowarpto
-2009rwc_08	mapflag	nowarpto
-2009rwc_f01	mapflag	nowarpto
-2012rwc_01	mapflag	nowarpto
-2012rwc_02	mapflag	nowarpto
-2012rwc_03	mapflag	nowarpto
-2012rwc_04	mapflag	nowarpto
-2012rwc_05	mapflag	nowarpto
-2012rwc_06	mapflag	nowarpto
-2012rwc_07	mapflag	nowarpto
-2012rwc_08	mapflag	nowarpto
--- a/npc/mapflag/partylock.txt
+++ b/npc/mapflag/partylock.txt
@@ -1,38 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Party lock.
-//===== Description: ========================================= 
-//= Blocks all party modifications on a map:
-//=   /organize, /leave, /invite, @changeleader
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//= 1.1 Updated. [L0ne_W0lf]
-//= 1.2 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	partylock
-2@cata	mapflag	partylock
-
-//============================================================
-// Endless Tower
-//============================================================
-1@tower	mapflag	partylock
-2@tower	mapflag	partylock
-3@tower	mapflag	partylock
-4@tower	mapflag	partylock
-5@tower	mapflag	partylock
-6@tower	mapflag	partylock
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	partylock
-2@orcs	mapflag	partylock
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	partylock
-2@nyd	mapflag	partylock
--- a/npc/mapflag/pvp.txt
+++ b/npc/mapflag/pvp.txt
@@ -1,100 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Player versus Player mode.
-//===== Description: =========================================
-//= Enables PvP on a map.
-//===== Changelog: ===========================================
-//= 1.0 Initial script.
-//= 1.1 Disable costumes on PvP maps. [Aleos]
-//============================================================
-
-//============================================================
-// PvP Arenas
-//============================================================
-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
--- a/npc/mapflag/pvp_noguild.txt
+++ b/npc/mapflag/pvp_noguild.txt
@@ -1,92 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Ignore guilds.
-//===== Description: ========================================= 
-//= Ignores guild alliances on GvG-enabled maps.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//============================================================
-
-//============================================================
-// 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
--- a/npc/mapflag/pvp_noparty.txt
+++ b/npc/mapflag/pvp_noparty.txt
@@ -1,7 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Ignore parties.
-//===== Description: ========================================= 
-//= Ignores party alliances on PvP-enabled maps.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//============================================================
--- a/npc/mapflag/reset.txt
+++ b/npc/mapflag/reset.txt
@@ -1,42 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Enable Neuralizer use.
-//===== Description: ========================================= 
-//= Maps where Neuralizer (12213) can be used.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Daegaladh]
-//= 1.1 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-alberta	mapflag	reset
-aldebaran	mapflag	reset
-amatsu	mapflag	reset
-ayothaya	mapflag	reset
-brasilis	mapflag	reset
-comodo	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
-manuk	mapflag	reset
-mid_camp	mapflag	reset
-moc_ruins	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
--- a/npc/mapflag/restricted.txt
+++ b/npc/mapflag/restricted.txt
@@ -1,112 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Restricted.
-//===== Description: ========================================= 
-//= Disables items configured in item_noequip.txt
-//= and skills configured in skill_nocast_db.txt.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Komurka]
-//= 1.1 Added WoE:SE Map restrictions. [L0ne_W0lf]
-//= 1.2 Added Endless Tower Restrictions. (bugreport:4707) [L0ne_W0lf]
-//= 1.3 Added Orc's Memory, Nidhoggur's Nest and towns restrictions. [Daegaladh]
-//= 1.4 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Aldebaran Turbo Track
-//============================================================
-alde_tt02	mapflag	restricted	1
-turbo_n_1	mapflag	restricted	1
-turbo_n_4	mapflag	restricted	1
-turbo_n_8	mapflag	restricted	1
-turbo_n_16	mapflag	restricted	1
-turbo_e_4	mapflag	restricted	1
-turbo_e_8	mapflag	restricted	1
-turbo_e_16	mapflag	restricted	1
-
-//============================================================
-// Arenas
-//============================================================
-force_1-1	mapflag	restricted	3
-force_2-1	mapflag	restricted	3
-force_3-1	mapflag	restricted	3
-force_4-1	mapflag	restricted	3
-force_5-1	mapflag	restricted	3
-force_1-2	mapflag	restricted	3
-force_1-3	mapflag	restricted	3
-prt_are_in	mapflag	restricted	3
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	restricted	4
-schg_cas02	mapflag	restricted	4
-schg_cas03	mapflag	restricted	4
-schg_cas04	mapflag	restricted	4
-schg_cas05	mapflag	restricted	4
-arug_cas01	mapflag	restricted	4
-arug_cas02	mapflag	restricted	4
-arug_cas03	mapflag	restricted	4
-arug_cas04	mapflag	restricted	4
-arug_cas05	mapflag	restricted	4
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	restricted	5
-2@cata	mapflag	restricted	5
-
-//============================================================
-// Endless Tower
-//============================================================
-1@tower	mapflag	restricted	6
-2@tower	mapflag	restricted	6
-3@tower	mapflag	restricted	6
-4@tower	mapflag	restricted	6
-5@tower	mapflag	restricted	6
-6@tower	mapflag	restricted	6
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	restricted	6
-2@orcs	mapflag	restricted	6
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	restricted	6
-2@nyd	mapflag	restricted	6
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-alberta	mapflag	restricted	7
-aldebaran	mapflag	restricted	7
-amatsu	mapflag	restricted	7
-ayothaya	mapflag	restricted	7
-brasilis	mapflag	restricted	7
-comodo	mapflag	restricted	7
-einbroch	mapflag	restricted	7
-einbech	mapflag	restricted	7
-geffen	mapflag	restricted	7
-gonryun	mapflag	restricted	7
-izlude	mapflag	restricted	7
-jawaii	mapflag	restricted	7
-hugel	mapflag	restricted	7
-lighthalzen	mapflag	restricted	7
-louyang	mapflag	restricted	7
-manuk	mapflag	restricted	7
-mid_camp	mapflag	restricted	7
-moc_ruins	mapflag	restricted	7
-morocc	mapflag	restricted	7
-moscovia	mapflag	restricted	7
-niflheim	mapflag	restricted	7
-prontera	mapflag	restricted	7
-payon	mapflag	restricted	7
-pay_arche	mapflag	restricted	7
-rachel	mapflag	restricted	7
-splendide	mapflag	restricted	7
-umbala	mapflag	restricted	7
-veins	mapflag	restricted	7
-xmas	mapflag	restricted	7
-yuno	mapflag	restricted	7
--- a/npc/mapflag/skill_damage.txt
+++ b/npc/mapflag/skill_damage.txt
@@ -1,10 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Adjust Skill Damage.
-//===== Description: ========================================= 
-//= Enables skill damage adjustment. All adjustments in
-//= skill_damage_db.txt for 'Map' type 16 will be applied.
-//= See the mapflag documentation for details about extra
-//= parameters.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Cydh]
-//============================================================
--- a/npc/mapflag/skill_duration.txt
+++ b/npc/mapflag/skill_duration.txt
@@ -1,553 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Adjust Skill Duration.
-//===== Description: ========================================= 
-//= Sets skill time limit on specified map.
-//===== Structure ============================================
-//= mapname	skill_duration	skill_name,percentage
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Cydh]
-//============================================================
-
-//============================================================
-// Guild Event Maps
-//============================================================
-guild_vs1	mapflag	skill_duration	HT_SKIDTRAP,400
-guild_vs1	mapflag	skill_duration	HT_LANDMINE,400
-guild_vs1	mapflag	skill_duration	HT_ANKLESNARE,400
-guild_vs1	mapflag	skill_duration	HT_SHOCKWAVE,400
-guild_vs1	mapflag	skill_duration	HT_SANDMAN,400
-guild_vs1	mapflag	skill_duration	HT_FLASHER,400
-guild_vs1	mapflag	skill_duration	HT_FREEZINGTRAP,400
-guild_vs1	mapflag	skill_duration	HT_BLASTMINE,400
-guild_vs1	mapflag	skill_duration	HT_CLAYMORETRAP,400
-guild_vs1	mapflag	skill_duration	HT_TALKIEBOX,400
-
-guild_vs2	mapflag	skill_duration	HT_SKIDTRAP,400
-guild_vs2	mapflag	skill_duration	HT_LANDMINE,400
-guild_vs2	mapflag	skill_duration	HT_ANKLESNARE,400
-guild_vs2	mapflag	skill_duration	HT_SHOCKWAVE,400
-guild_vs2	mapflag	skill_duration	HT_SANDMAN,400
-guild_vs2	mapflag	skill_duration	HT_FLASHER,400
-guild_vs2	mapflag	skill_duration	HT_FREEZINGTRAP,400
-guild_vs2	mapflag	skill_duration	HT_BLASTMINE,400
-guild_vs2	mapflag	skill_duration	HT_CLAYMORETRAP,400
-guild_vs2	mapflag	skill_duration	HT_TALKIEBOX,400
-
-guild_vs3	mapflag	skill_duration	HT_SKIDTRAP,400
-guild_vs3	mapflag	skill_duration	HT_LANDMINE,400
-guild_vs3	mapflag	skill_duration	HT_ANKLESNARE,400
-guild_vs3	mapflag	skill_duration	HT_SHOCKWAVE,400
-guild_vs3	mapflag	skill_duration	HT_SANDMAN,400
-guild_vs3	mapflag	skill_duration	HT_FLASHER,400
-guild_vs3	mapflag	skill_duration	HT_FREEZINGTRAP,400
-guild_vs3	mapflag	skill_duration	HT_BLASTMINE,400
-guild_vs3	mapflag	skill_duration	HT_CLAYMORETRAP,400
-guild_vs3	mapflag	skill_duration	HT_TALKIEBOX,400
-
-guild_vs4	mapflag	skill_duration	HT_SKIDTRAP,400
-guild_vs4	mapflag	skill_duration	HT_LANDMINE,400
-guild_vs4	mapflag	skill_duration	HT_ANKLESNARE,400
-guild_vs4	mapflag	skill_duration	HT_SHOCKWAVE,400
-guild_vs4	mapflag	skill_duration	HT_SANDMAN,400
-guild_vs4	mapflag	skill_duration	HT_FLASHER,400
-guild_vs4	mapflag	skill_duration	HT_FREEZINGTRAP,400
-guild_vs4	mapflag	skill_duration	HT_BLASTMINE,400
-guild_vs4	mapflag	skill_duration	HT_CLAYMORETRAP,400
-guild_vs4	mapflag	skill_duration	HT_TALKIEBOX,400
-
-guild_vs5	mapflag	skill_duration	HT_SKIDTRAP,400
-guild_vs5	mapflag	skill_duration	HT_LANDMINE,400
-guild_vs5	mapflag	skill_duration	HT_ANKLESNARE,400
-guild_vs5	mapflag	skill_duration	HT_SHOCKWAVE,400
-guild_vs5	mapflag	skill_duration	HT_SANDMAN,400
-guild_vs5	mapflag	skill_duration	HT_FLASHER,400
-guild_vs5	mapflag	skill_duration	HT_FREEZINGTRAP,400
-guild_vs5	mapflag	skill_duration	HT_BLASTMINE,400
-guild_vs5	mapflag	skill_duration	HT_CLAYMORETRAP,400
-guild_vs5	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Luina Castles
-//============================================================
-aldeg_cas01	mapflag	skill_duration	HT_SKIDTRAP,400
-aldeg_cas01	mapflag	skill_duration	HT_LANDMINE,400
-aldeg_cas01	mapflag	skill_duration	HT_ANKLESNARE,400
-aldeg_cas01	mapflag	skill_duration	HT_SHOCKWAVE,400
-aldeg_cas01	mapflag	skill_duration	HT_SANDMAN,400
-aldeg_cas01	mapflag	skill_duration	HT_FLASHER,400
-aldeg_cas01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-aldeg_cas01	mapflag	skill_duration	HT_BLASTMINE,400
-aldeg_cas01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-aldeg_cas01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-aldeg_cas02	mapflag	skill_duration	HT_SKIDTRAP,400
-aldeg_cas02	mapflag	skill_duration	HT_LANDMINE,400
-aldeg_cas02	mapflag	skill_duration	HT_ANKLESNARE,400
-aldeg_cas02	mapflag	skill_duration	HT_SHOCKWAVE,400
-aldeg_cas02	mapflag	skill_duration	HT_SANDMAN,400
-aldeg_cas02	mapflag	skill_duration	HT_FLASHER,400
-aldeg_cas02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-aldeg_cas02	mapflag	skill_duration	HT_BLASTMINE,400
-aldeg_cas02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-aldeg_cas02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-aldeg_cas03	mapflag	skill_duration	HT_SKIDTRAP,400
-aldeg_cas03	mapflag	skill_duration	HT_LANDMINE,400
-aldeg_cas03	mapflag	skill_duration	HT_ANKLESNARE,400
-aldeg_cas03	mapflag	skill_duration	HT_SHOCKWAVE,400
-aldeg_cas03	mapflag	skill_duration	HT_SANDMAN,400
-aldeg_cas03	mapflag	skill_duration	HT_FLASHER,400
-aldeg_cas03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-aldeg_cas03	mapflag	skill_duration	HT_BLASTMINE,400
-aldeg_cas03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-aldeg_cas03	mapflag	skill_duration	HT_TALKIEBOX,400
-
-aldeg_cas04	mapflag	skill_duration	HT_SKIDTRAP,400
-aldeg_cas04	mapflag	skill_duration	HT_LANDMINE,400
-aldeg_cas04	mapflag	skill_duration	HT_ANKLESNARE,400
-aldeg_cas04	mapflag	skill_duration	HT_SHOCKWAVE,400
-aldeg_cas04	mapflag	skill_duration	HT_SANDMAN,400
-aldeg_cas04	mapflag	skill_duration	HT_FLASHER,400
-aldeg_cas04	mapflag	skill_duration	HT_FREEZINGTRAP,400
-aldeg_cas04	mapflag	skill_duration	HT_BLASTMINE,400
-aldeg_cas04	mapflag	skill_duration	HT_CLAYMORETRAP,400
-aldeg_cas04	mapflag	skill_duration	HT_TALKIEBOX,400
-
-aldeg_cas05	mapflag	skill_duration	HT_SKIDTRAP,400
-aldeg_cas05	mapflag	skill_duration	HT_LANDMINE,400
-aldeg_cas05	mapflag	skill_duration	HT_ANKLESNARE,400
-aldeg_cas05	mapflag	skill_duration	HT_SHOCKWAVE,400
-aldeg_cas05	mapflag	skill_duration	HT_SANDMAN,400
-aldeg_cas05	mapflag	skill_duration	HT_FLASHER,400
-aldeg_cas05	mapflag	skill_duration	HT_FREEZINGTRAP,400
-aldeg_cas05	mapflag	skill_duration	HT_BLASTMINE,400
-aldeg_cas05	mapflag	skill_duration	HT_CLAYMORETRAP,400
-aldeg_cas05	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Britoniah Castles
-//============================================================
-gefg_cas01	mapflag	skill_duration	HT_SKIDTRAP,400
-gefg_cas01	mapflag	skill_duration	HT_LANDMINE,400
-gefg_cas01	mapflag	skill_duration	HT_ANKLESNARE,400
-gefg_cas01	mapflag	skill_duration	HT_SHOCKWAVE,400
-gefg_cas01	mapflag	skill_duration	HT_SANDMAN,400
-gefg_cas01	mapflag	skill_duration	HT_FLASHER,400
-gefg_cas01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-gefg_cas01	mapflag	skill_duration	HT_BLASTMINE,400
-gefg_cas01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-gefg_cas01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-gefg_cas02	mapflag	skill_duration	HT_SKIDTRAP,400
-gefg_cas02	mapflag	skill_duration	HT_LANDMINE,400
-gefg_cas02	mapflag	skill_duration	HT_ANKLESNARE,400
-gefg_cas02	mapflag	skill_duration	HT_SHOCKWAVE,400
-gefg_cas02	mapflag	skill_duration	HT_SANDMAN,400
-gefg_cas02	mapflag	skill_duration	HT_FLASHER,400
-gefg_cas02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-gefg_cas02	mapflag	skill_duration	HT_BLASTMINE,400
-gefg_cas02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-gefg_cas02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-gefg_cas03	mapflag	skill_duration	HT_SKIDTRAP,400
-gefg_cas03	mapflag	skill_duration	HT_LANDMINE,400
-gefg_cas03	mapflag	skill_duration	HT_ANKLESNARE,400
-gefg_cas03	mapflag	skill_duration	HT_SHOCKWAVE,400
-gefg_cas03	mapflag	skill_duration	HT_SANDMAN,400
-gefg_cas03	mapflag	skill_duration	HT_FLASHER,400
-gefg_cas03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-gefg_cas03	mapflag	skill_duration	HT_BLASTMINE,400
-gefg_cas03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-gefg_cas03	mapflag	skill_duration	HT_TALKIEBOX,400
-
-gefg_cas04	mapflag	skill_duration	HT_SKIDTRAP,400
-gefg_cas04	mapflag	skill_duration	HT_LANDMINE,400
-gefg_cas04	mapflag	skill_duration	HT_ANKLESNARE,400
-gefg_cas04	mapflag	skill_duration	HT_SHOCKWAVE,400
-gefg_cas04	mapflag	skill_duration	HT_SANDMAN,400
-gefg_cas04	mapflag	skill_duration	HT_FLASHER,400
-gefg_cas04	mapflag	skill_duration	HT_FREEZINGTRAP,400
-gefg_cas04	mapflag	skill_duration	HT_BLASTMINE,400
-gefg_cas04	mapflag	skill_duration	HT_CLAYMORETRAP,400
-gefg_cas04	mapflag	skill_duration	HT_TALKIEBOX,400
-
-gefg_cas05	mapflag	skill_duration	HT_SKIDTRAP,400
-gefg_cas05	mapflag	skill_duration	HT_LANDMINE,400
-gefg_cas05	mapflag	skill_duration	HT_ANKLESNARE,400
-gefg_cas05	mapflag	skill_duration	HT_SHOCKWAVE,400
-gefg_cas05	mapflag	skill_duration	HT_SANDMAN,400
-gefg_cas05	mapflag	skill_duration	HT_FLASHER,400
-gefg_cas05	mapflag	skill_duration	HT_FREEZINGTRAP,400
-gefg_cas05	mapflag	skill_duration	HT_BLASTMINE,400
-gefg_cas05	mapflag	skill_duration	HT_CLAYMORETRAP,400
-gefg_cas05	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Greenwood Castles
-//============================================================
-payg_cas01	mapflag	skill_duration	HT_SKIDTRAP,400
-payg_cas01	mapflag	skill_duration	HT_LANDMINE,400
-payg_cas01	mapflag	skill_duration	HT_ANKLESNARE,400
-payg_cas01	mapflag	skill_duration	HT_SHOCKWAVE,400
-payg_cas01	mapflag	skill_duration	HT_SANDMAN,400
-payg_cas01	mapflag	skill_duration	HT_FLASHER,400
-payg_cas01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-payg_cas01	mapflag	skill_duration	HT_BLASTMINE,400
-payg_cas01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-payg_cas01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-payg_cas02	mapflag	skill_duration	HT_SKIDTRAP,400
-payg_cas02	mapflag	skill_duration	HT_LANDMINE,400
-payg_cas02	mapflag	skill_duration	HT_ANKLESNARE,400
-payg_cas02	mapflag	skill_duration	HT_SHOCKWAVE,400
-payg_cas02	mapflag	skill_duration	HT_SANDMAN,400
-payg_cas02	mapflag	skill_duration	HT_FLASHER,400
-payg_cas02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-payg_cas02	mapflag	skill_duration	HT_BLASTMINE,400
-payg_cas02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-payg_cas02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-payg_cas03	mapflag	skill_duration	HT_SKIDTRAP,400
-payg_cas03	mapflag	skill_duration	HT_LANDMINE,400
-payg_cas03	mapflag	skill_duration	HT_ANKLESNARE,400
-payg_cas03	mapflag	skill_duration	HT_SHOCKWAVE,400
-payg_cas03	mapflag	skill_duration	HT_SANDMAN,400
-payg_cas03	mapflag	skill_duration	HT_FLASHER,400
-payg_cas03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-payg_cas03	mapflag	skill_duration	HT_BLASTMINE,400
-payg_cas03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-payg_cas03	mapflag	skill_duration	HT_TALKIEBOX,400
-
-payg_cas04	mapflag	skill_duration	HT_SKIDTRAP,400
-payg_cas04	mapflag	skill_duration	HT_LANDMINE,400
-payg_cas04	mapflag	skill_duration	HT_ANKLESNARE,400
-payg_cas04	mapflag	skill_duration	HT_SHOCKWAVE,400
-payg_cas04	mapflag	skill_duration	HT_SANDMAN,400
-payg_cas04	mapflag	skill_duration	HT_FLASHER,400
-payg_cas04	mapflag	skill_duration	HT_FREEZINGTRAP,400
-payg_cas04	mapflag	skill_duration	HT_BLASTMINE,400
-payg_cas04	mapflag	skill_duration	HT_CLAYMORETRAP,400
-payg_cas04	mapflag	skill_duration	HT_TALKIEBOX,400
-
-payg_cas05	mapflag	skill_duration	HT_SKIDTRAP,400
-payg_cas05	mapflag	skill_duration	HT_LANDMINE,400
-payg_cas05	mapflag	skill_duration	HT_ANKLESNARE,400
-payg_cas05	mapflag	skill_duration	HT_SHOCKWAVE,400
-payg_cas05	mapflag	skill_duration	HT_SANDMAN,400
-payg_cas05	mapflag	skill_duration	HT_FLASHER,400
-payg_cas05	mapflag	skill_duration	HT_FREEZINGTRAP,400
-payg_cas05	mapflag	skill_duration	HT_BLASTMINE,400
-payg_cas05	mapflag	skill_duration	HT_CLAYMORETRAP,400
-payg_cas05	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Valkyrie Castles
-//============================================================
-prtg_cas01	mapflag	skill_duration	HT_SKIDTRAP,400
-prtg_cas01	mapflag	skill_duration	HT_LANDMINE,400
-prtg_cas01	mapflag	skill_duration	HT_ANKLESNARE,400
-prtg_cas01	mapflag	skill_duration	HT_SHOCKWAVE,400
-prtg_cas01	mapflag	skill_duration	HT_SANDMAN,400
-prtg_cas01	mapflag	skill_duration	HT_FLASHER,400
-prtg_cas01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-prtg_cas01	mapflag	skill_duration	HT_BLASTMINE,400
-prtg_cas01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-prtg_cas01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-prtg_cas02	mapflag	skill_duration	HT_SKIDTRAP,400
-prtg_cas02	mapflag	skill_duration	HT_LANDMINE,400
-prtg_cas02	mapflag	skill_duration	HT_ANKLESNARE,400
-prtg_cas02	mapflag	skill_duration	HT_SHOCKWAVE,400
-prtg_cas02	mapflag	skill_duration	HT_SANDMAN,400
-prtg_cas02	mapflag	skill_duration	HT_FLASHER,400
-prtg_cas02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-prtg_cas02	mapflag	skill_duration	HT_BLASTMINE,400
-prtg_cas02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-prtg_cas02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-prtg_cas03	mapflag	skill_duration	HT_SKIDTRAP,400
-prtg_cas03	mapflag	skill_duration	HT_LANDMINE,400
-prtg_cas03	mapflag	skill_duration	HT_ANKLESNARE,400
-prtg_cas03	mapflag	skill_duration	HT_SHOCKWAVE,400
-prtg_cas03	mapflag	skill_duration	HT_SANDMAN,400
-prtg_cas03	mapflag	skill_duration	HT_FLASHER,400
-prtg_cas03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-prtg_cas03	mapflag	skill_duration	HT_BLASTMINE,400
-prtg_cas03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-prtg_cas03	mapflag	skill_duration	HT_TALKIEBOX,400
-
-prtg_cas04	mapflag	skill_duration	HT_SKIDTRAP,400
-prtg_cas04	mapflag	skill_duration	HT_LANDMINE,400
-prtg_cas04	mapflag	skill_duration	HT_ANKLESNARE,400
-prtg_cas04	mapflag	skill_duration	HT_SHOCKWAVE,400
-prtg_cas04	mapflag	skill_duration	HT_SANDMAN,400
-prtg_cas04	mapflag	skill_duration	HT_FLASHER,400
-prtg_cas04	mapflag	skill_duration	HT_FREEZINGTRAP,400
-prtg_cas04	mapflag	skill_duration	HT_BLASTMINE,400
-prtg_cas04	mapflag	skill_duration	HT_CLAYMORETRAP,400
-prtg_cas04	mapflag	skill_duration	HT_TALKIEBOX,400
-
-prtg_cas05	mapflag	skill_duration	HT_SKIDTRAP,400
-prtg_cas05	mapflag	skill_duration	HT_LANDMINE,400
-prtg_cas05	mapflag	skill_duration	HT_ANKLESNARE,400
-prtg_cas05	mapflag	skill_duration	HT_SHOCKWAVE,400
-prtg_cas05	mapflag	skill_duration	HT_SANDMAN,400
-prtg_cas05	mapflag	skill_duration	HT_FLASHER,400
-prtg_cas05	mapflag	skill_duration	HT_FREEZINGTRAP,400
-prtg_cas05	mapflag	skill_duration	HT_BLASTMINE,400
-prtg_cas05	mapflag	skill_duration	HT_CLAYMORETRAP,400
-prtg_cas05	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Schwarzwald Castles
-//============================================================
-schg_cas01	mapflag	skill_duration	HT_SKIDTRAP,400
-schg_cas01	mapflag	skill_duration	HT_LANDMINE,400
-schg_cas01	mapflag	skill_duration	HT_ANKLESNARE,400
-schg_cas01	mapflag	skill_duration	HT_SHOCKWAVE,400
-schg_cas01	mapflag	skill_duration	HT_SANDMAN,400
-schg_cas01	mapflag	skill_duration	HT_FLASHER,400
-schg_cas01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-schg_cas01	mapflag	skill_duration	HT_BLASTMINE,400
-schg_cas01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-schg_cas01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-schg_cas02	mapflag	skill_duration	HT_SKIDTRAP,400
-schg_cas02	mapflag	skill_duration	HT_LANDMINE,400
-schg_cas02	mapflag	skill_duration	HT_ANKLESNARE,400
-schg_cas02	mapflag	skill_duration	HT_SHOCKWAVE,400
-schg_cas02	mapflag	skill_duration	HT_SANDMAN,400
-schg_cas02	mapflag	skill_duration	HT_FLASHER,400
-schg_cas02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-schg_cas02	mapflag	skill_duration	HT_BLASTMINE,400
-schg_cas02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-schg_cas02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-schg_cas03	mapflag	skill_duration	HT_SKIDTRAP,400
-schg_cas03	mapflag	skill_duration	HT_LANDMINE,400
-schg_cas03	mapflag	skill_duration	HT_ANKLESNARE,400
-schg_cas03	mapflag	skill_duration	HT_SHOCKWAVE,400
-schg_cas03	mapflag	skill_duration	HT_SANDMAN,400
-schg_cas03	mapflag	skill_duration	HT_FLASHER,400
-schg_cas03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-schg_cas03	mapflag	skill_duration	HT_BLASTMINE,400
-schg_cas03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-schg_cas03	mapflag	skill_duration	HT_TALKIEBOX,400
-
-schg_cas04	mapflag	skill_duration	HT_SKIDTRAP,400
-schg_cas04	mapflag	skill_duration	HT_LANDMINE,400
-schg_cas04	mapflag	skill_duration	HT_ANKLESNARE,400
-schg_cas04	mapflag	skill_duration	HT_SHOCKWAVE,400
-schg_cas04	mapflag	skill_duration	HT_SANDMAN,400
-schg_cas04	mapflag	skill_duration	HT_FLASHER,400
-schg_cas04	mapflag	skill_duration	HT_FREEZINGTRAP,400
-schg_cas04	mapflag	skill_duration	HT_BLASTMINE,400
-schg_cas04	mapflag	skill_duration	HT_CLAYMORETRAP,400
-schg_cas04	mapflag	skill_duration	HT_TALKIEBOX,400
-
-schg_cas05	mapflag	skill_duration	HT_SKIDTRAP,400
-schg_cas05	mapflag	skill_duration	HT_LANDMINE,400
-schg_cas05	mapflag	skill_duration	HT_ANKLESNARE,400
-schg_cas05	mapflag	skill_duration	HT_SHOCKWAVE,400
-schg_cas05	mapflag	skill_duration	HT_SANDMAN,400
-schg_cas05	mapflag	skill_duration	HT_FLASHER,400
-schg_cas05	mapflag	skill_duration	HT_FREEZINGTRAP,400
-schg_cas05	mapflag	skill_duration	HT_BLASTMINE,400
-schg_cas05	mapflag	skill_duration	HT_CLAYMORETRAP,400
-schg_cas05	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Arunafeltz Castles
-//============================================================
-arug_cas01	mapflag	skill_duration	HT_SKIDTRAP,400
-arug_cas01	mapflag	skill_duration	HT_LANDMINE,400
-arug_cas01	mapflag	skill_duration	HT_ANKLESNARE,400
-arug_cas01	mapflag	skill_duration	HT_SHOCKWAVE,400
-arug_cas01	mapflag	skill_duration	HT_SANDMAN,400
-arug_cas01	mapflag	skill_duration	HT_FLASHER,400
-arug_cas01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-arug_cas01	mapflag	skill_duration	HT_BLASTMINE,400
-arug_cas01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-arug_cas01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-arug_cas02	mapflag	skill_duration	HT_SKIDTRAP,400
-arug_cas02	mapflag	skill_duration	HT_LANDMINE,400
-arug_cas02	mapflag	skill_duration	HT_ANKLESNARE,400
-arug_cas02	mapflag	skill_duration	HT_SHOCKWAVE,400
-arug_cas02	mapflag	skill_duration	HT_SANDMAN,400
-arug_cas02	mapflag	skill_duration	HT_FLASHER,400
-arug_cas02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-arug_cas02	mapflag	skill_duration	HT_BLASTMINE,400
-arug_cas02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-arug_cas02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-arug_cas03	mapflag	skill_duration	HT_SKIDTRAP,400
-arug_cas03	mapflag	skill_duration	HT_LANDMINE,400
-arug_cas03	mapflag	skill_duration	HT_ANKLESNARE,400
-arug_cas03	mapflag	skill_duration	HT_SHOCKWAVE,400
-arug_cas03	mapflag	skill_duration	HT_SANDMAN,400
-arug_cas03	mapflag	skill_duration	HT_FLASHER,400
-arug_cas03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-arug_cas03	mapflag	skill_duration	HT_BLASTMINE,400
-arug_cas03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-arug_cas03	mapflag	skill_duration	HT_TALKIEBOX,400
-
-arug_cas04	mapflag	skill_duration	HT_SKIDTRAP,400
-arug_cas04	mapflag	skill_duration	HT_LANDMINE,400
-arug_cas04	mapflag	skill_duration	HT_ANKLESNARE,400
-arug_cas04	mapflag	skill_duration	HT_SHOCKWAVE,400
-arug_cas04	mapflag	skill_duration	HT_SANDMAN,400
-arug_cas04	mapflag	skill_duration	HT_FLASHER,400
-arug_cas04	mapflag	skill_duration	HT_FREEZINGTRAP,400
-arug_cas04	mapflag	skill_duration	HT_BLASTMINE,400
-arug_cas04	mapflag	skill_duration	HT_CLAYMORETRAP,400
-arug_cas04	mapflag	skill_duration	HT_TALKIEBOX,400
-
-arug_cas05	mapflag	skill_duration	HT_SKIDTRAP,400
-arug_cas05	mapflag	skill_duration	HT_LANDMINE,400
-arug_cas05	mapflag	skill_duration	HT_ANKLESNARE,400
-arug_cas05	mapflag	skill_duration	HT_SHOCKWAVE,400
-arug_cas05	mapflag	skill_duration	HT_SANDMAN,400
-arug_cas05	mapflag	skill_duration	HT_FLASHER,400
-arug_cas05	mapflag	skill_duration	HT_FREEZINGTRAP,400
-arug_cas05	mapflag	skill_duration	HT_BLASTMINE,400
-arug_cas05	mapflag	skill_duration	HT_CLAYMORETRAP,400
-arug_cas05	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Novice Guild Castles
-//============================================================
-n_castle	mapflag	skill_duration	HT_SKIDTRAP,400
-n_castle	mapflag	skill_duration	HT_LANDMINE,400
-n_castle	mapflag	skill_duration	HT_ANKLESNARE,400
-n_castle	mapflag	skill_duration	HT_SHOCKWAVE,400
-n_castle	mapflag	skill_duration	HT_SANDMAN,400
-n_castle	mapflag	skill_duration	HT_FLASHER,400
-n_castle	mapflag	skill_duration	HT_FREEZINGTRAP,400
-n_castle	mapflag	skill_duration	HT_BLASTMINE,400
-n_castle	mapflag	skill_duration	HT_CLAYMORETRAP,400
-n_castle	mapflag	skill_duration	HT_TALKIEBOX,400
-
-nguild_alde	mapflag	skill_duration	HT_SKIDTRAP,400
-nguild_alde	mapflag	skill_duration	HT_LANDMINE,400
-nguild_alde	mapflag	skill_duration	HT_ANKLESNARE,400
-nguild_alde	mapflag	skill_duration	HT_SHOCKWAVE,400
-nguild_alde	mapflag	skill_duration	HT_SANDMAN,400
-nguild_alde	mapflag	skill_duration	HT_FLASHER,400
-nguild_alde	mapflag	skill_duration	HT_FREEZINGTRAP,400
-nguild_alde	mapflag	skill_duration	HT_BLASTMINE,400
-nguild_alde	mapflag	skill_duration	HT_CLAYMORETRAP,400
-nguild_alde	mapflag	skill_duration	HT_TALKIEBOX,400
-
-nguild_gef	mapflag	skill_duration	HT_SKIDTRAP,400
-nguild_gef	mapflag	skill_duration	HT_LANDMINE,400
-nguild_gef	mapflag	skill_duration	HT_ANKLESNARE,400
-nguild_gef	mapflag	skill_duration	HT_SHOCKWAVE,400
-nguild_gef	mapflag	skill_duration	HT_SANDMAN,400
-nguild_gef	mapflag	skill_duration	HT_FLASHER,400
-nguild_gef	mapflag	skill_duration	HT_FREEZINGTRAP,400
-nguild_gef	mapflag	skill_duration	HT_BLASTMINE,400
-nguild_gef	mapflag	skill_duration	HT_CLAYMORETRAP,400
-nguild_gef	mapflag	skill_duration	HT_TALKIEBOX,400
-
-nguild_pay	mapflag	skill_duration	HT_SKIDTRAP,400
-nguild_pay	mapflag	skill_duration	HT_LANDMINE,400
-nguild_pay	mapflag	skill_duration	HT_ANKLESNARE,400
-nguild_pay	mapflag	skill_duration	HT_SHOCKWAVE,400
-nguild_pay	mapflag	skill_duration	HT_SANDMAN,400
-nguild_pay	mapflag	skill_duration	HT_FLASHER,400
-nguild_pay	mapflag	skill_duration	HT_FREEZINGTRAP,400
-nguild_pay	mapflag	skill_duration	HT_BLASTMINE,400
-nguild_pay	mapflag	skill_duration	HT_CLAYMORETRAP,400
-nguild_pay	mapflag	skill_duration	HT_TALKIEBOX,400
-
-nguild_prt	mapflag	skill_duration	HT_SKIDTRAP,400
-nguild_prt	mapflag	skill_duration	HT_LANDMINE,400
-nguild_prt	mapflag	skill_duration	HT_ANKLESNARE,400
-nguild_prt	mapflag	skill_duration	HT_SHOCKWAVE,400
-nguild_prt	mapflag	skill_duration	HT_SANDMAN,400
-nguild_prt	mapflag	skill_duration	HT_FLASHER,400
-nguild_prt	mapflag	skill_duration	HT_FREEZINGTRAP,400
-nguild_prt	mapflag	skill_duration	HT_BLASTMINE,400
-nguild_prt	mapflag	skill_duration	HT_CLAYMORETRAP,400
-nguild_prt	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_a01	mapflag	skill_duration	HT_SKIDTRAP,400
-bat_a01	mapflag	skill_duration	HT_LANDMINE,400
-bat_a01	mapflag	skill_duration	HT_ANKLESNARE,400
-bat_a01	mapflag	skill_duration	HT_SHOCKWAVE,400
-bat_a01	mapflag	skill_duration	HT_SANDMAN,400
-bat_a01	mapflag	skill_duration	HT_FLASHER,400
-bat_a01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-bat_a01	mapflag	skill_duration	HT_BLASTMINE,400
-bat_a01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-bat_a01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-bat_a02	mapflag	skill_duration	HT_SKIDTRAP,400
-bat_a02	mapflag	skill_duration	HT_LANDMINE,400
-bat_a02	mapflag	skill_duration	HT_ANKLESNARE,400
-bat_a02	mapflag	skill_duration	HT_SHOCKWAVE,400
-bat_a02	mapflag	skill_duration	HT_SANDMAN,400
-bat_a02	mapflag	skill_duration	HT_FLASHER,400
-bat_a02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-bat_a02	mapflag	skill_duration	HT_BLASTMINE,400
-bat_a02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-bat_a02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-bat_b01	mapflag	skill_duration	HT_SKIDTRAP,400
-bat_b01	mapflag	skill_duration	HT_LANDMINE,400
-bat_b01	mapflag	skill_duration	HT_ANKLESNARE,400
-bat_b01	mapflag	skill_duration	HT_SHOCKWAVE,400
-bat_b01	mapflag	skill_duration	HT_SANDMAN,400
-bat_b01	mapflag	skill_duration	HT_FLASHER,400
-bat_b01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-bat_b01	mapflag	skill_duration	HT_BLASTMINE,400
-bat_b01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-bat_b01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-bat_b02	mapflag	skill_duration	HT_SKIDTRAP,400
-bat_b02	mapflag	skill_duration	HT_LANDMINE,400
-bat_b02	mapflag	skill_duration	HT_ANKLESNARE,400
-bat_b02	mapflag	skill_duration	HT_SHOCKWAVE,400
-bat_b02	mapflag	skill_duration	HT_SANDMAN,400
-bat_b02	mapflag	skill_duration	HT_FLASHER,400
-bat_b02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-bat_b02	mapflag	skill_duration	HT_BLASTMINE,400
-bat_b02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-bat_b02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-bat_c01	mapflag	skill_duration	HT_SKIDTRAP,400
-bat_c01	mapflag	skill_duration	HT_LANDMINE,400
-bat_c01	mapflag	skill_duration	HT_ANKLESNARE,400
-bat_c01	mapflag	skill_duration	HT_SHOCKWAVE,400
-bat_c01	mapflag	skill_duration	HT_SANDMAN,400
-bat_c01	mapflag	skill_duration	HT_FLASHER,400
-bat_c01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-bat_c01	mapflag	skill_duration	HT_BLASTMINE,400
-bat_c01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-bat_c01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-bat_c02	mapflag	skill_duration	HT_SKIDTRAP,400
-bat_c02	mapflag	skill_duration	HT_LANDMINE,400
-bat_c02	mapflag	skill_duration	HT_ANKLESNARE,400
-bat_c02	mapflag	skill_duration	HT_SHOCKWAVE,400
-bat_c02	mapflag	skill_duration	HT_SANDMAN,400
-bat_c02	mapflag	skill_duration	HT_FLASHER,400
-bat_c02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-bat_c02	mapflag	skill_duration	HT_BLASTMINE,400
-bat_c02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-bat_c02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-bat_c03	mapflag	skill_duration	HT_SKIDTRAP,400
-bat_c03	mapflag	skill_duration	HT_LANDMINE,400
-bat_c03	mapflag	skill_duration	HT_ANKLESNARE,400
-bat_c03	mapflag	skill_duration	HT_SHOCKWAVE,400
-bat_c03	mapflag	skill_duration	HT_SANDMAN,400
-bat_c03	mapflag	skill_duration	HT_FLASHER,400
-bat_c03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-bat_c03	mapflag	skill_duration	HT_BLASTMINE,400
-bat_c03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-bat_c03	mapflag	skill_duration	HT_TALKIEBOX,400
--- a/npc/mapflag/town.txt
+++ b/npc/mapflag/town.txt
@@ -1,31 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Town.
-//===== Description: ========================================= 
-//= Designates a map as a town, granting mailbox access.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Epoque]
-//= 1.1 Renewal split. [Euphy]
-//============================================================
-
-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
--- a/npc/re/mapflag/gvg.txt
+++ b/npc/re/mapflag/gvg.txt
@@ -1,39 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Guild versus Guild mode.
-//===== 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_dungeon: Describes dungeon maps for WoE.
-//= gvg_te: Turns on GvG mode for WoE:TE.
-//= gvg_te_castle: Describes castle maps for WoE:TE.
-//===== Changelogs: ==========================================
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added GVG TE Castles. [Cydh]
-//= 1.2 Disable costumes in GvG castles. [Aleos]
-//============================================================
-
-//============================================================
-// Guild Dungeons
-//============================================================
-gld2_ald	mapflag	gvg_dungeon
-gld2_gef	mapflag	gvg_dungeon
-gld2_pay	mapflag	gvg_dungeon
-gld2_prt	mapflag	gvg_dungeon
-teg_dun01	mapflag	gvg_dungeon
-teg_dun02	mapflag	gvg_dungeon
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	gvg_te_castle
-te_prtcas02	mapflag	gvg_te_castle
-te_prtcas03	mapflag	gvg_te_castle
-te_prtcas04	mapflag	gvg_te_castle
-te_prtcas05	mapflag	gvg_te_castle
-te_aldecas1	mapflag	gvg_te_castle
-te_aldecas2	mapflag	gvg_te_castle
-te_aldecas3	mapflag	gvg_te_castle
-te_aldecas4	mapflag	gvg_te_castle
-te_aldecas5	mapflag	gvg_te_castle
--- a/npc/re/mapflag/hidemobhpbar.txt
+++ b/npc/re/mapflag/hidemobhpbar.txt
@@ -1,45 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: hidemobhpbar.
-//===== Description: =========================================
-//= Hide monster's HP bar (added in episode 14.2).
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Capuche]
-//============================================================
-
-//============================================================
-// Izlude Academy
-//============================================================
-iz_ac01	mapflag	hidemobhpbar
-iz_ac01_a	mapflag	hidemobhpbar
-iz_ac01_b	mapflag	hidemobhpbar
-iz_ac01_c	mapflag	hidemobhpbar
-iz_ac01_d	mapflag	hidemobhpbar
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	hidemobhpbar
-te_prtcas02	mapflag	hidemobhpbar
-te_prtcas03	mapflag	hidemobhpbar
-te_prtcas04	mapflag	hidemobhpbar
-te_prtcas05	mapflag	hidemobhpbar
-te_aldecas1	mapflag	hidemobhpbar
-te_aldecas2	mapflag	hidemobhpbar
-te_aldecas3	mapflag	hidemobhpbar
-te_aldecas4	mapflag	hidemobhpbar
-te_aldecas5	mapflag	hidemobhpbar
-
-//============================================================
-// Guild Dungeons
-//============================================================
-gld2_ald	mapflag	hidemobhpbar
-gld2_gef	mapflag	hidemobhpbar
-gld2_pay	mapflag	hidemobhpbar
-gld2_prt	mapflag	hidemobhpbar
-teg_dun01	mapflag	hidemobhpbar
-teg_dun02	mapflag	hidemobhpbar
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-verus04	mapflag	hidemobhpbar
--- a/npc/re/mapflag/night.txt
+++ b/npc/re/mapflag/night.txt
@@ -1,45 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Night mode.
-//===== Description: ========================================= 
-//= Enables night mode effects.
-//===== Additional Comments: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added Izlude duplicates. [Euphy]
-//============================================================
-
-//============================================================
-// Episode 13.3
-//============================================================
-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
-
-//============================================================
-// Izlude Duplicates
-//============================================================
-izlude_a	mapflag	nightenabled
-izlude_b	mapflag	nightenabled
-izlude_c	mapflag	nightenabled
-izlude_d	mapflag	nightenabled
-prt_fild08a	mapflag	nightenabled
-prt_fild08b	mapflag	nightenabled
-prt_fild08c	mapflag	nightenabled
-prt_fild08d	mapflag	nightenabled
--- a/npc/re/mapflag/nobranch.txt
+++ b/npc/re/mapflag/nobranch.txt
@@ -1,398 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Dead Branch use.
-//===== Description: ========================================= 
-//= Disables the following items:
-//=   Dead Branch (604), Bloody Branch (12103),
-//=   Red Pouch (12024), Poring Box (12109)
-//===== Changelogs: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added Izlude duplicates. [Euphy]
-//= 1.2 Added Nightmare Clock Tower [Lemongrass]
-//= 1.3 Added dali02 [Nova]
-//= 1.4 Added Nightmare Glastheim [Ridley8819]
-//= 1.5 Added WOE:TE maps [Cydh]
-//= 1.6 Added Para Market maps [mazvi]
-//============================================================
-
-//============================================================
-// Paradise Market
-//============================================================
-paramk	mapflag	nobranch
-moc_para01	mapflag	nobranch
-
-//============================================================
-// 3rd Class Job Quests
-//============================================================
-job3_arch01	mapflag	nobranch
-job3_arch02	mapflag	nobranch
-job3_arch03	mapflag	nobranch
-job3_gen01	mapflag	nobranch
-job3_guil01	mapflag	nobranch
-job3_guil02	mapflag	nobranch
-job3_guil03	mapflag	nobranch
-job_ko	mapflag	nobranch
-job_gun	mapflag	nobranch
-job3_rang01	mapflag	nobranch
-job3_rang02	mapflag	nobranch
-job3_rune01	mapflag	nobranch
-job3_rune02	mapflag	nobranch
-job3_rune03	mapflag	nobranch
-job3_sha01	mapflag	nobranch
-job3_war01	mapflag	nobranch
-job3_war02	mapflag	nobranch
-jupe_core2	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
-1@mist	mapflag	nobranch
-dewata	mapflag	nobranch
-dew_in01	mapflag	nobranch
-
-//============================================================
-// Episode Zero & Malaya Port
-//============================================================
-malangdo	mapflag	nobranch
-mal_in01	mapflag	nobranch
-mal_in02	mapflag	nobranch
-1@cash	mapflag	nobranch
-1@pump	mapflag	nobranch
-2@pump	mapflag	nobranch
-1@lhz	mapflag	nobranch
-que_lhz	mapflag	nobranch
-malaya	mapflag	nobranch
-ma_scene01	mapflag	nobranch
-ma_in01	mapflag	nobranch
-ma_zif01	mapflag	nobranch
-ma_zif02	mapflag	nobranch
-ma_zif03	mapflag	nobranch
-ma_zif04	mapflag	nobranch
-ma_zif05	mapflag	nobranch
-ma_zif06	mapflag	nobranch
-ma_zif07	mapflag	nobranch
-ma_zif08	mapflag	nobranch
-ma_zif09	mapflag	nobranch
-1@ma_h	mapflag	nobranch
-1@ma_c	mapflag	nobranch
-1@ma_b	mapflag	nobranch
-c_tower2_	mapflag	nobranch
-c_tower3_	mapflag	nobranch
-gl_chyard_	mapflag	nobranch
-gl_cas02_	mapflag	nobranch
-
-//============================================================
-// Episode 14.2 - Eclage
-//============================================================
-eclage	mapflag	nobranch
-ecl_in01	mapflag	nobranch
-ecl_in02	mapflag	nobranch
-ecl_in03	mapflag	nobranch
-ecl_in04	mapflag	nobranch
-1@ecl	mapflag	nobranch
-ecl_hub01	mapflag	nobranch
-que_avan01	mapflag	nobranch
-
-//============================================================
-// Izlude Duplicates
-//============================================================
-izlude_a	mapflag	nobranch
-izlude_b	mapflag	nobranch
-izlude_c	mapflag	nobranch
-izlude_d	mapflag	nobranch
-
-//============================================================
-// Glastheim Memorial Dungeon
-//============================================================
-1@gl_k	mapflag	nobranch
-2@gl_k	mapflag	nobranch
-
-//============================================================
-// Wave Mode Memorial Dungeon
-//============================================================
-1@def01	mapflag	nobranch
-1@def02	mapflag	nobranch
-1@def03	mapflag	nobranch
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	nobranch
-1@sara	mapflag	nobranch
-dali	mapflag	nobranch
-dali02	mapflag	nobranch
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	nobranch
-1@gef	mapflag	nobranch
-1@gef_in	mapflag	nobranch
-1@spa	mapflag	nobranch
-1@tnm1	mapflag	nobranch
-1@tnm2	mapflag	nobranch
-1@tnm3	mapflag	nobranch
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	nobranch
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	nobranch
-1@air1	mapflag	nobranch
-1@air2	mapflag	nobranch
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-1@dth1	mapflag	nobranch
-1@dth2	mapflag	nobranch
-1@dth3	mapflag	nobranch
-1@rev	mapflag	nobranch
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	nobranch
-1@jtb	mapflag	nobranch
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-1@lab	mapflag	nobranch
-1@uns	mapflag	nobranch
-1@mcd	mapflag	nobranch
-un_myst	mapflag	nobranch
-
-//============================================================
-// Nightmare Biolab
-//============================================================
-lhz_dun_n	mapflag	nobranch
-lhz_d_n2	mapflag	nobranch
-
-//============================================================
-// Infinite Space
-//============================================================
-1@infi	mapflag	nobranch
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_alde_gld	mapflag	nobranch
-te_prt_gld	mapflag	nobranch
-te_prtcas01	mapflag	nobranch
-te_prtcas02	mapflag	nobranch
-te_prtcas03	mapflag	nobranch
-te_prtcas04	mapflag	nobranch
-te_prtcas05	mapflag	nobranch
-te_aldecas1	mapflag	nobranch
-te_aldecas2	mapflag	nobranch
-te_aldecas3	mapflag	nobranch
-te_aldecas4	mapflag	nobranch
-te_aldecas5	mapflag	nobranch
-
-//============================================================
-// Novice Training
-//============================================================
-int_land	mapflag	nobranch
-int_land01	mapflag	nobranch
-int_land02	mapflag	nobranch
-int_land03	mapflag	nobranch
-int_land04	mapflag	nobranch
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-prt_lib	mapflag	nobranch
-prt_lib_q	mapflag	nobranch
-prt_cas	mapflag	nobranch
-prt_cas_q	mapflag	nobranch
-prt_pri00	mapflag	nobranch
-rebel_in	mapflag	nobranch
-que_swat	mapflag	nobranch
-1@mir	mapflag	nobranch
-2@mir	mapflag	nobranch
-1@sthb	mapflag	nobranch
-1@sthc	mapflag	nobranch
-1@sthd	mapflag	nobranch
-1@slw	mapflag	nobranch
-1@swat	mapflag	nobranch
-
-//============================================================
-// Rockridge
-//============================================================
-har_in01	mapflag	nobranch
-rockmi2	mapflag	nobranch
-
-//============================================================
-// Memorial day
-//============================================================
-1@md_gef	mapflag	nobranch
-1@md_pay	mapflag	nobranch
-
-//============================================================
-// Lasagna
-//============================================================
-lasagna	mapflag	nobranch
-lasa_in01	mapflag	nobranch
-conch_in	mapflag	nobranch
-lasa_dun_q	mapflag	nobranch
-
-//============================================================
-// Chicken Mode Nightmare Glastheim
-//============================================================
-1@gl_k2	mapflag	nobranch
-2@gl_k2	mapflag	nobranch
-
-//============================================================
-// Chicken Mode Horror Toy Factory
-//============================================================
-1@xm_d2	mapflag	nobranch
-
-//============================================================
-// Suspicious Shipwreck
-//============================================================
-1@tre	mapflag	nobranch
-
-//============================================================
-// Poring Village
-//============================================================
-1@begi	mapflag	nobranch
-
-//============================================================
-// Volcanic Island Korodo
-//============================================================
-1@crd	mapflag	nobranch
-
-//============================================================
-// Noodles Festival July
-//============================================================
-1@drdo	mapflag	nobranch
-
-//============================================================
-// Soul Reaper Job Change
-//============================================================
-1@soul	mapflag	nobranch
-
-//============================================================
-// Episode 17.1
-//============================================================
-1@cor	mapflag	nobranch
-1@os_a	mapflag	nobranch
-1@os_b	mapflag	nobranch
-1@rgsr	mapflag	nobranch
-pub_cat	mapflag	nobranch
-rgsr_in	mapflag	nobranch
-
-//============================================================
-// Episode 17.2
-//============================================================
-1@bamn	mapflag	nobranch
-1@bamq	mapflag	nobranch
-1@ghg	mapflag	nobranch
-1@herbs	mapflag	nobranch
-1@lost	mapflag	nobranch
-ba_in01	mapflag	nobranch
-1@odin	mapflag	nobranch
-
-//============================================================
-// 4th Jobs Change
-//============================================================
-1@4win	mapflag	nobranch
-1@4mag	mapflag	nobranch
-1@4mst	mapflag	nobranch
-1@4sac	mapflag	nobranch
-1@4tro	mapflag	nobranch
-1@4inq	mapflag	nobranch
-1@4cdn	mapflag	nobranch
-1@4igd	mapflag	nobranch
-1@4drk	mapflag	nobranch
-job4_bio	mapflag	nobranch
-job4_mag	mapflag	nobranch
-job4_tro	mapflag	nobranch
-
-//============================================================
-// Geffen Night Arena
-//============================================================
-1@ge_sn	mapflag	nobranch
-
-//============================================================
-// Traces of Heroes
-//============================================================
-1@mjo1	mapflag	nobranch
-1@mjo2	mapflag	nobranch
-1@spa2	mapflag	nobranch
-
-//============================================================
-// Thanatos Tower Memorial Dungeon
-//============================================================
-1@thts	mapflag	nobranch
-2@thts	mapflag	nobranch
-3@thts	mapflag	nobranch
-4@thts	mapflag	nobranch
-5@thts	mapflag	nobranch
-6@thts	mapflag	nobranch
-7@thts	mapflag	nobranch
-8@thts	mapflag	nobranch
-
-//============================================================
-// Glastheim Challenge Mode
-//============================================================
-1@gl_he	mapflag	nobranch
-1@gl_he2	mapflag	nobranch
-
-//============================================================
-// EDDA
-//============================================================
-1@gl_prq	mapflag	nobranch
-1@gol1	mapflag	nobranch
-1@gol2	mapflag	nobranch
-
-//============================================================
-// 2018 Halloween
-//============================================================
-1@halo	mapflag	nobranch
-
-//============================================================
-// Constellation Tower
-//============================================================
-1@ch_t	mapflag	nobranch
-2@ch_t	mapflag	nobranch
-3@ch_t	mapflag	nobranch
-
-//============================================================
-// Training Ground outside Prontera
-//============================================================
-tra_fild	mapflag	nobranch
-
-//============================================================
-// Episode 18 - Direction of Prayer
-//============================================================
-1@adv	mapflag	nobranch
-1@advs	mapflag	nobranch
-1@nyr	mapflag	nobranch
-1@oz	mapflag	nobranch
-1@tcamp	mapflag	nobranch
-2@nyr	mapflag	nobranch
-que_thr	mapflag	nobranch
-
-//============================================================
-// Sunken Tower
-//============================================================
-1@ch_u	mapflag	nobranch
-
-//============================================================
-// Cash Mall
-//============================================================
-itemmall	mapflag	nobranch
--- a/npc/re/mapflag/nocostume.txt
+++ b/npc/re/mapflag/nocostume.txt
@@ -1,23 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: nocostume
-//===== Description: =========================================
-//= A mapflag to disable costume's sprite on map.
-//= Usage:
-//=     [mapname]	mapflag	nocostume
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Cydh]
-//============================================================
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	nocostume
-te_prtcas02	mapflag	nocostume
-te_prtcas03	mapflag	nocostume
-te_prtcas04	mapflag	nocostume
-te_prtcas05	mapflag	nocostume
-te_aldecas1	mapflag	nocostume
-te_aldecas2	mapflag	nocostume
-te_aldecas3	mapflag	nocostume
-te_aldecas4	mapflag	nocostume
-te_aldecas5	mapflag	nocostume
--- a/npc/re/mapflag/nodynamicnpc.txt
+++ b/npc/re/mapflag/nodynamicnpc.txt
@@ -1,140 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: No dynamic NPC map setting.
-//===== Description: ========================================= 
-//= Blocks the use of dynamic NPCs on a map.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Lemongrass]
-//============================================================
-
-// Mistwood Maze
-1@mist	mapflag	nodynamicnpc
-
-// Culvert
-1@pump	mapflag	nodynamicnpc
-2@pump	mapflag	nodynamicnpc
-
-// Octopus Cave
-1@cash	mapflag	nodynamicnpc
-
-// Bangungot Hospital 2F
-1@ma_h	mapflag	nodynamicnpc
-
-// Buwaya Cave
-1@ma_c	mapflag	nodynamicnpc
-
-// Bakonawa Lake
-1@ma_b	mapflag	nodynamicnpc
-
-// Wolfchev's Laboratory
-1@lhz	mapflag	nodynamicnpc
-
-// Old Glast Heim
-1@gl_k	mapflag	nodynamicnpc
-2@gl_k	mapflag	nodynamicnpc
-
-// Eclage Interior
-1@ecl	mapflag	nodynamicnpc
-
-// Sara's Memories
-1@sara	mapflag	nodynamicnpc
-
-// Geffen Magic Tournament
-1@gef	mapflag	nodynamicnpc
-1@gef_in	mapflag	nodynamicnpc
-1@ge_st	mapflag	nodynamicnpc
-
-// Horror Toy Factory
-1@xm_d	mapflag	nodynamicnpc
-
-// Faceworm's Nest
-1@face	mapflag	nodynamicnpc
-
-// Ghost Palace
-1@spa	mapflag	nodynamicnpc
-
-// Devil's Tower
-1@tnm1	mapflag	nodynamicnpc
-1@tnm2	mapflag	nodynamicnpc
-1@tnm3	mapflag	nodynamicnpc
-
-// Assault on the Airship
-1@air1	mapflag	nodynamicnpc
-1@air2	mapflag	nodynamicnpc
-
-// Fenrir and Sarah
-1@glast	mapflag	nodynamicnpc
-
-// Wave Mode - Forest
-1@def01	mapflag	nodynamicnpc
-
-// Wave Mode - Sky
-1@def02	mapflag	nodynamicnpc
-
-// Nightmarish Jitterbug
-1@jtb	mapflag	nodynamicnpc
-
-// Isle of Bios
-1@dth1	mapflag	nodynamicnpc
-1@dth2	mapflag	nodynamicnpc
-1@dth3	mapflag	nodynamicnpc
-
-// Morse's Cave
-1@rev	mapflag	nodynamicnpc
-
-// Temple of the Demon God
-1@eom	mapflag	nodynamicnpc
-
-// Central Laboratory
-1@lab	mapflag	nodynamicnpc
-
-// Last room
-1@uns	mapflag	nodynamicnpc
-
-// Charleston in Distress
-1@mcd	mapflag	nodynamicnpc
-
-// Ritual of Blessing
-2@mir	mapflag	nodynamicnpc
-
-// Room of Consciousness
-1@mir	mapflag	nodynamicnpc
-
-// Sky Fortress Invasion
-1@sthb	mapflag	nodynamicnpc
-1@sthc	mapflag	nodynamicnpc
-1@sthd	mapflag	nodynamicnpc
-
-// Heart Hunter War Base 1 + 2
-1@swat	mapflag	nodynamicnpc
-
-// Werner Laboratory central room#1 + 2
-1@slw	mapflag	nodynamicnpc
-
-// Infinite Space
-1@infi	mapflag	nodynamicnpc
-
-// Regenschirm
-1@rgsr	mapflag	nodynamicnpc
-
-// Sealed OS
-1@os_b	mapflag	nodynamicnpc
-
-// OS Occupation + 2nd OS Search
-1@os_a	mapflag	nodynamicnpc
-
-// Cor Memorial
-1@cor	mapflag	nodynamicnpc
-
-// Half Moon In The Daylight
-1@pop1	mapflag	nodynamicnpc
-1@pop2	mapflag	nodynamicnpc
-1@pop3	mapflag	nodynamicnpc
-
-// Weekend Dungeon
-1@md_pay	mapflag	nodynamicnpc
-
-// Friday Dungeon
-1@md_gef	mapflag	nodynamicnpc
-
-// Poring Village
-1@begi	mapflag	nodynamicnpc
--- a/npc/re/mapflag/noicewall.txt
+++ b/npc/re/mapflag/noicewall.txt
@@ -1,22 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disables Ice Wall.
-//===== Description: =========================================
-//= Blocks usage of WZ_ICEWALL.
-//===== Changelogs: ==========================================
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added WOE:TE maps [Cydh]
-//============================================================
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	noicewall
-te_prtcas02	mapflag	noicewall
-te_prtcas03	mapflag	noicewall
-te_prtcas04	mapflag	noicewall
-te_prtcas05	mapflag	noicewall
-te_aldecas1	mapflag	noicewall
-te_aldecas2	mapflag	noicewall
-te_aldecas3	mapflag	noicewall
-te_aldecas4	mapflag	noicewall
-te_aldecas5	mapflag	noicewall
--- a/npc/re/mapflag/nolockon.txt
+++ b/npc/re/mapflag/nolockon.txt
@@ -1,8 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Nolockon
-//===== Description: ========================================= 
-//= Disables attacks on another player on clientside
-//= without using shift or /ns
-//===== Changelogs: ==========================================
-//= 0.1 Created empty file for further usage [Lemongrass]
-//============================================================
--- a/npc/re/mapflag/nomemo.txt
+++ b/npc/re/mapflag/nomemo.txt
@@ -1,496 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Warp Portal memory.
-//===== Description: ========================================= 
-//= Prevents players from using /memo on a map.
-//= Also disables marriage warp skills.
-//===== Changelogs: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added Nightmare Clock Tower [Secret]
-//= 1.2 Added dali, dali02 [Nova]
-//= 1.3 Added Nightmare Glastheim [Ridley8819]
-//= 1.4 Added GVG TE Maps. [Cydh]
-//= 1.5 Added Para Market maps [mazvi]
-//============================================================
-
-//============================================================
-// Paradise Market
-//============================================================
-paramk	mapflag	nomemo
-
-//============================================================
-// Episode 13.3
-//============================================================
-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
-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
-1@mist	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
-1@cash	mapflag	nomemo
-1@pump	mapflag	nomemo
-2@pump	mapflag	nomemo
-iz_dun05	mapflag	nomemo
-lhz_dun04	mapflag	nomemo
-que_lhz	mapflag	nomemo
-1@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
-job_ko	mapflag	nomemo
-job_gun	mapflag	nomemo
-ma_scene01	mapflag	nomemo
-ma_in01	mapflag	nomemo
-ma_dun01	mapflag	nomemo
-1@ma_h	mapflag	nomemo
-1@ma_c	mapflag	nomemo
-1@ma_b	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
-1@ecl	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
-c_tower2_	mapflag	nomemo
-c_tower3_	mapflag	nomemo
-gl_chyard_	mapflag	nomemo
-gl_cas02_	mapflag	nomemo
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	nomemo
-2@orcs	mapflag	nomemo
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	nomemo
-2@nyd	mapflag	nomemo
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	nomemo
-
-//============================================================
-// Glastheim Memorial Dungeon
-//============================================================
-1@gl_k	mapflag	nomemo
-2@gl_k	mapflag	nomemo
-
-//============================================================
-// Wave Mode Memorial Dungeon
-//============================================================
-1@def01	mapflag	nomemo
-1@def02	mapflag	nomemo
-1@def03	mapflag	nomemo
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	nomemo
-1@sara	mapflag	nomemo
-dali	mapflag	nomemo
-dali02	mapflag	nomemo
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	nomemo
-1@gef	mapflag	nomemo
-1@gef_in	mapflag	nomemo
-1@spa	mapflag	nomemo
-1@tnm1	mapflag	nomemo
-1@tnm2	mapflag	nomemo
-1@tnm3	mapflag	nomemo
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	nomemo
-1@air1	mapflag	nomemo
-1@air2	mapflag	nomemo
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-moro_cav	mapflag	nomemo
-1@dth1	mapflag	nomemo
-1@dth2	mapflag	nomemo
-1@dth3	mapflag	nomemo
-1@rev	mapflag	nomemo
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	nomemo
-1@jtb	mapflag	nomemo
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-1@lab	mapflag	nomemo
-1@uns	mapflag	nomemo
-1@mcd	mapflag	nomemo
-un_myst	mapflag	nomemo
-
-//============================================================
-// Nightmare Biolab
-//============================================================
-lhz_dun_n	mapflag	nomemo
-lhz_d_n2	mapflag	nomemo
-
-//============================================================
-// Infinite Space
-//============================================================
-1@infi	mapflag	nomemo
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	nomemo
-te_prtcas02	mapflag	nomemo
-te_prtcas03	mapflag	nomemo
-te_prtcas04	mapflag	nomemo
-te_prtcas05	mapflag	nomemo
-te_aldecas1	mapflag	nomemo
-te_aldecas2	mapflag	nomemo
-te_aldecas3	mapflag	nomemo
-te_aldecas4	mapflag	nomemo
-te_aldecas5	mapflag	nomemo
-teg_dun01	mapflag	nomemo
-teg_dun02	mapflag	nomemo
-
-//============================================================
-// Novice Training
-//============================================================
-int_land	mapflag	nomemo
-int_land01	mapflag	nomemo
-int_land02	mapflag	nomemo
-int_land03	mapflag	nomemo
-int_land04	mapflag	nomemo
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-prt_cas	mapflag	nomemo
-prt_cas_q	mapflag	nomemo
-prt_pri00	mapflag	nomemo
-prt_lib	mapflag	nomemo
-prt_lib_q	mapflag	nomemo
-prt_q	mapflag	nomemo
-prt_prison	mapflag	nomemo
-rebel_in	mapflag	nomemo
-slabw01	mapflag	nomemo
-que_swat	mapflag	nomemo
-1@mir	mapflag	nomemo
-2@mir	mapflag	nomemo
-1@sthb	mapflag	nomemo
-1@sthc	mapflag	nomemo
-1@sthd	mapflag	nomemo
-1@slw	mapflag	nomemo
-1@swat	mapflag	nomemo
-
-//============================================================
-// Rockridge
-//============================================================
-har_in01	mapflag	nomemo
-rockmi1	mapflag	nomemo
-rockmi2	mapflag	nomemo
-
-//============================================================
-// Memorial day
-//============================================================
-1@md_gef	mapflag	nomemo
-1@md_pay	mapflag	nomemo
-
-//============================================================
-// Lasagna
-//============================================================
-lasa_in01	mapflag	nomemo
-conch_in	mapflag	nomemo
-lasa_dun01	mapflag	nomemo
-lasa_dun02	mapflag	nomemo
-lasa_dun03	mapflag	nomemo
-lasa_dun_q	mapflag	nomemo
-
-//============================================================
-// Chicken Mode - Nightmare Glastheim
-//============================================================
-1@gl_k2	mapflag	nomemo
-2@gl_k2	mapflag	nomemo
-
-//============================================================
-// Chicken Mode - Horror Toy Factory
-//============================================================
-1@xm_d2	mapflag	nomemo
-
-//============================================================
-// Illusion of Moonlight
-//============================================================
-pay_d03_i	mapflag	nomemo
-
-//============================================================
-// Illusion of Vampire
-//============================================================
-gef_d01_i	mapflag	nomemo
-
-//============================================================
-// Illusion of Frozen
-//============================================================
-ice_d03_i	mapflag	nomemo
-
-//============================================================
-// Suspicious Shipwreck
-//============================================================
-1@tre	mapflag	nomemo
-
-//============================================================
-// Poring Village
-//============================================================
-1@begi	mapflag	nomemo
-
-//============================================================
-// Illusion of old Archery
-//============================================================
-tur_d03_i	mapflag	nomemo
-tur_d04_i	mapflag	nomemo
-
-//============================================================
-// Volcanic Island Korodo
-//============================================================
-1@crd	mapflag	nomemo
-
-//============================================================
-// Noodles Festival July
-//============================================================
-1@drdo	mapflag	nomemo
-
-//============================================================
-// Illusion of Teddy Bear
-//============================================================
-ein_d02_i	mapflag	nomemo
-
-//============================================================
-// Illusion of Luanda
-//============================================================
-com_d02_i	mapflag	nomemo
-
-//============================================================
-// Soul Reaper Job Change
-//============================================================
-1@soul	mapflag	nomemo
-
-//============================================================
-// Star Emperor Job Change
-//============================================================
-star_frst	mapflag	nomemo
-star_in	mapflag	nomemo
-
-//============================================================
-// Episode 17.1
-//============================================================
-1@cor	mapflag	nomemo
-1@os_a	mapflag	nomemo
-1@os_b	mapflag	nomemo
-1@rgsr	mapflag	nomemo
-mag_dun03	mapflag	nomemo
-pub_cat	mapflag	nomemo
-rgsr_in	mapflag	nomemo
-
-//============================================================
-// Episode 17.2
-//============================================================
-1@bamn	mapflag	nomemo
-1@bamq	mapflag	nomemo
-1@ghg	mapflag	nomemo
-1@herbs	mapflag	nomemo
-1@lost	mapflag	nomemo
-ba_in01	mapflag	nomemo
-1@odin	mapflag	nomemo
-
-//============================================================
-// Illusion of Labyrinth
-//============================================================
-prt_mz03_i	mapflag	nomemo
-
-//============================================================
-// Illusion of Underwater
-//============================================================
-iz_d04_i	mapflag	nomemo
-iz_d05_i	mapflag	nomemo
-
-//============================================================
-// 4th Jobs Change
-//============================================================
-1@4win	mapflag	nomemo
-1@4mag	mapflag	nomemo
-1@4mst	mapflag	nomemo
-1@4sac	mapflag	nomemo
-1@4tro	mapflag	nomemo
-1@4inq	mapflag	nomemo
-1@4cdn	mapflag	nomemo
-1@4igd	mapflag	nomemo
-1@4drk	mapflag	nomemo
-job4_bio	mapflag	nomemo
-job4_mag	mapflag	nomemo
-job4_tro	mapflag	nomemo
-
-//============================================================
-// Geffen Night Arena
-//============================================================
-1@ge_sn	mapflag	nomemo
-
-//============================================================
-// Traces of Heroes
-//============================================================
-1@mjo1	mapflag	nomemo
-1@mjo2	mapflag	nomemo
-1@spa2	mapflag	nomemo
-
-//============================================================
-// Thanatos Tower Memorial Dungeon
-//============================================================
-1@thts	mapflag	nomemo
-2@thts	mapflag	nomemo
-3@thts	mapflag	nomemo
-4@thts	mapflag	nomemo
-5@thts	mapflag	nomemo
-6@thts	mapflag	nomemo
-7@thts	mapflag	nomemo
-8@thts	mapflag	nomemo
-
-//============================================================
-// Glastheim Challenge Mode
-//============================================================
-1@gl_he	mapflag	nomemo
-1@gl_he2	mapflag	nomemo
-
-//============================================================
-// EDDA
-//============================================================
-1@gl_prq	mapflag	nomemo
-1@gol1	mapflag	nomemo
-1@gol2	mapflag	nomemo
-
-//============================================================
-// 2018 Halloween
-//============================================================
-1@halo	mapflag	nomemo
-
-//============================================================
-// Constellation Tower
-//============================================================
-1@ch_t	mapflag	nomemo
-2@ch_t	mapflag	nomemo
-3@ch_t	mapflag	nomemo
-
-//============================================================
-// Level 200 Expansion
-//============================================================
-ein_dun03	mapflag	nomemo
-
-//============================================================
-// Grade Enhancer
-//============================================================
-grademk	mapflag	nomemo
-
-//============================================================
-// Level 250 Expansion
-//============================================================
-nif_dun01	mapflag	nomemo
-nif_dun02	mapflag	nomemo
-
-//============================================================
-// Monster Invasion event
-//============================================================
-e_hugel	mapflag	nomemo
-
-//============================================================
-// Training Ground outside Prontera
-//============================================================
-tra_fild	mapflag	nomemo
-
-//============================================================
-// Episode 18 - Direction of Prayer
-//============================================================
-1@adv	mapflag	nomemo
-1@advs	mapflag	nomemo
-1@nyr	mapflag	nomemo
-1@oz	mapflag	nomemo
-1@tcamp	mapflag	nomemo
-2@nyr	mapflag	nomemo
-oz_dun01	mapflag	nomemo
-oz_dun02	mapflag	nomemo
-que_thr	mapflag	nomemo
-wolfvill	mapflag	nomemo
-
-//============================================================
-// Sunken Tower
-//============================================================
-1@ch_u	mapflag	nomemo
-
-//============================================================
-// Illusion of Twins
-//============================================================
-ant_d02_i	mapflag	nomemo
-
-//============================================================
-// Cash Mall
-//============================================================
-itemmall	mapflag	nomemo
--- a/npc/re/mapflag/nopenalty.txt
+++ b/npc/re/mapflag/nopenalty.txt
@@ -1,112 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable death penalty.
-//===== Description: ========================================= 
-//= Same as 'noexppenalty' and 'nozenypenalty' combined.
-//===== Additional Comments: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added Izlude duplicates. [Euphy]
-//= 1.2 Added Para Market maps [mazvi]
-//============================================================
-
-//============================================================
-// Paradise Market
-//============================================================
-paramk	mapflag	nopenalty
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-dicastes01	mapflag	nopenalty
-dicastes02	mapflag	nopenalty
-dic_in01	mapflag	nopenalty
-s_atelier	mapflag	nopenalty
-mora	mapflag	nopenalty
-dewata	mapflag	nopenalty
-dew_in01	mapflag	nopenalty
-izlude_a	mapflag	nopenalty
-izlude_b	mapflag	nopenalty
-izlude_c	mapflag	nopenalty
-izlude_d	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
-que_avan01	mapflag	nopenalty
-
-//============================================================
-// Job Quests
-//============================================================
-// 3-1 Classes
-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 Classes
-job3_gen01	mapflag	nopenalty
-// Expanded Classes
-job3_sha01	mapflag	nopenalty
-job_ko	mapflag	nopenalty
-job_gun	mapflag	nopenalty
-
-//============================================================
-// Nightmare Biolab
-//============================================================
-lhz_dun_n	mapflag	nopenalty
-lhz_d_n2	mapflag	nopenalty
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-prt_cas	mapflag	nopenalty
-prt_cas_q	mapflag	nopenalty
-prt_pri00	mapflag	nopenalty
-prt_lib	mapflag	nopenalty
-prt_lib_q	mapflag	nopenalty
-que_swat	mapflag	nopenalty
-
-//============================================================
-// Rockridge
-//============================================================
-har_in01	mapflag	nopenalty
-rebel_in	mapflag	nopenalty
-rockmi2	mapflag	nopenalty
-
-//============================================================
-// Lasagna
-//============================================================
-lasagna	mapflag	nopenalty
-lasa_in01	mapflag	nopenalty
-conch_in	mapflag	nopenalty
-
-wolfvill	mapflag	nopenalty
-
-//============================================================
-// Cash Mall
-//============================================================
-itemmall	mapflag	nopenalty
--- a/npc/re/mapflag/nopvp.txt
+++ b/npc/re/mapflag/nopvp.txt
@@ -1,127 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Player versus Player mode.
-//===== Description: ========================================= 
-//= Prevents PvP mode on a map.
-//===== Additional Comments: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added Izlude duplicates. [Euphy]
-//= 1.2 Added Para Market maps [mazvi]
-//============================================================
-
-//============================================================
-// Paradise Market
-//============================================================
-paramk	mapflag	pvp	off
-
-//============================================================
-// Instances
-//============================================================
-1@mist	mapflag	pvp	off
-1@cash	mapflag	pvp	off
-1@pump	mapflag	pvp	off
-2@pump	mapflag	pvp	off
-1@lhz	mapflag	pvp	off
-1@ma_h	mapflag	pvp	off
-1@ma_c	mapflag	pvp	off
-1@ma_b	mapflag	pvp	off
-1@ecl	mapflag	pvp	off
-1@gl_k	mapflag	pvp	off
-2@gl_k	mapflag	pvp	off
-1@def01	mapflag	pvp	off
-1@def02	mapflag	pvp	off
-1@def03	mapflag	pvp	off
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	pvp	off
-1@sara	mapflag	pvp	off
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	pvp	off
-1@gef	mapflag	pvp	off
-1@gef_in	mapflag	pvp	off
-1@spa	mapflag	pvp	off
-1@tnm1	mapflag	pvp	off
-1@tnm2	mapflag	pvp	off
-1@tnm3	mapflag	pvp	off
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	pvp	off
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	pvp	off
-1@air1	mapflag	pvp	off
-1@air2	mapflag	pvp	off
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-1@dth1	mapflag	pvp	off
-1@dth2	mapflag	pvp	off
-1@dth3	mapflag	pvp	off
-1@rev	mapflag	pvp	off
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	pvp	off
-1@jtb	mapflag	pvp	off
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-1@lab	mapflag	pvp	off
-1@uns	mapflag	pvp	off
-1@mcd	mapflag	pvp	off
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-moc_para01	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
-izlude_a	mapflag	pvp	off
-izlude_b	mapflag	pvp	off
-izlude_c	mapflag	pvp	off
-izlude_d	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
-ma_zif01	mapflag	pvp	off
-ma_zif02	mapflag	pvp	off
-ma_zif03	mapflag	pvp	off
-ma_zif04	mapflag	pvp	off
-ma_zif05	mapflag	pvp	off
-ma_zif06	mapflag	pvp	off
-ma_zif07	mapflag	pvp	off
-ma_zif08	mapflag	pvp	off
-ma_zif09	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
-que_avan01	mapflag	pvp	off
-dali	mapflag	pvp	off
-wolfvill	mapflag	pvp	off
-
-//============================================================
-// Cash Mall
-//============================================================
-itemmall	mapflag	pvp	off
--- a/npc/re/mapflag/nosave.txt
+++ b/npc/re/mapflag/nosave.txt
@@ -1,100 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable auto-save.
-//===== Description: =========================================
-//= Characters logging out on the specified map will be warped
-//= to the map specified in the last field, or "SavePoint".
-//===== Changelogs: ==========================================
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added GVG TE Guild Dungeons. [Capuche]
-//= 1.2 Removed instances. [Lemongrass]
-//============================================================
-
-//============================================================
-// Job Quests
-//============================================================
-// 3-1 Classes
-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 Classes
-job3_gen01	mapflag	nosave	SavePoint
-// Expanded Classes
-job3_sha01	mapflag	nosave	SavePoint
-job_ko	mapflag	nosave	SavePoint
-job_gun	mapflag	nosave	SavePoint
-
-//============================================================
-// Guild Dungeons
-//============================================================
-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
-teg_dun01	mapflag	nosave	SavePoint
-teg_dun02	mapflag	nosave	SavePoint
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	nosave	SavePoint
-te_prtcas02	mapflag	nosave	SavePoint
-te_prtcas03	mapflag	nosave	SavePoint
-te_prtcas04	mapflag	nosave	SavePoint
-te_prtcas05	mapflag	nosave	SavePoint
-te_aldecas1	mapflag	nosave	SavePoint
-te_aldecas2	mapflag	nosave	SavePoint
-te_aldecas3	mapflag	nosave	SavePoint
-te_aldecas4	mapflag	nosave	SavePoint
-te_aldecas5	mapflag	nosave	SavePoint
-
-//============================================================
-// Somatology Laboratory
-//============================================================
-que_lhz	mapflag	nosave	SavePoint
-
-//============================================================
-// Port Malaya
-//============================================================
-ma_zif01	mapflag	nosave	SavePoint
-ma_zif02	mapflag	nosave	SavePoint
-ma_zif03	mapflag	nosave	SavePoint
-ma_zif04	mapflag	nosave	SavePoint
-ma_zif05	mapflag	nosave	SavePoint
-ma_zif06	mapflag	nosave	SavePoint
-ma_zif07	mapflag	nosave	SavePoint
-ma_zif08	mapflag	nosave	SavePoint
-ma_zif09	mapflag	nosave	SavePoint
-
-//============================================================
-// Inside Eclage
-//============================================================
-que_avan01	mapflag	nosave	SavePoint
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-un_myst	mapflag	nosave	SavePoint
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-que_swat	mapflag	nosave	SavePoint
-
-//============================================================
-// Rockridge
-//============================================================
-rockmi2	mapflag	nosave	SavePoint
--- a/npc/re/mapflag/noteleport.txt
+++ b/npc/re/mapflag/noteleport.txt
@@ -1,459 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable teleportation.
-//===== 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)
-//===== Changelogs: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added dali, dali02 [Nova]
-//= 1.2 Added WOE:TE maps [Cydh,Capuche]
-//= 1.3 Added Para Market maps [mazvi]
-//============================================================
-
-//============================================================
-// Paradise Market
-//============================================================
-paramk	mapflag	noteleport
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-moc_para01	mapflag	noteleport
-
-//============================================================
-// Episode 13.3
-//============================================================
-s_atelier	mapflag	noteleport
-dic_in01	mapflag	noteleport
-job3_gen01	mapflag	noteleport
-job3_sha01	mapflag	noteleport
-
-//============================================================
-// Episode 14
-//============================================================
-1@mist	mapflag	noteleport
-1@mist	mapflag	monster_noteleport
-dew_in01	mapflag	noteleport
-mal_in01	mapflag	noteleport
-mal_in02	mapflag	noteleport
-1@cash	mapflag	noteleport
-1@cash	mapflag	monster_noteleport
-1@pump	mapflag	noteleport
-1@pump	mapflag	monster_noteleport
-2@pump	mapflag	noteleport
-2@pump	mapflag	monster_noteleport
-que_lhz	mapflag	noteleport
-que_lhz	mapflag	monster_noteleport
-1@lhz	mapflag	noteleport
-1@lhz	mapflag	monster_noteleport
-ma_scene01	mapflag	noteleport
-ma_in01	mapflag	noteleport
-1@ma_h	mapflag	noteleport
-1@ma_h	mapflag	monster_noteleport
-1@ma_c	mapflag	noteleport
-1@ma_c	mapflag	monster_noteleport
-1@ma_b	mapflag	noteleport
-1@ma_b	mapflag	monster_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
-job_ko	mapflag	noteleport
-job_gun	mapflag	noteleport
-ecl_in01	mapflag	noteleport
-ecl_in02	mapflag	noteleport
-ecl_in03	mapflag	noteleport
-ecl_in04	mapflag	noteleport
-1@ecl	mapflag	noteleport
-1@ecl	mapflag	monster_noteleport
-ecl_hub01	mapflag	noteleport
-
-//============================================================
-// Glastheim Memorial Dungeon
-//============================================================
-1@gl_k	mapflag	noteleport
-1@gl_k	mapflag	monster_noteleport
-2@gl_k	mapflag	noteleport
-2@gl_k	mapflag	monster_noteleport
-gl_chyard_	mapflag	noteleport
-gl_cas02_	mapflag	noteleport
-
-//============================================================
-// Wave Mode Memorial Dungeon
-//============================================================
-1@def01	mapflag	noteleport
-1@def01	mapflag	monster_noteleport
-1@def02	mapflag	noteleport
-1@def02	mapflag	monster_noteleport
-1@def03	mapflag	noteleport
-1@def03	mapflag	monster_noteleport
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	noteleport
-1@face	mapflag	monster_noteleport
-1@sara	mapflag	noteleport
-1@sara	mapflag	monster_noteleport
-dali	mapflag	noteleport
-dali02	mapflag	noteleport
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	noteleport
-1@ge_st	mapflag	monster_noteleport
-1@gef	mapflag	noteleport
-1@gef	mapflag	monster_noteleport
-1@gef_in	mapflag	noteleport
-1@gef_in	mapflag	monster_noteleport
-1@spa	mapflag	noteleport
-1@spa	mapflag	monster_noteleport
-1@tnm1	mapflag	noteleport
-1@tnm1	mapflag	monster_noteleport
-1@tnm2	mapflag	noteleport
-1@tnm2	mapflag	monster_noteleport
-1@tnm3	mapflag	noteleport
-1@tnm3	mapflag	monster_noteleport
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	monster_noteleport
-1@xm_d	mapflag	noteleport
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	noteleport
-1@air1	mapflag	noteleport
-1@air2	mapflag	noteleport
-1@glast	mapflag	monster_noteleport
-1@air1	mapflag	monster_noteleport
-1@air2	mapflag	monster_noteleport
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-1@dth1	mapflag	noteleport
-1@dth2	mapflag	noteleport
-1@dth3	mapflag	noteleport
-1@rev	mapflag	noteleport
-1@dth1	mapflag	monster_noteleport
-1@dth2	mapflag	monster_noteleport
-1@dth3	mapflag	monster_noteleport
-1@rev	mapflag	monster_noteleport
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	noteleport
-1@jtb	mapflag	noteleport
-1@eom	mapflag	monster_noteleport
-1@jtb	mapflag	monster_noteleport
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-1@lab	mapflag	noteleport
-1@uns	mapflag	noteleport
-un_bk_q	mapflag	noteleport
-un_myst	mapflag	noteleport
-verus04	mapflag	noteleport
-1@mcd	mapflag	noteleport
-1@lab	mapflag	monster_noteleport
-1@uns	mapflag	monster_noteleport
-un_bk_q	mapflag	monster_noteleport
-verus04	mapflag	monster_noteleport
-1@mcd	mapflag	monster_noteleport
-
-//============================================================
-// Nightmare Biolab
-//============================================================
-lhz_dun_n	mapflag	noteleport
-lhz_d_n2	mapflag	noteleport
-
-//============================================================
-// Infinite Space
-//============================================================
-1@infi	mapflag	noteleport
-1@infi	mapflag	monster_noteleport
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	noteleport
-te_prtcas02	mapflag	noteleport
-te_prtcas03	mapflag	noteleport
-te_prtcas04	mapflag	noteleport
-te_prtcas05	mapflag	noteleport
-te_aldecas1	mapflag	noteleport
-te_aldecas2	mapflag	noteleport
-te_aldecas3	mapflag	noteleport
-te_aldecas4	mapflag	noteleport
-te_aldecas5	mapflag	noteleport
-te_prtcas01	mapflag	monster_noteleport
-te_prtcas02	mapflag	monster_noteleport
-te_prtcas03	mapflag	monster_noteleport
-te_prtcas04	mapflag	monster_noteleport
-te_prtcas05	mapflag	monster_noteleport
-te_aldecas1	mapflag	monster_noteleport
-te_aldecas2	mapflag	monster_noteleport
-te_aldecas3	mapflag	monster_noteleport
-te_aldecas4	mapflag	monster_noteleport
-te_aldecas5	mapflag	monster_noteleport
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-prt_cas	mapflag	noteleport
-prt_cas_q	mapflag	noteleport
-prt_pri00	mapflag	noteleport
-prt_lib	mapflag	noteleport
-prt_lib_q	mapflag	noteleport
-que_swat	mapflag	noteleport
-rebel_in	mapflag	noteleport
-rebel_in	mapflag	monster_noteleport
-1@mir	mapflag	noteleport
-2@mir	mapflag	noteleport
-1@sthb	mapflag	noteleport
-1@sthc	mapflag	noteleport
-1@sthd	mapflag	noteleport
-1@slw	mapflag	noteleport
-1@swat	mapflag	noteleport
-1@mir	mapflag	monster_noteleport
-2@mir	mapflag	monster_noteleport
-1@sthb	mapflag	monster_noteleport
-1@sthc	mapflag	monster_noteleport
-1@sthd	mapflag	monster_noteleport
-1@slw	mapflag	monster_noteleport
-1@swat	mapflag	monster_noteleport
-
-//============================================================
-// Rockridge
-//============================================================
-har_in01	mapflag	noteleport
-rockmi2	mapflag	noteleport
-
-//============================================================
-// Memorial day
-//============================================================
-1@md_gef	mapflag	noteleport
-1@md_pay	mapflag	noteleport
-
-//============================================================
-// Lasagna
-//============================================================
-lasa_in01	mapflag	noteleport
-conch_in	mapflag	noteleport
-
-//============================================================
-// Chicken Mode - Nightmare Glastheim
-//============================================================
-1@gl_k2	mapflag	noteleport
-2@gl_k2	mapflag	noteleport
-1@gl_k2	mapflag	monster_noteleport
-2@gl_k2	mapflag	monster_noteleport
-
-//============================================================
-// Chicken Mode - Horror Toy Factory
-//============================================================
-1@xm_d2	mapflag	noteleport
-1@xm_d2	mapflag	monster_noteleport
-
-//============================================================
-// Suspicious Shipwreck
-//============================================================
-1@tre	mapflag	noteleport
-1@tre	mapflag	monster_noteleport
-
-//============================================================
-// Poring Village
-//============================================================
-1@begi	mapflag	noteleport
-1@begi	mapflag	monster_noteleport
-
-//============================================================
-// Volcanic Island Korodo
-//============================================================
-1@crd	mapflag	noteleport
-1@crd	mapflag	monster_noteleport
-
-//============================================================
-// Noodles Festival July
-//============================================================
-1@drdo	mapflag	noteleport
-1@drdo	mapflag	monster_noteleport
-
-//============================================================
-// Soul Reaper Job Change
-//============================================================
-1@soul	mapflag	noteleport
-1@soul	mapflag	monster_noteleport
-
-//============================================================
-// Episode 17.1
-//============================================================
-1@cor	mapflag	noteleport
-1@os_a	mapflag	noteleport
-1@os_b	mapflag	noteleport
-1@rgsr	mapflag	noteleport
-pub_cat	mapflag	noteleport
-rgsr_in	mapflag	noteleport
-1@cor	mapflag	monster_noteleport
-1@os_a	mapflag	monster_noteleport
-1@os_b	mapflag	monster_noteleport
-1@rgsr	mapflag	monster_noteleport
-
-//============================================================
-// Episode 17.2
-//============================================================
-1@bamn	mapflag	noteleport
-1@bamq	mapflag	noteleport
-1@ghg	mapflag	noteleport
-1@herbs	mapflag	noteleport
-1@lost	mapflag	noteleport
-ba_in01	mapflag	noteleport
-1@odin	mapflag	noteleport
-1@bamn	mapflag	monster_noteleport
-1@bamq	mapflag	monster_noteleport
-1@ghg	mapflag	monster_noteleport
-1@herbs	mapflag	monster_noteleport
-1@lost	mapflag	monster_noteleport
-1@odin	mapflag	monster_noteleport
-
-//============================================================
-// 4th Jobs Change
-//============================================================
-1@4win	mapflag	noteleport
-1@4mag	mapflag	noteleport
-1@4mst	mapflag	noteleport
-1@4sac	mapflag	noteleport
-1@4tro	mapflag	noteleport
-1@4inq	mapflag	noteleport
-1@4cdn	mapflag	noteleport
-1@4igd	mapflag	noteleport
-1@4drk	mapflag	noteleport
-job4_bio	mapflag	noteleport
-job4_mag	mapflag	noteleport
-job4_tro	mapflag	noteleport
-1@4win	mapflag	monster_noteleport
-1@4mag	mapflag	monster_noteleport
-1@4mst	mapflag	monster_noteleport
-1@4sac	mapflag	monster_noteleport
-1@4tro	mapflag	monster_noteleport
-1@4inq	mapflag	monster_noteleport
-1@4cdn	mapflag	monster_noteleport
-1@4igd	mapflag	monster_noteleport
-1@4drk	mapflag	monster_noteleport
-
-//============================================================
-// Geffen Night Arena
-//============================================================
-1@ge_sn	mapflag	noteleport
-1@ge_sn	mapflag	monster_noteleport
-
-//============================================================
-// Traces of Heroes
-//============================================================
-1@mjo1	mapflag	noteleport
-1@mjo2	mapflag	noteleport
-1@spa2	mapflag	noteleport
-1@mjo1	mapflag	monster_noteleport
-1@mjo2	mapflag	monster_noteleport
-1@spa2	mapflag	monster_noteleport
-
-//============================================================
-// Thanatos Tower Memorial Dungeon
-//============================================================
-1@thts	mapflag	noteleport
-2@thts	mapflag	noteleport
-3@thts	mapflag	noteleport
-4@thts	mapflag	noteleport
-5@thts	mapflag	noteleport
-6@thts	mapflag	noteleport
-7@thts	mapflag	noteleport
-8@thts	mapflag	noteleport
-1@thts	mapflag	monster_noteleport
-2@thts	mapflag	monster_noteleport
-3@thts	mapflag	monster_noteleport
-4@thts	mapflag	monster_noteleport
-5@thts	mapflag	monster_noteleport
-6@thts	mapflag	monster_noteleport
-7@thts	mapflag	monster_noteleport
-8@thts	mapflag	monster_noteleport
-
-//============================================================
-// Glastheim Challenge Mode
-//============================================================
-1@gl_he	mapflag	noteleport
-1@gl_he2	mapflag	noteleport
-1@gl_he	mapflag	monster_noteleport
-1@gl_he2	mapflag	monster_noteleport
-
-//============================================================
-// EDDA
-//============================================================
-1@gl_prq	mapflag	noteleport
-1@gol1	mapflag	noteleport
-1@gol2	mapflag	noteleport
-1@gl_prq	mapflag	monster_noteleport
-1@gol1	mapflag	monster_noteleport
-1@gol2	mapflag	monster_noteleport
-
-//============================================================
-// 2018 Halloween
-//============================================================
-1@halo	mapflag	noteleport
-1@halo	mapflag	monster_noteleport
-
-//============================================================
-// Constellation Tower
-//============================================================
-1@ch_t	mapflag	noteleport
-2@ch_t	mapflag	noteleport
-3@ch_t	mapflag	noteleport
-1@ch_t	mapflag	monster_noteleport
-2@ch_t	mapflag	monster_noteleport
-3@ch_t	mapflag	monster_noteleport
-
-//============================================================
-// Episode 18 - Direction of Prayer
-//============================================================
-1@adv	mapflag	noteleport
-1@advs	mapflag	noteleport
-1@nyr	mapflag	noteleport
-1@oz	mapflag	noteleport
-1@tcamp	mapflag	noteleport
-2@nyr	mapflag	noteleport
-que_thr	mapflag	noteleport
-1@adv	mapflag	monster_noteleport
-1@advs	mapflag	monster_noteleport
-1@nyr	mapflag	monster_noteleport
-1@oz	mapflag	monster_noteleport
-1@tcamp	mapflag	monster_noteleport
-2@nyr	mapflag	monster_noteleport
-
-//============================================================
-// Sunken Tower
-//============================================================
-1@ch_u	mapflag	noteleport
-1@ch_u	mapflag	noteleport
-1@ch_u	mapflag	monster_noteleport
-1@ch_u	mapflag	monster_noteleport
-
-//============================================================
-// Cash Mall
-//============================================================
-itemmall	mapflag	noteleport
-itemmall	mapflag	monster_noteleport
--- a/npc/re/mapflag/nowarp.txt
+++ b/npc/re/mapflag/nowarp.txt
@@ -1,58 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable warping.
-//===== Description: ========================================= 
-//= Disables warping from a map.
-//= Script commands 'warpparty' and 'warpguild' will not warp
-//=   players.
-//= Atcommands @warp, @go, @load, @jump, @partyrecall,
-//=   @guildrecall, and @recallall will not warp players.
-//= GD_EMERGENCYCALL and UNT_CALLFAMILY will not warp players.
-//===== Changelogs: ==========================================
-//= 1.0 Added WoE TE maps. [Capuche]
-//============================================================
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	nowarp
-te_prtcas02	mapflag	nowarp
-te_prtcas03	mapflag	nowarp
-te_prtcas04	mapflag	nowarp
-te_prtcas05	mapflag	nowarp
-te_aldecas1	mapflag	nowarp
-te_aldecas2	mapflag	nowarp
-te_aldecas3	mapflag	nowarp
-te_aldecas4	mapflag	nowarp
-te_aldecas5	mapflag	nowarp
-
-//============================================================
-// Episode 15
-//============================================================
-1@lab	mapflag	nowarp
-1@uns	mapflag	nowarp
-un_bk_q	mapflag	nowarp
-un_myst	mapflag	nowarp
-
-job_gun	mapflag	nowarp
-
-//============================================================
-// Nightmare Biolab
-//============================================================
-lhz_dun_n	mapflag	nowarp
-lhz_d_n2	mapflag	nowarp
-
-//============================================================
-// Infinite Space
-//============================================================
-1@infi	mapflag	nowarp
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-que_swat	mapflag	nowarp
-
-//============================================================
-// Rockridge
-//============================================================
-un_myst	mapflag	nowarp
-rockmi2	mapflag	nowarp
--- a/npc/re/mapflag/nowarpto.txt
+++ b/npc/re/mapflag/nowarpto.txt
@@ -1,427 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable warpto.
-//===== Description: =========================================
-//= Disables warping to a map.
-//= Atcommands @warp, @go, @load, @jump, @partyrecall,
-//=   @guildrecall, and @recallall are disabled.
-//= Command /memo is disabled.
-//===== Changelogs: ==========================================
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added WOE:TE maps [Cydh]
-//= 1.2 Added Novice Island RE Maps. [mazvi]
-//============================================================
-
-//============================================================
-// Novice Island
-//============================================================
-int_land	mapflag	nowarpto
-int_land01	mapflag	nowarpto
-int_land02	mapflag	nowarpto
-int_land03	mapflag	nowarpto
-int_land04	mapflag	nowarpto
-iz_int	mapflag	nowarpto
-iz_int01	mapflag	nowarpto
-iz_int02	mapflag	nowarpto
-iz_int03	mapflag	nowarpto
-iz_int04	mapflag	nowarpto
-
-//============================================================
-// Episode 14.1 - Bifrost
-//============================================================
-1@mist	mapflag	nowarpto
-que_house_s	mapflag	nowarpto
-
-//============================================================
-// Malangdo
-//============================================================
-1@pump	mapflag	nowarpto
-2@pump	mapflag	nowarpto
-1@cash	mapflag	nowarpto
-
-//============================================================
-// Lighthalzen Dungeon F4
-//============================================================
-1@lhz	mapflag	nowarpto
-lhz_dun04	mapflag	nowarpto
-que_lhz	mapflag	nowarpto
-
-//============================================================
-// Port Malaya
-//============================================================
-1@ma_b	mapflag	nowarpto
-1@ma_c	mapflag	nowarpto
-1@ma_h	mapflag	nowarpto
-
-//============================================================
-// Episode 14.2 - Eclage
-//============================================================
-1@ecl	mapflag	nowarpto
-
-//============================================================
-// Pyramids Basement - Nightmare Mode
-//============================================================
-moc_prydn1	mapflag	nowarpto
-moc_prydn2	mapflag	nowarpto
-
-//============================================================
-// Glastheim Memorial Dungeon
-//============================================================
-1@gl_k	mapflag	nowarpto
-2@gl_k	mapflag	nowarpto
-gl_chyard_	mapflag	nowarpto
-gl_cas02_	mapflag	nowarpto
-
-//============================================================
-// Wave Mode Memorial Dungeon
-//============================================================
-1@def01	mapflag	nowarpto
-1@def02	mapflag	nowarpto
-1@def03	mapflag	nowarpto
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	nowarpto
-1@sara	mapflag	nowarpto
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	nowarpto
-1@gef	mapflag	nowarpto
-1@gef_in	mapflag	nowarpto
-1@spa	mapflag	nowarpto
-1@tnm1	mapflag	nowarpto
-1@tnm2	mapflag	nowarpto
-1@tnm3	mapflag	nowarpto
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	nowarpto
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	nowarpto
-1@air1	mapflag	nowarpto
-1@air2	mapflag	nowarpto
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-1@dth1	mapflag	nowarpto
-1@dth2	mapflag	nowarpto
-1@dth3	mapflag	nowarpto
-1@rev	mapflag	nowarpto
-moro_cav	mapflag	nowarpto
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	nowarpto
-1@jtb	mapflag	nowarpto
-
-//============================================================
-// Nightmare Biolab
-//============================================================
-lhz_dun_n	mapflag	nowarpto
-lhz_d_n2	mapflag	nowarpto
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-1@lab	mapflag	nowarpto
-1@uns	mapflag	nowarpto
-un_bk_q	mapflag	nowarpto
-un_myst	mapflag	nowarpto
-1@mcd	mapflag	nowarpto
-
-//============================================================
-// Infinite Space
-//============================================================
-1@infi	mapflag	nowarpto
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	nowarpto
-te_prtcas02	mapflag	nowarpto
-te_prtcas03	mapflag	nowarpto
-te_prtcas04	mapflag	nowarpto
-te_prtcas05	mapflag	nowarpto
-te_aldecas1	mapflag	nowarpto
-te_aldecas2	mapflag	nowarpto
-te_aldecas3	mapflag	nowarpto
-te_aldecas4	mapflag	nowarpto
-te_aldecas5	mapflag	nowarpto
-
-//============================================================
-// Rebellion Job Change
-//============================================================
-job_gun	mapflag	nowarpto
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-prt_cas	mapflag	nowarpto
-prt_cas_q	mapflag	nowarpto
-prt_pri00	mapflag	nowarpto
-prt_lib	mapflag	nowarpto
-prt_lib_q	mapflag	nowarpto
-prt_q	mapflag	nowarpto
-prt_prison	mapflag	nowarpto
-rebel_in	mapflag	nowarpto
-slabw01	mapflag	nowarpto
-que_swat	mapflag	nowarpto
-1@mir	mapflag	nowarpto
-2@mir	mapflag	nowarpto
-1@sthb	mapflag	nowarpto
-1@sthc	mapflag	nowarpto
-1@sthd	mapflag	nowarpto
-1@slw	mapflag	nowarpto
-1@swat	mapflag	nowarpto
-
-//============================================================
-// Rockridge
-//============================================================
-har_in01	mapflag	nowarpto
-rockmi1	mapflag	nowarpto
-rockmi2	mapflag	nowarpto
-
-//============================================================
-// Memorial day
-//============================================================
-1@md_gef	mapflag	nowarpto
-1@md_pay	mapflag	nowarpto
-
-//============================================================
-// Lasagna
-//============================================================
-lasa_in01	mapflag	nowarpto
-conch_in	mapflag	nowarpto
-lasa_dun01	mapflag	nowarpto
-lasa_dun02	mapflag	nowarpto
-lasa_dun03	mapflag	nowarpto
-lasa_dun_q	mapflag	nowarpto
-
-//============================================================
-// Chicken Mode - Nightmare Glastheim
-//============================================================
-1@gl_k2	mapflag	nowarpto
-2@gl_k2	mapflag	nowarpto
-
-//============================================================
-// Chicken Mode - Horror Toy Factory
-//============================================================
-1@xm_d2	mapflag	nowarpto
-
-//============================================================
-// Illusion of Moonlight
-//============================================================
-pay_d03_i	mapflag	nowarpto
-
-//============================================================
-// Illusion of Vampire
-//============================================================
-gef_d01_i	mapflag	nowarpto
-
-//============================================================
-// Illusion of Frozen
-//============================================================
-ice_d03_i	mapflag	nowarpto
-
-//============================================================
-// Suspicious Shipwreck
-//============================================================
-1@tre	mapflag	nowarpto
-
-//============================================================
-// Poring Village
-//============================================================
-1@begi	mapflag	nowarpto
-
-//============================================================
-// Illusion of old Archery
-//============================================================
-tur_d03_i	mapflag	nowarpto
-tur_d04_i	mapflag	nowarpto
-
-//============================================================
-// Volcanic Island Korodo
-//============================================================
-1@crd	mapflag	nowarpto
-
-//============================================================
-// Noodles Festival July
-//============================================================
-1@drdo	mapflag	nowarpto
-
-//============================================================
-// Illusion of Teddy Bear
-//============================================================
-ein_d02_i	mapflag	nowarpto
-
-//============================================================
-// Illusion of Luanda
-//============================================================
-com_d02_i	mapflag	nowarpto
-
-//============================================================
-// Soul Reaper Job Change
-//============================================================
-1@soul	mapflag	nowarpto
-
-//============================================================
-// Star Emperor Job Change
-//============================================================
-star_frst	mapflag	nowarpto
-star_in	mapflag	nowarpto
-
-//============================================================
-// Episode 17.1
-//============================================================
-1@cor	mapflag	nowarpto
-1@os_a	mapflag	nowarpto
-1@os_b	mapflag	nowarpto
-1@rgsr	mapflag	nowarpto
-mag_dun03	mapflag	nowarpto
-pub_cat	mapflag	nowarpto
-rgsr_in	mapflag	nowarpto
-
-//============================================================
-// Episode 17.2
-//============================================================
-1@bamn	mapflag	nowarpto
-1@bamq	mapflag	nowarpto
-1@ghg	mapflag	nowarpto
-1@herbs	mapflag	nowarpto
-1@lost	mapflag	nowarpto
-ba_in01	mapflag	nowarpto
-1@odin	mapflag	nowarpto
-
-//============================================================
-// Illusion of Labyrinth
-//============================================================
-prt_mz03_i	mapflag	nowarpto
-
-//============================================================
-// Illusion of Underwater
-//============================================================
-iz_d04_i	mapflag	nowarpto
-iz_d05_i	mapflag	nowarpto
-
-//============================================================
-// 4th Jobs Change
-//============================================================
-1@4win	mapflag	nowarpto
-1@4mag	mapflag	nowarpto
-1@4mst	mapflag	nowarpto
-1@4sac	mapflag	nowarpto
-1@4tro	mapflag	nowarpto
-1@4inq	mapflag	nowarpto
-1@4cdn	mapflag	nowarpto
-1@4igd	mapflag	nowarpto
-1@4drk	mapflag	nowarpto
-job4_bio	mapflag	nowarpto
-job4_mag	mapflag	nowarpto
-job4_tro	mapflag	nowarpto
-
-//============================================================
-// Geffen Night Arena
-//============================================================
-1@ge_sn	mapflag	nowarpto
-
-//============================================================
-// Traces of Heroes
-//============================================================
-1@mjo1	mapflag	nowarpto
-1@mjo2	mapflag	nowarpto
-1@spa2	mapflag	nowarpto
-
-//============================================================
-// Thanatos Tower Memorial Dungeon
-//============================================================
-1@thts	mapflag	nowarpto
-2@thts	mapflag	nowarpto
-3@thts	mapflag	nowarpto
-4@thts	mapflag	nowarpto
-5@thts	mapflag	nowarpto
-6@thts	mapflag	nowarpto
-7@thts	mapflag	nowarpto
-8@thts	mapflag	nowarpto
-
-//============================================================
-// Glastheim Challenge Mode
-//============================================================
-1@gl_he	mapflag	nowarpto
-1@gl_he2	mapflag	nowarpto
-
-//============================================================
-// EDDA
-//============================================================
-1@gl_prq	mapflag	nowarpto
-1@gol1	mapflag	nowarpto
-1@gol2	mapflag	nowarpto
-
-//============================================================
-// 2018 Halloween
-//============================================================
-1@halo	mapflag	nowarpto
-
-//============================================================
-// Constellation Tower
-//============================================================
-1@ch_t	mapflag	nowarpto
-2@ch_t	mapflag	nowarpto
-3@ch_t	mapflag	nowarpto
-
-//============================================================
-// Level 200 Expansion
-//============================================================
-ein_dun03	mapflag	nowarpto
-
-//============================================================
-// Grade Enhancer
-//============================================================
-grademk	mapflag	nowarpto
-
-//============================================================
-// Level 250 Expansion
-//============================================================
-nif_dun01	mapflag	nowarpto
-nif_dun02	mapflag	nowarpto
-
-//============================================================
-// Monster Invasion Event
-//============================================================
-e_hugel	mapflag	nowarpto
-
-//============================================================
-// Training Ground outside Prontera
-//============================================================
-tra_fild	mapflag	nowarpto
-
-//============================================================
-// Episode 18 - Direction of Prayer
-//============================================================
-1@adv	mapflag	nowarpto
-1@advs	mapflag	nowarpto
-1@nyr	mapflag	nowarpto
-1@oz	mapflag	nowarpto
-1@tcamp	mapflag	nowarpto
-2@nyr	mapflag	nowarpto
-oz_dun01	mapflag	nowarpto
-oz_dun02	mapflag	nowarpto
-que_thr	mapflag	nowarpto
-wolfvill	mapflag	nowarpto
-
-//============================================================
-// Sunken Tower
-//============================================================
-1@ch_u	mapflag	nowarpto
-
-//============================================================
-// Illusion of Twins
-//============================================================
-ant_d02_i	mapflag	nowarpto
--- a/npc/re/mapflag/partylock.txt
+++ b/npc/re/mapflag/partylock.txt
@@ -1,258 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Party lock.
-//===== Description: ========================================= 
-//= Blocks all party modifications on a map:
-//=   /organize, /leave, /invite, @changeleader
-//===== Additional Comments: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Misty Forest Labyrinth
-//============================================================
-1@mist	mapflag	partylock
-
-//============================================================
-// Octopus Cave
-//============================================================
-1@cash	mapflag	partylock
-
-//============================================================
-// Drain
-//============================================================
-1@pump	mapflag	partylock
-2@pump	mapflag	partylock
-
-//============================================================
-// Somatology Laboratory
-//============================================================
-1@lhz	mapflag	partylock
-
-//============================================================
-// Bangungot Hospital F2
-//============================================================
-1@ma_h	mapflag	partylock
-
-//============================================================
-// Buwaya Cave
-//============================================================
-1@ma_c	mapflag	partylock
-
-//============================================================
-// Bakonawa Hideout
-//============================================================
-1@ma_b	mapflag	partylock
-
-//============================================================
-// Inside Eclage
-//============================================================
-1@ecl	mapflag	partylock
-
-//============================================================
-// Glastheim Memorial Dungeon
-//============================================================
-1@gl_k	mapflag	partylock
-2@gl_k	mapflag	partylock
-
-//============================================================
-// Wave Mode Memorial Dungeon
-//============================================================
-1@def01	mapflag	partylock
-1@def02	mapflag	partylock
-1@def03	mapflag	partylock
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	partylock
-1@sara	mapflag	partylock
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	partylock
-1@gef	mapflag	partylock
-1@gef_in	mapflag	partylock
-1@spa	mapflag	partylock
-1@tnm1	mapflag	partylock
-1@tnm2	mapflag	partylock
-1@tnm3	mapflag	partylock
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	partylock
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	partylock
-1@air1	mapflag	partylock
-1@air2	mapflag	partylock
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-1@dth1	mapflag	partylock
-1@dth2	mapflag	partylock
-1@dth3	mapflag	partylock
-1@rev	mapflag	partylock
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	partylock
-1@jtb	mapflag	partylock
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-1@lab	mapflag	partylock
-1@uns	mapflag	partylock
-1@mcd	mapflag	partylock
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-1@mir	mapflag	partylock
-2@mir	mapflag	partylock
-1@sthb	mapflag	partylock
-1@sthc	mapflag	partylock
-1@sthd	mapflag	partylock
-1@slw	mapflag	partylock
-1@swat	mapflag	partylock
-
-//============================================================
-// Memorial day
-//============================================================
-1@md_gef	mapflag	partylock
-1@md_pay	mapflag	partylock
-
-//============================================================
-// Chicken Mode Nightmare Glastheim
-//============================================================
-1@gl_k2	mapflag	partylock
-2@gl_k2	mapflag	partylock
-
-//============================================================
-// Chicken Mode Horror Toy Factory
-//============================================================
-1@xm_d2	mapflag	partylock
-
-//============================================================
-// Suspicious Shipwreck
-//============================================================
-1@tre	mapflag	partylock
-
-//============================================================
-// Poring Village
-//============================================================
-1@begi	mapflag	partylock
-
-//============================================================
-// Volcanic Island Korodo
-//============================================================
-1@crd	mapflag	partylock
-
-//============================================================
-// Noodles Festival July
-//============================================================
-1@drdo	mapflag	partylock
-
-//============================================================
-// Soul Reaper Job Change
-//============================================================
-1@soul	mapflag	partylock
-
-//============================================================
-// Episode 17.1
-//============================================================
-1@cor	mapflag	partylock
-1@os_a	mapflag	partylock
-1@os_b	mapflag	partylock
-1@rgsr	mapflag	partylock
-
-//============================================================
-// Episode 17.2
-//============================================================
-1@bamn	mapflag	partylock
-1@bamq	mapflag	partylock
-1@ghg	mapflag	partylock
-1@herbs	mapflag	partylock
-1@lost	mapflag	partylock
-1@odin	mapflag	partylock
-
-//============================================================
-// 4th Jobs Change
-//============================================================
-1@4win	mapflag	partylock
-1@4mag	mapflag	partylock
-1@4mst	mapflag	partylock
-1@4sac	mapflag	partylock
-1@4tro	mapflag	partylock
-1@4inq	mapflag	partylock
-1@4cdn	mapflag	partylock
-1@4igd	mapflag	partylock
-1@4drk	mapflag	partylock
-
-//============================================================
-// Geffen Night Arena
-//============================================================
-1@ge_sn	mapflag	partylock
-
-// Traces of Heroes
-1@mjo1	mapflag	partylock
-1@mjo2	mapflag	partylock
-1@spa2	mapflag	partylock
-
-//============================================================
-// Thanatos Tower Memorial Dungeon
-//============================================================
-1@thts	mapflag	partylock
-2@thts	mapflag	partylock
-3@thts	mapflag	partylock
-4@thts	mapflag	partylock
-5@thts	mapflag	partylock
-6@thts	mapflag	partylock
-7@thts	mapflag	partylock
-8@thts	mapflag	partylock
-
-//============================================================
-// Glastheim Challenge Mode
-//============================================================
-1@gl_he	mapflag	partylock
-1@gl_he2	mapflag	partylock
-
-//============================================================
-// EDDA
-//============================================================
-1@gl_prq	mapflag	partylock
-1@gol1	mapflag	partylock
-1@gol2	mapflag	partylock
-
-//============================================================
-// 2018 Halloween
-//============================================================
-1@halo	mapflag	partylock
-
-//============================================================
-// Constellation Tower
-//============================================================
-1@ch_t	mapflag	partylock
-2@ch_t	mapflag	partylock
-3@ch_t	mapflag	partylock
-
-//============================================================
-// Episode 18 - Direction of Prayer
-//============================================================
-1@adv	mapflag	partylock
-1@advs	mapflag	partylock
-1@nyr	mapflag	partylock
-1@oz	mapflag	partylock
-1@tcamp	mapflag	partylock
-2@nyr	mapflag	partylock
-
-//============================================================
-// Sunken Tower
-//============================================================
-1@ch_u	mapflag	partylock
--- a/npc/re/mapflag/privateairship.txt
+++ b/npc/re/mapflag/privateairship.txt
@@ -1,710 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflags:
-//= privateairship_source, privateairship_destination
-//===== Description: =========================================
-//= Private Airship available sources and destinations
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Lemongrass]
-//============================================================
-
-//============================================================
-// Available Sources
-//============================================================
-abbey01	mapflag	privateairship_source
-abbey02	mapflag	privateairship_source
-abbey03	mapflag	privateairship_source
-abyss_01	mapflag	privateairship_source
-abyss_02	mapflag	privateairship_source
-abyss_03	mapflag	privateairship_source
-alb2trea	mapflag	privateairship_source
-alberta	mapflag	privateairship_source
-alde_dun01	mapflag	privateairship_source
-alde_dun02	mapflag	privateairship_source
-alde_dun03	mapflag	privateairship_source
-alde_dun04	mapflag	privateairship_source
-alde_gld	mapflag	privateairship_source
-aldebaran	mapflag	privateairship_source
-ama_dun01	mapflag	privateairship_source
-ama_dun02	mapflag	privateairship_source
-ama_dun03	mapflag	privateairship_source
-ama_fild01	mapflag	privateairship_source
-amatsu	mapflag	privateairship_source
-anthell01	mapflag	privateairship_source
-anthell02	mapflag	privateairship_source
-aru_gld	mapflag	privateairship_source
-ayo_dun01	mapflag	privateairship_source
-ayo_dun02	mapflag	privateairship_source
-ayo_fild01	mapflag	privateairship_source
-ayothaya	mapflag	privateairship_source
-beach_dun	mapflag	privateairship_source
-beach_dun2	mapflag	privateairship_source
-beach_dun3	mapflag	privateairship_source
-bif_fild01	mapflag	privateairship_source
-bif_fild02	mapflag	privateairship_source
-bra_dun01	mapflag	privateairship_source
-bra_dun02	mapflag	privateairship_source
-bra_fild01	mapflag	privateairship_source
-brasilis	mapflag	privateairship_source
-c_tower1	mapflag	privateairship_source
-c_tower2	mapflag	privateairship_source
-c_tower3	mapflag	privateairship_source
-c_tower4	mapflag	privateairship_source
-cmd_fild01	mapflag	privateairship_source
-cmd_fild02	mapflag	privateairship_source
-cmd_fild03	mapflag	privateairship_source
-cmd_fild04	mapflag	privateairship_source
-cmd_fild06	mapflag	privateairship_source
-cmd_fild07	mapflag	privateairship_source
-cmd_fild08	mapflag	privateairship_source
-cmd_fild09	mapflag	privateairship_source
-comodo	mapflag	privateairship_source
-dali	mapflag	privateairship_source
-dali02	mapflag	privateairship_source
-dew_dun01	mapflag	privateairship_source
-dew_dun02	mapflag	privateairship_source
-dew_fild01	mapflag	privateairship_source
-dewata	mapflag	privateairship_source
-dic_dun01	mapflag	privateairship_source
-dic_dun02	mapflag	privateairship_source
-dic_dun03	mapflag	privateairship_source
-dic_fild01	mapflag	privateairship_source
-dic_fild02	mapflag	privateairship_source
-dicastes01	mapflag	privateairship_source
-dicastes02	mapflag	privateairship_source
-ecl_fild01	mapflag	privateairship_source
-ecl_tdun01	mapflag	privateairship_source
-ecl_tdun02	mapflag	privateairship_source
-ecl_tdun03	mapflag	privateairship_source
-eclage	mapflag	privateairship_source
-ein_dun01	mapflag	privateairship_source
-ein_dun02	mapflag	privateairship_source
-ein_fild01	mapflag	privateairship_source
-ein_fild03	mapflag	privateairship_source
-ein_fild04	mapflag	privateairship_source
-ein_fild05	mapflag	privateairship_source
-ein_fild06	mapflag	privateairship_source
-ein_fild07	mapflag	privateairship_source
-ein_fild08	mapflag	privateairship_source
-ein_fild09	mapflag	privateairship_source
-einbech	mapflag	privateairship_source
-einbroch	mapflag	privateairship_source
-gef_dun00	mapflag	privateairship_source
-gef_dun01	mapflag	privateairship_source
-gef_dun02	mapflag	privateairship_source
-gef_fild00	mapflag	privateairship_source
-gef_fild01	mapflag	privateairship_source
-gef_fild02	mapflag	privateairship_source
-gef_fild03	mapflag	privateairship_source
-gef_fild04	mapflag	privateairship_source
-gef_fild05	mapflag	privateairship_source
-gef_fild06	mapflag	privateairship_source
-gef_fild07	mapflag	privateairship_source
-gef_fild08	mapflag	privateairship_source
-gef_fild09	mapflag	privateairship_source
-gef_fild10	mapflag	privateairship_source
-gef_fild11	mapflag	privateairship_source
-gef_fild12	mapflag	privateairship_source
-gef_fild13	mapflag	privateairship_source
-gef_fild14	mapflag	privateairship_source
-gefenia01	mapflag	privateairship_source
-gefenia02	mapflag	privateairship_source
-gefenia03	mapflag	privateairship_source
-gefenia04	mapflag	privateairship_source
-geffen	mapflag	privateairship_source
-gl_cas01	mapflag	privateairship_source
-gl_cas02	mapflag	privateairship_source
-gl_church	mapflag	privateairship_source
-gl_chyard	mapflag	privateairship_source
-gl_dun01	mapflag	privateairship_source
-gl_dun02	mapflag	privateairship_source
-gl_in01	mapflag	privateairship_source
-gl_knt01	mapflag	privateairship_source
-gl_knt02	mapflag	privateairship_source
-gl_prison	mapflag	privateairship_source
-gl_prison1	mapflag	privateairship_source
-gl_sew01	mapflag	privateairship_source
-gl_sew02	mapflag	privateairship_source
-gl_sew03	mapflag	privateairship_source
-gl_sew04	mapflag	privateairship_source
-gl_step	mapflag	privateairship_source
-glast_01	mapflag	privateairship_source
-gon_dun01	mapflag	privateairship_source
-gon_dun02	mapflag	privateairship_source
-gon_dun03	mapflag	privateairship_source
-gon_fild01	mapflag	privateairship_source
-gonryun	mapflag	privateairship_source
-hu_fild01	mapflag	privateairship_source
-hu_fild02	mapflag	privateairship_source
-hu_fild04	mapflag	privateairship_source
-hu_fild05	mapflag	privateairship_source
-hu_fild06	mapflag	privateairship_source
-hugel	mapflag	privateairship_source
-ice_dun01	mapflag	privateairship_source
-ice_dun02	mapflag	privateairship_source
-ice_dun03	mapflag	privateairship_source
-in_sphinx1	mapflag	privateairship_source
-in_sphinx2	mapflag	privateairship_source
-in_sphinx3	mapflag	privateairship_source
-in_sphinx4	mapflag	privateairship_source
-in_sphinx5	mapflag	privateairship_source
-iz_dun00	mapflag	privateairship_source
-iz_dun01	mapflag	privateairship_source
-iz_dun02	mapflag	privateairship_source
-iz_dun03	mapflag	privateairship_source
-iz_dun04	mapflag	privateairship_source
-iz_dun05	mapflag	privateairship_source
-izlu2dun	mapflag	privateairship_source
-izlude	mapflag	privateairship_source
-jupe_core	mapflag	privateairship_source
-juperos_01	mapflag	privateairship_source
-juperos_02	mapflag	privateairship_source
-kh_dun01	mapflag	privateairship_source
-kh_dun02	mapflag	privateairship_source
-lasa_dun01	mapflag	privateairship_source
-lasa_dun02	mapflag	privateairship_source
-lasa_dun03	mapflag	privateairship_source
-lasa_fild01	mapflag	privateairship_source
-lasa_fild02	mapflag	privateairship_source
-lasagna	mapflag	privateairship_source
-lhz_dun01	mapflag	privateairship_source
-lhz_dun02	mapflag	privateairship_source
-lhz_dun03	mapflag	privateairship_source
-lhz_fild01	mapflag	privateairship_source
-lhz_fild02	mapflag	privateairship_source
-lhz_fild03	mapflag	privateairship_source
-lighthalzen	mapflag	privateairship_source
-lou_dun01	mapflag	privateairship_source
-lou_dun02	mapflag	privateairship_source
-lou_dun03	mapflag	privateairship_source
-lou_fild01	mapflag	privateairship_source
-louyang	mapflag	privateairship_source
-ma_dun01	mapflag	privateairship_source
-ma_fild01	mapflag	privateairship_source
-ma_fild02	mapflag	privateairship_source
-ma_scene01	mapflag	privateairship_source
-mag_dun01	mapflag	privateairship_source
-mag_dun02	mapflag	privateairship_source
-mal_dun01	mapflag	privateairship_source
-malangdo	mapflag	privateairship_source
-malaya	mapflag	privateairship_source
-man_fild01	mapflag	privateairship_source
-man_fild02	mapflag	privateairship_source
-man_fild03	mapflag	privateairship_source
-manuk	mapflag	privateairship_source
-mid_camp	mapflag	privateairship_source
-mjo_dun01	mapflag	privateairship_source
-mjo_dun02	mapflag	privateairship_source
-mjo_dun03	mapflag	privateairship_source
-mjolnir_01	mapflag	privateairship_source
-mjolnir_02	mapflag	privateairship_source
-mjolnir_03	mapflag	privateairship_source
-mjolnir_04	mapflag	privateairship_source
-mjolnir_05	mapflag	privateairship_source
-mjolnir_06	mapflag	privateairship_source
-mjolnir_07	mapflag	privateairship_source
-mjolnir_08	mapflag	privateairship_source
-mjolnir_09	mapflag	privateairship_source
-mjolnir_10	mapflag	privateairship_source
-mjolnir_11	mapflag	privateairship_source
-mjolnir_12	mapflag	privateairship_source
-moc_fild01	mapflag	privateairship_source
-moc_fild02	mapflag	privateairship_source
-moc_fild03	mapflag	privateairship_source
-moc_fild04	mapflag	privateairship_source
-moc_fild05	mapflag	privateairship_source
-moc_fild06	mapflag	privateairship_source
-moc_fild07	mapflag	privateairship_source
-moc_fild08	mapflag	privateairship_source
-moc_fild09	mapflag	privateairship_source
-moc_fild10	mapflag	privateairship_source
-moc_fild11	mapflag	privateairship_source
-moc_fild12	mapflag	privateairship_source
-moc_fild13	mapflag	privateairship_source
-moc_fild14	mapflag	privateairship_source
-moc_fild15	mapflag	privateairship_source
-moc_fild16	mapflag	privateairship_source
-moc_fild17	mapflag	privateairship_source
-moc_fild18	mapflag	privateairship_source
-moc_fild19	mapflag	privateairship_source
-moc_pryd01	mapflag	privateairship_source
-moc_pryd02	mapflag	privateairship_source
-moc_pryd03	mapflag	privateairship_source
-moc_pryd04	mapflag	privateairship_source
-moc_pryd05	mapflag	privateairship_source
-moc_pryd06	mapflag	privateairship_source
-moc_ruins	mapflag	privateairship_source
-mora	mapflag	privateairship_source
-moro_cav	mapflag	privateairship_source
-moro_vol	mapflag	privateairship_source
-morocc	mapflag	privateairship_source
-moscovia	mapflag	privateairship_source
-mosk_dun01	mapflag	privateairship_source
-mosk_dun02	mapflag	privateairship_source
-mosk_dun03	mapflag	privateairship_source
-mosk_fild02	mapflag	privateairship_source
-nameless_n	mapflag	privateairship_source
-nif_fild01	mapflag	privateairship_source
-nif_fild02	mapflag	privateairship_source
-niflheim	mapflag	privateairship_source
-odin_tem01	mapflag	privateairship_source
-odin_tem02	mapflag	privateairship_source
-odin_tem03	mapflag	privateairship_source
-orcsdun01	mapflag	privateairship_source
-orcsdun02	mapflag	privateairship_source
-pay_arche	mapflag	privateairship_source
-pay_dun00	mapflag	privateairship_source
-pay_dun01	mapflag	privateairship_source
-pay_dun02	mapflag	privateairship_source
-pay_dun03	mapflag	privateairship_source
-pay_dun04	mapflag	privateairship_source
-pay_fild01	mapflag	privateairship_source
-pay_fild02	mapflag	privateairship_source
-pay_fild03	mapflag	privateairship_source
-pay_fild04	mapflag	privateairship_source
-pay_fild05	mapflag	privateairship_source
-pay_fild06	mapflag	privateairship_source
-pay_fild07	mapflag	privateairship_source
-pay_fild08	mapflag	privateairship_source
-pay_fild09	mapflag	privateairship_source
-pay_fild10	mapflag	privateairship_source
-pay_fild11	mapflag	privateairship_source
-payon	mapflag	privateairship_source
-prontera	mapflag	privateairship_source
-prt_fild00	mapflag	privateairship_source
-prt_fild01	mapflag	privateairship_source
-prt_fild02	mapflag	privateairship_source
-prt_fild03	mapflag	privateairship_source
-prt_fild04	mapflag	privateairship_source
-prt_fild05	mapflag	privateairship_source
-prt_fild06	mapflag	privateairship_source
-prt_fild07	mapflag	privateairship_source
-prt_fild08	mapflag	privateairship_source
-prt_fild09	mapflag	privateairship_source
-prt_fild10	mapflag	privateairship_source
-prt_fild11	mapflag	privateairship_source
-prt_maze01	mapflag	privateairship_source
-prt_maze02	mapflag	privateairship_source
-prt_maze03	mapflag	privateairship_source
-prt_monk	mapflag	privateairship_source
-prt_sewb1	mapflag	privateairship_source
-prt_sewb2	mapflag	privateairship_source
-prt_sewb3	mapflag	privateairship_source
-prt_sewb4	mapflag	privateairship_source
-ra_fild01	mapflag	privateairship_source
-ra_fild03	mapflag	privateairship_source
-ra_fild04	mapflag	privateairship_source
-ra_fild05	mapflag	privateairship_source
-ra_fild06	mapflag	privateairship_source
-ra_fild08	mapflag	privateairship_source
-ra_fild12	mapflag	privateairship_source
-ra_san01	mapflag	privateairship_source
-ra_san02	mapflag	privateairship_source
-ra_san03	mapflag	privateairship_source
-ra_san04	mapflag	privateairship_source
-ra_san05	mapflag	privateairship_source
-ra_temple	mapflag	privateairship_source
-rachel	mapflag	privateairship_source
-spl_fild01	mapflag	privateairship_source
-spl_fild02	mapflag	privateairship_source
-spl_fild03	mapflag	privateairship_source
-splendide	mapflag	privateairship_source
-tha_t01	mapflag	privateairship_source
-tha_t02	mapflag	privateairship_source
-tha_t03	mapflag	privateairship_source
-tha_t04	mapflag	privateairship_source
-tha_t05	mapflag	privateairship_source
-tha_t06	mapflag	privateairship_source
-tha_t07	mapflag	privateairship_source
-tha_t08	mapflag	privateairship_source
-tha_t09	mapflag	privateairship_source
-tha_t10	mapflag	privateairship_source
-tha_t11	mapflag	privateairship_source
-tha_t12	mapflag	privateairship_source
-thor_v01	mapflag	privateairship_source
-thor_v02	mapflag	privateairship_source
-thor_v03	mapflag	privateairship_source
-treasure01	mapflag	privateairship_source
-treasure02	mapflag	privateairship_source
-tur_dun01	mapflag	privateairship_source
-tur_dun02	mapflag	privateairship_source
-tur_dun03	mapflag	privateairship_source
-tur_dun04	mapflag	privateairship_source
-tur_dun05	mapflag	privateairship_source
-um_fild01	mapflag	privateairship_source
-um_fild02	mapflag	privateairship_source
-um_fild03	mapflag	privateairship_source
-um_fild04	mapflag	privateairship_source
-umbala	mapflag	privateairship_source
-ve_fild01	mapflag	privateairship_source
-ve_fild02	mapflag	privateairship_source
-ve_fild03	mapflag	privateairship_source
-ve_fild04	mapflag	privateairship_source
-ve_fild06	mapflag	privateairship_source
-ve_fild07	mapflag	privateairship_source
-veins	mapflag	privateairship_source
-ver_eju	mapflag	privateairship_source
-ver_tunn	mapflag	privateairship_source
-verus03	mapflag	privateairship_source
-verus04	mapflag	privateairship_source
-yuno	mapflag	privateairship_source
-yuno_fild01	mapflag	privateairship_source
-yuno_fild02	mapflag	privateairship_source
-yuno_fild03	mapflag	privateairship_source
-yuno_fild04	mapflag	privateairship_source
-yuno_fild06	mapflag	privateairship_source
-yuno_fild07	mapflag	privateairship_source
-yuno_fild08	mapflag	privateairship_source
-yuno_fild09	mapflag	privateairship_source
-yuno_fild11	mapflag	privateairship_source
-yuno_fild12	mapflag	privateairship_source
-
-//============================================================
-// Available Destinations
-//============================================================
-abbey01	mapflag	privateairship_destination
-abbey02	mapflag	privateairship_destination
-abbey03	mapflag	privateairship_destination
-abyss_01	mapflag	privateairship_destination
-abyss_02	mapflag	privateairship_destination
-abyss_03	mapflag	privateairship_destination
-alb2trea	mapflag	privateairship_destination
-alberta	mapflag	privateairship_destination
-alde_dun01	mapflag	privateairship_destination
-alde_dun02	mapflag	privateairship_destination
-alde_dun03	mapflag	privateairship_destination
-alde_dun04	mapflag	privateairship_destination
-alde_gld	mapflag	privateairship_destination
-aldebaran	mapflag	privateairship_destination
-ama_dun01	mapflag	privateairship_destination
-ama_dun02	mapflag	privateairship_destination
-ama_dun03	mapflag	privateairship_destination
-ama_fild01	mapflag	privateairship_destination
-amatsu	mapflag	privateairship_destination
-anthell01	mapflag	privateairship_destination
-anthell02	mapflag	privateairship_destination
-aru_gld	mapflag	privateairship_destination
-ayo_dun01	mapflag	privateairship_destination
-ayo_dun02	mapflag	privateairship_destination
-ayo_fild01	mapflag	privateairship_destination
-ayothaya	mapflag	privateairship_destination
-beach_dun	mapflag	privateairship_destination
-beach_dun2	mapflag	privateairship_destination
-beach_dun3	mapflag	privateairship_destination
-bif_fild01	mapflag	privateairship_destination
-bif_fild02	mapflag	privateairship_destination
-bra_dun01	mapflag	privateairship_destination
-bra_dun02	mapflag	privateairship_destination
-bra_fild01	mapflag	privateairship_destination
-brasilis	mapflag	privateairship_destination
-c_tower1	mapflag	privateairship_destination
-c_tower2	mapflag	privateairship_destination
-c_tower3	mapflag	privateairship_destination
-c_tower4	mapflag	privateairship_destination
-cmd_fild01	mapflag	privateairship_destination
-cmd_fild02	mapflag	privateairship_destination
-cmd_fild03	mapflag	privateairship_destination
-cmd_fild04	mapflag	privateairship_destination
-cmd_fild06	mapflag	privateairship_destination
-cmd_fild07	mapflag	privateairship_destination
-cmd_fild08	mapflag	privateairship_destination
-cmd_fild09	mapflag	privateairship_destination
-comodo	mapflag	privateairship_destination
-dali	mapflag	privateairship_destination
-dali02	mapflag	privateairship_destination
-dew_dun01	mapflag	privateairship_destination
-dew_dun02	mapflag	privateairship_destination
-dew_fild01	mapflag	privateairship_destination
-dewata	mapflag	privateairship_destination
-dic_dun01	mapflag	privateairship_destination
-dic_dun02	mapflag	privateairship_destination
-dic_dun03	mapflag	privateairship_destination
-dic_fild01	mapflag	privateairship_destination
-dic_fild02	mapflag	privateairship_destination
-dicastes01	mapflag	privateairship_destination
-dicastes02	mapflag	privateairship_destination
-ecl_fild01	mapflag	privateairship_destination
-ecl_tdun01	mapflag	privateairship_destination
-ecl_tdun02	mapflag	privateairship_destination
-ecl_tdun03	mapflag	privateairship_destination
-eclage	mapflag	privateairship_destination
-ein_dun01	mapflag	privateairship_destination
-ein_dun02	mapflag	privateairship_destination
-ein_fild01	mapflag	privateairship_destination
-ein_fild03	mapflag	privateairship_destination
-ein_fild04	mapflag	privateairship_destination
-ein_fild05	mapflag	privateairship_destination
-ein_fild06	mapflag	privateairship_destination
-ein_fild07	mapflag	privateairship_destination
-ein_fild08	mapflag	privateairship_destination
-ein_fild09	mapflag	privateairship_destination
-einbech	mapflag	privateairship_destination
-einbroch	mapflag	privateairship_destination
-gef_dun00	mapflag	privateairship_destination
-gef_dun01	mapflag	privateairship_destination
-gef_dun02	mapflag	privateairship_destination
-gef_fild00	mapflag	privateairship_destination
-gef_fild01	mapflag	privateairship_destination
-gef_fild02	mapflag	privateairship_destination
-gef_fild03	mapflag	privateairship_destination
-gef_fild04	mapflag	privateairship_destination
-gef_fild05	mapflag	privateairship_destination
-gef_fild06	mapflag	privateairship_destination
-gef_fild07	mapflag	privateairship_destination
-gef_fild08	mapflag	privateairship_destination
-gef_fild09	mapflag	privateairship_destination
-gef_fild10	mapflag	privateairship_destination
-gef_fild11	mapflag	privateairship_destination
-gef_fild12	mapflag	privateairship_destination
-gef_fild13	mapflag	privateairship_destination
-gef_fild14	mapflag	privateairship_destination
-gefenia01	mapflag	privateairship_destination
-gefenia02	mapflag	privateairship_destination
-gefenia03	mapflag	privateairship_destination
-gefenia04	mapflag	privateairship_destination
-geffen	mapflag	privateairship_destination
-gl_cas01	mapflag	privateairship_destination
-gl_cas02	mapflag	privateairship_destination
-gl_church	mapflag	privateairship_destination
-gl_chyard	mapflag	privateairship_destination
-gl_dun01	mapflag	privateairship_destination
-gl_dun02	mapflag	privateairship_destination
-gl_in01	mapflag	privateairship_destination
-gl_knt01	mapflag	privateairship_destination
-gl_knt02	mapflag	privateairship_destination
-gl_prison	mapflag	privateairship_destination
-gl_prison1	mapflag	privateairship_destination
-gl_sew01	mapflag	privateairship_destination
-gl_sew02	mapflag	privateairship_destination
-gl_sew03	mapflag	privateairship_destination
-gl_sew04	mapflag	privateairship_destination
-gl_step	mapflag	privateairship_destination
-glast_01	mapflag	privateairship_destination
-gon_dun01	mapflag	privateairship_destination
-gon_dun02	mapflag	privateairship_destination
-gon_dun03	mapflag	privateairship_destination
-gon_fild01	mapflag	privateairship_destination
-gonryun	mapflag	privateairship_destination
-hu_fild01	mapflag	privateairship_destination
-hu_fild02	mapflag	privateairship_destination
-hu_fild04	mapflag	privateairship_destination
-hu_fild05	mapflag	privateairship_destination
-hu_fild06	mapflag	privateairship_destination
-hugel	mapflag	privateairship_destination
-ice_dun01	mapflag	privateairship_destination
-ice_dun02	mapflag	privateairship_destination
-ice_dun03	mapflag	privateairship_destination
-in_sphinx1	mapflag	privateairship_destination
-in_sphinx2	mapflag	privateairship_destination
-in_sphinx3	mapflag	privateairship_destination
-in_sphinx4	mapflag	privateairship_destination
-in_sphinx5	mapflag	privateairship_destination
-iz_dun00	mapflag	privateairship_destination
-iz_dun01	mapflag	privateairship_destination
-iz_dun02	mapflag	privateairship_destination
-iz_dun03	mapflag	privateairship_destination
-iz_dun04	mapflag	privateairship_destination
-iz_dun05	mapflag	privateairship_destination
-izlu2dun	mapflag	privateairship_destination
-izlude	mapflag	privateairship_destination
-jupe_core	mapflag	privateairship_destination
-juperos_01	mapflag	privateairship_destination
-juperos_02	mapflag	privateairship_destination
-kh_dun01	mapflag	privateairship_destination
-kh_dun02	mapflag	privateairship_destination
-lasa_dun01	mapflag	privateairship_destination
-lasa_dun02	mapflag	privateairship_destination
-lasa_dun03	mapflag	privateairship_destination
-lasa_fild01	mapflag	privateairship_destination
-lasa_fild02	mapflag	privateairship_destination
-lasagna	mapflag	privateairship_destination
-lhz_dun01	mapflag	privateairship_destination
-lhz_dun02	mapflag	privateairship_destination
-lhz_dun03	mapflag	privateairship_destination
-lhz_fild01	mapflag	privateairship_destination
-lhz_fild02	mapflag	privateairship_destination
-lhz_fild03	mapflag	privateairship_destination
-lighthalzen	mapflag	privateairship_destination
-lou_dun01	mapflag	privateairship_destination
-lou_dun02	mapflag	privateairship_destination
-lou_dun03	mapflag	privateairship_destination
-lou_fild01	mapflag	privateairship_destination
-louyang	mapflag	privateairship_destination
-ma_dun01	mapflag	privateairship_destination
-ma_fild01	mapflag	privateairship_destination
-ma_fild02	mapflag	privateairship_destination
-ma_scene01	mapflag	privateairship_destination
-mag_dun01	mapflag	privateairship_destination
-mag_dun02	mapflag	privateairship_destination
-mal_dun01	mapflag	privateairship_destination
-malangdo	mapflag	privateairship_destination
-malaya	mapflag	privateairship_destination
-man_fild01	mapflag	privateairship_destination
-man_fild02	mapflag	privateairship_destination
-man_fild03	mapflag	privateairship_destination
-manuk	mapflag	privateairship_destination
-mid_camp	mapflag	privateairship_destination
-mjo_dun01	mapflag	privateairship_destination
-mjo_dun02	mapflag	privateairship_destination
-mjo_dun03	mapflag	privateairship_destination
-mjolnir_01	mapflag	privateairship_destination
-mjolnir_02	mapflag	privateairship_destination
-mjolnir_03	mapflag	privateairship_destination
-mjolnir_04	mapflag	privateairship_destination
-mjolnir_05	mapflag	privateairship_destination
-mjolnir_06	mapflag	privateairship_destination
-mjolnir_07	mapflag	privateairship_destination
-mjolnir_08	mapflag	privateairship_destination
-mjolnir_09	mapflag	privateairship_destination
-mjolnir_10	mapflag	privateairship_destination
-mjolnir_11	mapflag	privateairship_destination
-mjolnir_12	mapflag	privateairship_destination
-moc_fild01	mapflag	privateairship_destination
-moc_fild02	mapflag	privateairship_destination
-moc_fild03	mapflag	privateairship_destination
-moc_fild04	mapflag	privateairship_destination
-moc_fild05	mapflag	privateairship_destination
-moc_fild06	mapflag	privateairship_destination
-moc_fild07	mapflag	privateairship_destination
-moc_fild08	mapflag	privateairship_destination
-moc_fild09	mapflag	privateairship_destination
-moc_fild10	mapflag	privateairship_destination
-moc_fild11	mapflag	privateairship_destination
-moc_fild12	mapflag	privateairship_destination
-moc_fild13	mapflag	privateairship_destination
-moc_fild14	mapflag	privateairship_destination
-moc_fild15	mapflag	privateairship_destination
-moc_fild16	mapflag	privateairship_destination
-moc_fild17	mapflag	privateairship_destination
-moc_fild18	mapflag	privateairship_destination
-moc_fild19	mapflag	privateairship_destination
-moc_pryd01	mapflag	privateairship_destination
-moc_pryd02	mapflag	privateairship_destination
-moc_pryd03	mapflag	privateairship_destination
-moc_pryd04	mapflag	privateairship_destination
-moc_pryd05	mapflag	privateairship_destination
-moc_pryd06	mapflag	privateairship_destination
-moc_ruins	mapflag	privateairship_destination
-mora	mapflag	privateairship_destination
-moro_cav	mapflag	privateairship_destination
-moro_vol	mapflag	privateairship_destination
-morocc	mapflag	privateairship_destination
-moscovia	mapflag	privateairship_destination
-mosk_dun01	mapflag	privateairship_destination
-mosk_dun02	mapflag	privateairship_destination
-mosk_dun03	mapflag	privateairship_destination
-mosk_fild02	mapflag	privateairship_destination
-nameless_n	mapflag	privateairship_destination
-nif_fild01	mapflag	privateairship_destination
-nif_fild02	mapflag	privateairship_destination
-niflheim	mapflag	privateairship_destination
-odin_tem01	mapflag	privateairship_destination
-odin_tem02	mapflag	privateairship_destination
-odin_tem03	mapflag	privateairship_destination
-orcsdun01	mapflag	privateairship_destination
-orcsdun02	mapflag	privateairship_destination
-pay_arche	mapflag	privateairship_destination
-pay_dun00	mapflag	privateairship_destination
-pay_dun01	mapflag	privateairship_destination
-pay_dun02	mapflag	privateairship_destination
-pay_dun03	mapflag	privateairship_destination
-pay_dun04	mapflag	privateairship_destination
-pay_fild01	mapflag	privateairship_destination
-pay_fild02	mapflag	privateairship_destination
-pay_fild03	mapflag	privateairship_destination
-pay_fild04	mapflag	privateairship_destination
-pay_fild05	mapflag	privateairship_destination
-pay_fild06	mapflag	privateairship_destination
-pay_fild07	mapflag	privateairship_destination
-pay_fild08	mapflag	privateairship_destination
-pay_fild09	mapflag	privateairship_destination
-pay_fild10	mapflag	privateairship_destination
-pay_fild11	mapflag	privateairship_destination
-payon	mapflag	privateairship_destination
-prontera	mapflag	privateairship_destination
-prt_fild00	mapflag	privateairship_destination
-prt_fild01	mapflag	privateairship_destination
-prt_fild02	mapflag	privateairship_destination
-prt_fild03	mapflag	privateairship_destination
-prt_fild04	mapflag	privateairship_destination
-prt_fild05	mapflag	privateairship_destination
-prt_fild06	mapflag	privateairship_destination
-prt_fild07	mapflag	privateairship_destination
-prt_fild08	mapflag	privateairship_destination
-prt_fild09	mapflag	privateairship_destination
-prt_fild10	mapflag	privateairship_destination
-prt_fild11	mapflag	privateairship_destination
-prt_maze01	mapflag	privateairship_destination
-prt_maze02	mapflag	privateairship_destination
-prt_maze03	mapflag	privateairship_destination
-prt_monk	mapflag	privateairship_destination
-prt_sewb1	mapflag	privateairship_destination
-prt_sewb2	mapflag	privateairship_destination
-prt_sewb3	mapflag	privateairship_destination
-prt_sewb4	mapflag	privateairship_destination
-ra_fild01	mapflag	privateairship_destination
-ra_fild03	mapflag	privateairship_destination
-ra_fild04	mapflag	privateairship_destination
-ra_fild05	mapflag	privateairship_destination
-ra_fild06	mapflag	privateairship_destination
-ra_fild08	mapflag	privateairship_destination
-ra_fild12	mapflag	privateairship_destination
-ra_san01	mapflag	privateairship_destination
-ra_san02	mapflag	privateairship_destination
-ra_san03	mapflag	privateairship_destination
-ra_san04	mapflag	privateairship_destination
-ra_san05	mapflag	privateairship_destination
-ra_temple	mapflag	privateairship_destination
-rachel	mapflag	privateairship_destination
-spl_fild01	mapflag	privateairship_destination
-spl_fild02	mapflag	privateairship_destination
-spl_fild03	mapflag	privateairship_destination
-splendide	mapflag	privateairship_destination
-tha_t01	mapflag	privateairship_destination
-tha_t02	mapflag	privateairship_destination
-tha_t03	mapflag	privateairship_destination
-tha_t04	mapflag	privateairship_destination
-tha_t05	mapflag	privateairship_destination
-tha_t06	mapflag	privateairship_destination
-tha_t07	mapflag	privateairship_destination
-tha_t08	mapflag	privateairship_destination
-tha_t09	mapflag	privateairship_destination
-tha_t10	mapflag	privateairship_destination
-tha_t11	mapflag	privateairship_destination
-tha_t12	mapflag	privateairship_destination
-thor_v01	mapflag	privateairship_destination
-thor_v02	mapflag	privateairship_destination
-thor_v03	mapflag	privateairship_destination
-treasure01	mapflag	privateairship_destination
-treasure02	mapflag	privateairship_destination
-tur_dun01	mapflag	privateairship_destination
-tur_dun02	mapflag	privateairship_destination
-tur_dun03	mapflag	privateairship_destination
-tur_dun04	mapflag	privateairship_destination
-tur_dun05	mapflag	privateairship_destination
-um_fild01	mapflag	privateairship_destination
-um_fild02	mapflag	privateairship_destination
-um_fild03	mapflag	privateairship_destination
-um_fild04	mapflag	privateairship_destination
-umbala	mapflag	privateairship_destination
-ve_fild01	mapflag	privateairship_destination
-ve_fild02	mapflag	privateairship_destination
-ve_fild03	mapflag	privateairship_destination
-ve_fild04	mapflag	privateairship_destination
-ve_fild06	mapflag	privateairship_destination
-ve_fild07	mapflag	privateairship_destination
-veins	mapflag	privateairship_destination
-ver_eju	mapflag	privateairship_destination
-ver_tunn	mapflag	privateairship_destination
-verus03	mapflag	privateairship_destination
-verus04	mapflag	privateairship_destination
-yuno	mapflag	privateairship_destination
-yuno_fild01	mapflag	privateairship_destination
-yuno_fild02	mapflag	privateairship_destination
-yuno_fild03	mapflag	privateairship_destination
-yuno_fild04	mapflag	privateairship_destination
-yuno_fild06	mapflag	privateairship_destination
-yuno_fild07	mapflag	privateairship_destination
-yuno_fild08	mapflag	privateairship_destination
-yuno_fild09	mapflag	privateairship_destination
-yuno_fild11	mapflag	privateairship_destination
-yuno_fild12	mapflag	privateairship_destination
--- a/npc/re/mapflag/reset.txt
+++ b/npc/re/mapflag/reset.txt
@@ -1,21 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Enable Neuralizer use.
-//===== Description: ========================================= 
-//= Maps where Neuralizer (12213) can be used.
-//===== Additional Comments: ================================= 
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Added Izlude duplicates. [Euphy]
-//============================================================
-
-dewata	mapflag	reset
-dicastes01	mapflag	reset
-dicastes02	mapflag	reset
-eclage	mapflag	reset
-izlude_a	mapflag	reset
-izlude_b	mapflag	reset
-izlude_c	mapflag	reset
-izlude_d	mapflag	reset
-malangdo	mapflag	reset
-malaya	mapflag	reset
-mora	mapflag	reset
-wolfvill	mapflag	reset
--- a/npc/re/mapflag/restricted.txt
+++ b/npc/re/mapflag/restricted.txt
@@ -1,267 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Restricted.
-//===== Description: =========================================
-//= Disables items configured in item_noequip.txt
-//= and skills configured in skill_nocast_db.txt.
-//===== Changelogs: ==========================================
-//= 1.0 Renewal split. [Euphy]
-//= 1.1 Copied towns into this file. [Euphy]
-//= 1.2 Added WOE:TE maps [Cydh]
-//============================================================
-
-//============================================================
-// Instances
-//============================================================
-1@mist	mapflag	restricted	6
-1@cash	mapflag	restricted	6
-1@pump	mapflag	restricted	6
-2@pump	mapflag	restricted	6
-1@lhz	mapflag	restricted	6
-1@ma_h	mapflag	restricted	6
-1@ma_c	mapflag	restricted	6
-1@ma_b	mapflag	restricted	6
-1@ecl	mapflag	restricted	6
-
-//============================================================
-// Glastheim Memorial Dungeon
-//============================================================
-1@gl_k	mapflag	restricted	6
-2@gl_k	mapflag	restricted	6
-
-//============================================================
-// Wave Mode Memorial Dungeon
-//============================================================
-1@def01	mapflag	restricted	9
-1@def02	mapflag	restricted	9
-1@def03	mapflag	restricted	9
-
-//============================================================
-// Heroes' Trail - Part 1
-//============================================================
-1@face	mapflag	restricted	6
-1@sara	mapflag	restricted	6
-
-//============================================================
-// Heroes' Trail - Part 2
-//============================================================
-1@ge_st	mapflag	restricted	6
-1@gef	mapflag	restricted	6
-1@gef_in	mapflag	restricted	6
-1@spa	mapflag	restricted	6
-1@tnm1	mapflag	restricted	6
-1@tnm2	mapflag	restricted	6
-1@tnm3	mapflag	restricted	6
-
-//============================================================
-// Horror Toy Factory Memorial Dungeon
-//============================================================
-1@xm_d	mapflag	restricted	6
-
-//============================================================
-// Heroes' Trail - Part 3
-//============================================================
-1@glast	mapflag	restricted	6
-1@air1	mapflag	restricted	6
-1@air2	mapflag	restricted	6
-
-//============================================================
-// Decisive Battle - Part 1
-//============================================================
-1@dth1	mapflag	restricted	6
-1@dth2	mapflag	restricted	6
-1@dth3	mapflag	restricted	6
-1@rev	mapflag	restricted	6
-
-//============================================================
-// Decisive Battle - Part 2
-//============================================================
-1@eom	mapflag	restricted	6
-1@jtb	mapflag	restricted	6
-
-//============================================================
-// Episode 15 - Phantasmagorica
-//============================================================
-1@lab	mapflag	restricted	6
-1@uns	mapflag	restricted	6
-1@mcd	mapflag	restricted	6
-
-//============================================================
-// Nightmare Biolab
-//============================================================
-lhz_dun_n	mapflag	restricted	6
-lhz_d_n2	mapflag	restricted	6
-
-//============================================================
-// Infinite Space
-//============================================================
-1@infi	mapflag	restricted	6
-
-//============================================================
-// Episode 16.1 - Banquet of Heroes
-//============================================================
-1@mir	mapflag	restricted	6
-2@mir	mapflag	restricted	6
-1@sthb	mapflag	restricted	6
-1@sthc	mapflag	restricted	6
-1@sthd	mapflag	restricted	6
-1@slw	mapflag	restricted	6
-1@swat	mapflag	restricted	6
-
-//============================================================
-// Memorial day
-//============================================================
-1@md_gef	mapflag	restricted	6
-1@md_pay	mapflag	restricted	6
-
-//============================================================
-// Chicken Mode Nightmare Glastheim
-//============================================================
-1@gl_k2	mapflag	restricted	6
-2@gl_k2	mapflag	restricted	6
-
-//============================================================
-// Chicken Mode Horror Toy Factory
-//============================================================
-1@xm_d2	mapflag	restricted	6
-
-//============================================================
-// Suspicious Shipwreck
-//============================================================
-1@tre	mapflag	restricted	6
-
-//============================================================
-// Poring Village
-//============================================================
-1@begi	mapflag	restricted	6
-
-//============================================================
-// Volcanic Island Korodo
-//============================================================
-1@crd	mapflag	restricted	6
-
-//============================================================
-// Noodles Festival July
-//============================================================
-1@drdo	mapflag	restricted	6
-
-//============================================================
-// Soul Reaper Job Change
-//============================================================
-1@soul	mapflag	restricted	6
-
-//============================================================
-// Episode 17.1
-//============================================================
-1@cor	mapflag	restricted	6
-1@os_a	mapflag	restricted	6
-1@os_b	mapflag	restricted	6
-1@rgsr	mapflag	restricted	6
-
-//============================================================
-// Episode 17.2
-//============================================================
-1@bamn	mapflag	restricted	6
-1@bamq	mapflag	restricted	6
-1@ghg	mapflag	restricted	6
-1@herbs	mapflag	restricted	6
-1@lost	mapflag	restricted	6
-1@odin	mapflag	restricted	6
-
-//============================================================
-// 4th Jobs Change
-//============================================================
-1@4win	mapflag	restricted	6
-1@4mag	mapflag	restricted	6
-1@4mst	mapflag	restricted	6
-1@4sac	mapflag	restricted	6
-1@4tro	mapflag	restricted	6
-1@4inq	mapflag	restricted	6
-1@4cdn	mapflag	restricted	6
-1@4igd	mapflag	restricted	6
-1@4drk	mapflag	restricted	6
-
-//============================================================
-// Geffen Night Arena
-//============================================================
-1@ge_sn	mapflag	restricted	6
-
-//============================================================
-// Traces of Heroes
-//============================================================
-1@mjo1	mapflag	restricted	6
-1@mjo2	mapflag	restricted	6
-1@spa2	mapflag	restricted	6
-
-//============================================================
-// Thanatos Tower Memorial Dungeon
-//============================================================
-1@thts	mapflag	restricted	6
-2@thts	mapflag	restricted	6
-3@thts	mapflag	restricted	6
-4@thts	mapflag	restricted	6
-5@thts	mapflag	restricted	6
-6@thts	mapflag	restricted	6
-7@thts	mapflag	restricted	6
-8@thts	mapflag	restricted	6
-
-//============================================================
-// Glastheim Challenge Mode
-//============================================================
-1@gl_he	mapflag	restricted	6
-1@gl_he2	mapflag	restricted	6
-
-//============================================================
-// EDDA
-//============================================================
-1@gl_prq	mapflag	restricted	6
-1@gol1	mapflag	restricted	6
-1@gol2	mapflag	restricted	6
-
-//============================================================
-// 2018 Halloween
-//============================================================
-1@halo	mapflag	restricted	6
-
-//============================================================
-// Constellation Tower
-//============================================================
-1@ch_t	mapflag	restricted	6
-2@ch_t	mapflag	restricted	6
-3@ch_t	mapflag	restricted	6
-
-//============================================================
-// Episode 18 - Direction of Prayer
-//============================================================
-1@adv	mapflag	restricted	6
-1@advs	mapflag	restricted	6
-1@nyr	mapflag	restricted	6
-1@oz	mapflag	restricted	6
-1@tcamp	mapflag	restricted	6
-2@nyr	mapflag	restricted	6
-
-//============================================================
-// Sunken Tower
-//============================================================
-1@ch_u	mapflag	restricted	6
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-dewata	mapflag	restricted	7
-dicastes01	mapflag	restricted	7
-eclage	mapflag	restricted	7
-izlude_a	mapflag	restricted	7
-izlude_b	mapflag	restricted	7
-izlude_c	mapflag	restricted	7
-izlude_d	mapflag	restricted	7
-malangdo	mapflag	restricted	7
-malaya	mapflag	restricted	7
-mora	mapflag	restricted	7
-lasagna	mapflag	restricted	7
-wolfvill	mapflag	restricted	7
-
-//============================================================
-// WoE:TE Item Restrictions
-//============================================================
-teg_dun01	mapflag	restricted	8
-teg_dun02	mapflag	restricted	8
--- a/npc/re/mapflag/skill_duration.txt
+++ b/npc/re/mapflag/skill_duration.txt
@@ -1,125 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Skill Duration
-//===== Description: =========================================
-//= Sets skill time limit on specified map.
-//===== Structure ============================================
-//= mapname	skill_duration	skill_name,percentage
-//===== Changelogs: ==========================================
-//= 1.0 First Version.
-//============================================================
-
-//============================================================
-// Gloria Castles
-//============================================================
-te_prtcas01	mapflag	skill_duration	HT_SKIDTRAP,400
-te_prtcas01	mapflag	skill_duration	HT_LANDMINE,400
-te_prtcas01	mapflag	skill_duration	HT_ANKLESNARE,400
-te_prtcas01	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_prtcas01	mapflag	skill_duration	HT_SANDMAN,400
-te_prtcas01	mapflag	skill_duration	HT_FLASHER,400
-te_prtcas01	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_prtcas01	mapflag	skill_duration	HT_BLASTMINE,400
-te_prtcas01	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_prtcas01	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_prtcas02	mapflag	skill_duration	HT_SKIDTRAP,400
-te_prtcas02	mapflag	skill_duration	HT_LANDMINE,400
-te_prtcas02	mapflag	skill_duration	HT_ANKLESNARE,400
-te_prtcas02	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_prtcas02	mapflag	skill_duration	HT_SANDMAN,400
-te_prtcas02	mapflag	skill_duration	HT_FLASHER,400
-te_prtcas02	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_prtcas02	mapflag	skill_duration	HT_BLASTMINE,400
-te_prtcas02	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_prtcas02	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_prtcas03	mapflag	skill_duration	HT_SKIDTRAP,400
-te_prtcas03	mapflag	skill_duration	HT_LANDMINE,400
-te_prtcas03	mapflag	skill_duration	HT_ANKLESNARE,400
-te_prtcas03	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_prtcas03	mapflag	skill_duration	HT_SANDMAN,400
-te_prtcas03	mapflag	skill_duration	HT_FLASHER,400
-te_prtcas03	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_prtcas03	mapflag	skill_duration	HT_BLASTMINE,400
-te_prtcas03	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_prtcas03	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_prtcas04	mapflag	skill_duration	HT_SKIDTRAP,400
-te_prtcas04	mapflag	skill_duration	HT_LANDMINE,400
-te_prtcas04	mapflag	skill_duration	HT_ANKLESNARE,400
-te_prtcas04	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_prtcas04	mapflag	skill_duration	HT_SANDMAN,400
-te_prtcas04	mapflag	skill_duration	HT_FLASHER,400
-te_prtcas04	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_prtcas04	mapflag	skill_duration	HT_BLASTMINE,400
-te_prtcas04	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_prtcas04	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_prtcas05	mapflag	skill_duration	HT_SKIDTRAP,400
-te_prtcas05	mapflag	skill_duration	HT_LANDMINE,400
-te_prtcas05	mapflag	skill_duration	HT_ANKLESNARE,400
-te_prtcas05	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_prtcas05	mapflag	skill_duration	HT_SANDMAN,400
-te_prtcas05	mapflag	skill_duration	HT_FLASHER,400
-te_prtcas05	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_prtcas05	mapflag	skill_duration	HT_BLASTMINE,400
-te_prtcas05	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_prtcas05	mapflag	skill_duration	HT_TALKIEBOX,400
-
-//============================================================
-// Kafragaten Castles
-//============================================================
-te_aldecas1	mapflag	skill_duration	HT_SKIDTRAP,400
-te_aldecas1	mapflag	skill_duration	HT_LANDMINE,400
-te_aldecas1	mapflag	skill_duration	HT_ANKLESNARE,400
-te_aldecas1	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_aldecas1	mapflag	skill_duration	HT_SANDMAN,400
-te_aldecas1	mapflag	skill_duration	HT_FLASHER,400
-te_aldecas1	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_aldecas1	mapflag	skill_duration	HT_BLASTMINE,400
-te_aldecas1	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_aldecas1	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_aldecas2	mapflag	skill_duration	HT_SKIDTRAP,400
-te_aldecas2	mapflag	skill_duration	HT_LANDMINE,400
-te_aldecas2	mapflag	skill_duration	HT_ANKLESNARE,400
-te_aldecas2	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_aldecas2	mapflag	skill_duration	HT_SANDMAN,400
-te_aldecas2	mapflag	skill_duration	HT_FLASHER,400
-te_aldecas2	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_aldecas2	mapflag	skill_duration	HT_BLASTMINE,400
-te_aldecas2	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_aldecas2	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_aldecas3	mapflag	skill_duration	HT_SKIDTRAP,400
-te_aldecas3	mapflag	skill_duration	HT_LANDMINE,400
-te_aldecas3	mapflag	skill_duration	HT_ANKLESNARE,400
-te_aldecas3	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_aldecas3	mapflag	skill_duration	HT_SANDMAN,400
-te_aldecas3	mapflag	skill_duration	HT_FLASHER,400
-te_aldecas3	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_aldecas3	mapflag	skill_duration	HT_BLASTMINE,400
-te_aldecas3	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_aldecas3	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_aldecas4	mapflag	skill_duration	HT_SKIDTRAP,400
-te_aldecas4	mapflag	skill_duration	HT_LANDMINE,400
-te_aldecas4	mapflag	skill_duration	HT_ANKLESNARE,400
-te_aldecas4	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_aldecas4	mapflag	skill_duration	HT_SANDMAN,400
-te_aldecas4	mapflag	skill_duration	HT_FLASHER,400
-te_aldecas4	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_aldecas4	mapflag	skill_duration	HT_BLASTMINE,400
-te_aldecas4	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_aldecas4	mapflag	skill_duration	HT_TALKIEBOX,400
-
-te_aldecas5	mapflag	skill_duration	HT_SKIDTRAP,400
-te_aldecas5	mapflag	skill_duration	HT_LANDMINE,400
-te_aldecas5	mapflag	skill_duration	HT_ANKLESNARE,400
-te_aldecas5	mapflag	skill_duration	HT_SHOCKWAVE,400
-te_aldecas5	mapflag	skill_duration	HT_SANDMAN,400
-te_aldecas5	mapflag	skill_duration	HT_FLASHER,400
-te_aldecas5	mapflag	skill_duration	HT_FREEZINGTRAP,400
-te_aldecas5	mapflag	skill_duration	HT_BLASTMINE,400
-te_aldecas5	mapflag	skill_duration	HT_CLAYMORETRAP,400
-te_aldecas5	mapflag	skill_duration	HT_TALKIEBOX,400
--- a/npc/re/mapflag/town.txt
+++ b/npc/re/mapflag/town.txt
@@ -1,21 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Town.
-//===== Description: ========================================= 
-//= Designates a map as a town, granting mailbox access.
-//===== Additional Comments: ================================= 
-//= 1.0 First Version. [Epoque]
-//= 1.1 Added Izlude duplicates. [Euphy]
-//============================================================
-
-dewata	mapflag	town
-dicastes01	mapflag	town
-eclage	mapflag	town
-izlude_a	mapflag	town
-izlude_b	mapflag	town
-izlude_c	mapflag	town
-izlude_d	mapflag	town
-malangdo	mapflag	town
-malaya	mapflag	town
-mora	mapflag	town
-lasagna	mapflag	town
-wolfvill	mapflag	town
--- a/npc/re/scripts_mapflags.conf
+++ b/npc/re/scripts_mapflags.conf
@@ -1,25 +1,5 @@
 // --------------------------------------------------------------
 // -                       Renewal Map Flags                    -
 // --------------------------------------------------------------
-npc: npc/re/mapflag/nopvp.txt
-npc: npc/re/mapflag/gvg.txt
-npc: npc/re/mapflag/hidemobhpbar.txt
-npc: npc/re/mapflag/nobranch.txt
-npc: npc/re/mapflag/nocostume.txt
-npc: npc/re/mapflag/noicewall.txt
-npc: npc/re/mapflag/nolockon.txt
-npc: npc/re/mapflag/nomemo.txt
-npc: npc/re/mapflag/nopenalty.txt
 npc: npc/re/mapflag/norenewalpenalty.txt
-npc: npc/re/mapflag/nosave.txt
-npc: npc/re/mapflag/noteleport.txt
-npc: npc/re/mapflag/nowarpto.txt
-//npc: npc/re/mapflag/partylock.txt
-npc: npc/re/mapflag/privateairship.txt
-npc: npc/re/mapflag/night.txt
-npc: npc/re/mapflag/restricted.txt
-npc: npc/re/mapflag/town.txt
-npc: npc/re/mapflag/reset.txt
-npc: npc/re/mapflag/skill_duration.txt
-npc: npc/re/mapflag/nodynamicnpc.txt
 npc: npc/re/mapflag/specialpopup.txt
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -1,32 +1,4 @@
 // --------------------------------------------------------------
 // -                         Map  Flags                         -
 // --------------------------------------------------------------
-npc: npc/mapflag/nopvp.txt
-npc: npc/mapflag/gvg.txt
-npc: npc/mapflag/gvg_noparty.txt
-npc: npc/mapflag/hidemobhpbar.txt
-npc: npc/mapflag/jail.txt
-npc: npc/mapflag/nightmare.txt
-npc: npc/mapflag/nobranch.txt
-npc: npc/mapflag/noicewall.txt
-npc: npc/mapflag/nomemo.txt
-npc: npc/mapflag/nopenalty.txt
-npc: npc/mapflag/nosave.txt
-npc: npc/mapflag/noteleport.txt
-npc: npc/mapflag/noreturn.txt
-npc: npc/mapflag/noskill.txt
-npc: npc/mapflag/nowarp.txt
-npc: npc/mapflag/nowarpto.txt
-//npc: npc/mapflag/partylock.txt
-npc: npc/mapflag/pvp.txt
-npc: npc/mapflag/pvp_noparty.txt
-npc: npc/mapflag/pvp_noguild.txt
-npc: npc/mapflag/night.txt
-npc: npc/mapflag/reset.txt
-npc: npc/mapflag/restricted.txt
 npc: npc/mapflag/battleground.txt
-npc: npc/mapflag/skill_damage.txt
-npc: npc/mapflag/town.txt
-npc: npc/mapflag/nocostume.txt
-npc: npc/mapflag/skill_duration.txt
-npc: npc/mapflag/nodynamicnpc.txt
--- a/src/char/char_clif.cpp
+++ b/src/char/char_clif.cpp
@@ -309,8 +309,10 @@ int chclif_parse_pincode_setnew( int fd, struct char_session_data* sd ){
 	if( charserv_config.pincode_config.pincode_enabled==0 || RFIFOL(fd,2) != sd->account_id ) {
 		set_eof(fd);
 		return 1;
-	}
-	else {
+	} else if (strnlen(sd->pincode, PINCODE_LENGTH) > 0) {
+		set_eof(fd);
+		return 1;
+	} else {
 		char newpin[PINCODE_LENGTH+1];
 		memset(newpin,0,PINCODE_LENGTH+1);
 		strncpy( newpin, RFIFOCP(fd,6), PINCODE_LENGTH );
@@ -561,7 +563,7 @@ int chclif_parse_char_delete2_req(int fd, struct char_session_data* sd) {
 			chclif_char_delete2_ack(fd, char_id, 5, 0);
 			return 1;
 		}
-		
+
 		// success
 		delete_date = time(nullptr)+(charserv_config.char_config.char_del_delay);

@@ -985,7 +987,7 @@ void chclif_accessible_maps( int fd ){
 		}else{
 			p->maps[count].status = 0;
 		}
-		
+
 		mapindex_getmapname_ext( accessible_map.map, p->maps[count].map );

 		p->packetLength += sizeof( p->maps[0] );
@@ -1527,7 +1529,7 @@ void chclif_reject(int fd, uint8 errCode){
 int chclif_parse_reqcaptcha(int fd){
 	//FIFOSD_CHECK(8)
 	RFIFOSKIP(fd,8);
-	chclif_ack_captcha(fd); 
+	chclif_ack_captcha(fd);
 	return 1;
 }

--- a/src/common/utilities.hpp
+++ b/src/common/utilities.hpp
@@ -96,6 +96,16 @@ namespace rathena {
 			map.erase(it, map.end());
 		}

+		/**
+		 * Determine if a value exists in the unordered_map
+		 * @param map: Unordered Map to search through
+		 * @param key: Key wanted
+		 * @return True on success or false on failure
+		 */
+		template <typename K, typename V> bool umap_exists(std::unordered_map<K, V> &map, K key) {
+			return map.find(key) != map.end();
+		}
+
 		/**
 		 * Find a key-value pair and return the key value as a reference
 		 * @param map: Unordered Map to search through
@@ -220,8 +230,9 @@ namespace rathena {
 		 * This will only erase the first occurrence of the value
 		 * @param vector: Vector to erase value from
 		 * @param value: Value to remove
+		 * @return True on removal or false otherwise
 		 */
-		template <typename K, typename V> void vector_erase_if_exists(std::vector<K> &vector, V value) {
+		template <typename K, typename V> bool vector_erase_if_exists(std::vector<K> &vector, V value) {
 			auto it = std::find(vector.begin(), vector.end(), value);

 			if (it != vector.end()) {
@@ -230,7 +241,11 @@ namespace rathena {
 					vector.shrink_to_fit();
 				} else
 					vector.erase(it);
+
+				return true;
 			}
+
+			return false;
 		}

 #if __has_builtin( __builtin_add_overflow ) || ( defined( __GNUC__ ) && !defined( __clang__ ) && defined( GCC_VERSION  ) && GCC_VERSION >= 50100 )
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -1869,6 +1869,7 @@ ACMD_FUNC(gvgoff)
 	}

 	map_setmapflag(sd->bl.m, MF_GVG, false);
+
 	clif_displaymessage(fd, msg_txt(sd,33)); // GvG: Off.

 	return 0;
@@ -1887,6 +1888,7 @@ ACMD_FUNC(gvgon)
 	}

 	map_setmapflag(sd->bl.m, MF_GVG, true);
+
 	clif_displaymessage(fd, msg_txt(sd,34)); // GvG: On.

 	return 0;
@@ -3237,7 +3239,7 @@ ACMD_FUNC(petfriendly) {
 	}

 	pet_set_intimate(pd, friendly);
-	clif_send_petstatus( *sd, *pd );
+	clif_send_petstatus(sd);
 	clif_displaymessage(fd, msg_txt(sd,182)); // Pet intimacy changed.
 	return 0;
 }
@@ -3271,7 +3273,7 @@ ACMD_FUNC(pethungry)
 	}

 	pd->pet.hungry = hungry;
-	clif_send_petstatus( *sd, *pd );
+	clif_send_petstatus(sd);
 	clif_displaymessage(fd, msg_txt(sd,185)); // Pet hunger changed.

 	return 0;
@@ -3296,7 +3298,7 @@ ACMD_FUNC(petrename)

 	pd->pet.rename_flag = 0;
 	intif_save_petdata(sd->status.account_id, &pd->pet);
-	clif_send_petstatus( *sd, *pd );
+	clif_send_petstatus(sd);
 	clif_displaymessage(fd, msg_txt(sd,187)); // You can now rename your pet.

 	return 0;
@@ -3792,7 +3794,7 @@ ACMD_FUNC(lostskill)

 	sd->status.skill[sk_idx].lv = 0;
 	sd->status.skill[sk_idx].flag = SKILL_FLAG_PERMANENT;
-	clif_deleteskill(sd,skill_id);
+	clif_deleteskill(*sd,skill_id);
 	clif_displaymessage(fd, msg_txt(sd,71)); // You have forgotten the skill.

 	return 0;
@@ -4378,6 +4380,9 @@ ACMD_FUNC(reload) {
 	} else if (strstr(command, "logconf") || strncmp(message, "logconf", 3) == 0) {
 		log_config_read(LOG_CONF_NAME);
 		clif_displaymessage(fd, msg_txt(sd,1536)); // Log configuration has been reloaded.
+	} else if (strstr(command, "zonedb") || strncmp(message, "zonedb", 4) == 0) {
+		map_zone_db.reload();
+		clif_displaymessage(fd, msg_txt(sd, 834)); // Map Zone database has been reloaded.
 	}

 	return 0;
@@ -4467,23 +4472,22 @@ ACMD_FUNC(mapinfo) {

 	struct map_data *mapdata = map_getmapdata(m_id);

-	sprintf(atcmd_output, msg_txt(sd,1040), mapname, mapdata->users, mapdata->npc_num, chat_num, vend_num); // Map: %s | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
-	clif_displaymessage(fd, atcmd_output);
-	clif_displaymessage(fd, msg_txt(sd,1041)); // ------ Map Flags ------
-	if (map_getmapflag(m_id, MF_TOWN))
-		clif_displaymessage(fd, msg_txt(sd,1042)); // Town Map
-	if (map_getmapflag(m_id, MF_RESTRICTED)){
-		sprintf(atcmd_output, " Restricted (zone %d)",mapdata->zone);
-		clif_displaymessage(fd, atcmd_output);
+	if (mapdata == nullptr) {
+		clif_displaymessage(fd, msg_txt(sd, 1)); // Map not found.
+		return -1;
 	}

-	if (battle_config.autotrade_mapflag == map_getmapflag(m_id, MF_AUTOTRADE))
+	sprintf(atcmd_output, msg_txt(sd,1040), mapname, script_get_constant_str("MAPTYPE_", mapdata->zone->id), mapdata->users, mapdata->npc_num, chat_num, vend_num); // Map: %s (Zone: %s) | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
+	clif_displaymessage(fd, atcmd_output);
+	clif_displaymessage(fd, msg_txt(sd,1041)); // ------ Map Flags ------
+
+	if (battle_config.autotrade_mapflag == mapdata->getMapFlag(MF_AUTOTRADE))
 		clif_displaymessage(fd, msg_txt(sd,1043)); // Autotrade Enabled
 	else
 		clif_displaymessage(fd, msg_txt(sd,1044)); // Autotrade Disabled

-	if (map_getmapflag(m_id, MF_BATTLEGROUND)){
-		sprintf(atcmd_output, msg_txt(sd,1045),map_getmapflag(m_id, MF_BATTLEGROUND)); // Battlegrounds ON (type %d)
+	if (mapdata->getMapFlag(MF_BATTLEGROUND)){
+		sprintf(atcmd_output, msg_txt(sd,1045),mapdata->getMapFlag(MF_BATTLEGROUND)); // Battlegrounds ON (type %d)
 		clif_displaymessage(fd, atcmd_output);
 	}

@@ -4512,7 +4516,7 @@ ACMD_FUNC(mapinfo) {
 		}
 	}

-	if (map_getmapflag(m_id, MF_SKILL_DURATION)) {
+	if (mapdata->getMapFlag(MF_SKILL_DURATION)) {
 		clif_displaymessage(fd, msg_txt(sd, 1055)); // Skill Duration Adjustments:
 		for (const auto &it : mapdata->skill_duration) {
 			sprintf(atcmd_output, " > %s : %d%%", skill_get_name(it.first), it.second);
@@ -4520,60 +4524,73 @@ ACMD_FUNC(mapinfo) {
 		}
 	}

+	if (mapdata->getMapFlag(MF_WEAPON_DAMAGE_RATE) || mapdata->getMapFlag(MF_MAGIC_DAMAGE_RATE) || mapdata->getMapFlag(MF_MISC_DAMAGE_RATE) || mapdata->getMapFlag(MF_SHORT_DAMAGE_RATE) || mapdata->getMapFlag(MF_LONG_DAMAGE_RATE) || mapdata->getMapFlag(MF_FLEE_PENALTY)) {
+		uint16 weapon = mapdata->getMapFlag(MF_WEAPON_DAMAGE_RATE),
+			magic = mapdata->getMapFlag(MF_MAGIC_DAMAGE_RATE),
+			misc = mapdata->getMapFlag(MF_MISC_DAMAGE_RATE),
+			short_ = mapdata->getMapFlag(MF_SHORT_DAMAGE_RATE),
+			long_ = mapdata->getMapFlag(MF_LONG_DAMAGE_RATE),
+			flee = mapdata->getMapFlag(MF_FLEE_PENALTY);
+
+		clif_displaymessage(fd, msg_txt(sd, 1042)); // Battle Rate Adjustments:
+		sprintf(atcmd_output, " Weapon: %d%% | Magic: %d%% | Misc: %d%% | Short: %d%% | Long: %d%% | Flee: %d%%", weapon > 0 ? weapon : 100, magic > 0 ? magic : 100, misc > 0 ? misc : 100, short_ > 0 ? short_ : 100, long_ > 0 ? long_ : 100, flee != 0 ? flee * -1 : 0);
+		clif_displaymessage(fd, atcmd_output);
+	}
+
 	strcpy(atcmd_output,msg_txt(sd,1046)); // PvP Flags:
-	if (map_getmapflag(m_id, MF_PVP))
+	if (mapdata->getMapFlag(MF_PVP))
 		strcat(atcmd_output, " Pvp ON |");
-	if (map_getmapflag(m_id, MF_PVP_NOGUILD))
+	if (mapdata->getMapFlag(MF_PVP_NOGUILD))
 		strcat(atcmd_output, " NoGuild |");
-	if (map_getmapflag(m_id, MF_PVP_NOPARTY))
+	if (mapdata->getMapFlag(MF_PVP_NOPARTY))
 		strcat(atcmd_output, " NoParty |");
-	if (map_getmapflag(m_id, MF_PVP_NIGHTMAREDROP))
+	if (mapdata->getMapFlag(MF_PVP_NIGHTMAREDROP))
 		strcat(atcmd_output, " NightmareDrop |");
-	if (map_getmapflag(m_id, MF_PVP_NOCALCRANK))
+	if (mapdata->getMapFlag(MF_PVP_NOCALCRANK))
 		strcat(atcmd_output, " NoCalcRank |");
 	clif_displaymessage(fd, atcmd_output);

 	strcpy(atcmd_output,msg_txt(sd,1047)); // GvG Flags:
-	if (map_getmapflag(m_id, MF_GVG))
+	if (mapdata->getMapFlag(MF_GVG))
 		strcat(atcmd_output, " GvG ON |");
-	if (map_getmapflag(m_id, MF_GVG_DUNGEON))
+	if (mapdata->getMapFlag(MF_GVG_DUNGEON))
 		strcat(atcmd_output, " GvG Dungeon |");
-	if (map_getmapflag(m_id, MF_GVG_CASTLE))
+	if (mapdata->getMapFlag(MF_GVG_CASTLE))
 		strcat(atcmd_output, " GvG Castle |");
-	if (map_getmapflag(m_id, MF_GVG_TE))
+	if (mapdata->getMapFlag(MF_GVG_TE))
 		strcat(atcmd_output, " GvG TE |");
-	if (map_getmapflag(m_id, MF_GVG_TE_CASTLE))
+	if (mapdata->getMapFlag(MF_GVG_TE_CASTLE))
 		strcat(atcmd_output, " GvG TE Castle |");
-	if (map_getmapflag(m_id, MF_GVG_NOPARTY))
+	if (mapdata->getMapFlag(MF_GVG_NOPARTY))
 		strcat(atcmd_output, " NoParty |");
 	clif_displaymessage(fd, atcmd_output);

 	strcpy(atcmd_output,msg_txt(sd,1048)); // Teleport Flags:
-	if (map_getmapflag(m_id, MF_NOTELEPORT))
+	if (mapdata->getMapFlag(MF_NOTELEPORT))
 		strcat(atcmd_output, " NoTeleport |");
-	if (map_getmapflag(m_id, MF_MONSTER_NOTELEPORT))
+	if (mapdata->getMapFlag(MF_MONSTER_NOTELEPORT))
 		strcat(atcmd_output, " Monster NoTeleport |");
-	if (map_getmapflag(m_id, MF_NOWARP))
+	if (mapdata->getMapFlag(MF_NOWARP))
 		strcat(atcmd_output, " NoWarp |");
-	if (map_getmapflag(m_id, MF_NOWARPTO))
+	if (mapdata->getMapFlag(MF_NOWARPTO))
 		strcat(atcmd_output, " NoWarpTo |");
-	if (map_getmapflag(m_id, MF_NORETURN))
+	if (mapdata->getMapFlag(MF_NORETURN))
 		strcat(atcmd_output, " NoReturn |");
-	if (map_getmapflag(m_id, MF_NOGO))
+	if (mapdata->getMapFlag(MF_NOGO))
 		strcat(atcmd_output, " NoGo |"); //
-	if (map_getmapflag(m_id, MF_NOMEMO))
+	if (mapdata->getMapFlag(MF_NOMEMO))
 		strcat(atcmd_output, "  NoMemo |");
-	if (map_getmapflag(m_id, MF_PRIVATEAIRSHIP_SOURCE))
+	if (mapdata->getMapFlag(MF_PRIVATEAIRSHIP_SOURCE))
 		strcat(atcmd_output, " PrivateAirship_Source |");
-	if (map_getmapflag(m_id, MF_PRIVATEAIRSHIP_DESTINATION))
+	if (mapdata->getMapFlag(MF_PRIVATEAIRSHIP_DESTINATION))
 		strcat(atcmd_output, " PrivateAirship_Destination |");
 	clif_displaymessage(fd, atcmd_output);

 	sprintf(atcmd_output, msg_txt(sd,1065),  // No Exp Penalty: %s | No Zeny Penalty: %s
-		(map_getmapflag(m_id, MF_NOEXPPENALTY)) ? msg_txt(sd,1066) : msg_txt(sd,1067), (map_getmapflag(m_id, MF_NOZENYPENALTY)) ? msg_txt(sd,1066) : msg_txt(sd,1067)); // On / Off
+		(mapdata->getMapFlag(MF_NOEXPPENALTY)) ? msg_txt(sd,1066) : msg_txt(sd,1067), (mapdata->getMapFlag(MF_NOZENYPENALTY)) ? msg_txt(sd,1066) : msg_txt(sd,1067)); // On / Off
 	clif_displaymessage(fd, atcmd_output);

-	if (map_getmapflag(m_id, MF_NOSAVE)) {
+	if (mapdata->getMapFlag(MF_NOSAVE)) {
 		if (!mapdata->save.map)
 			clif_displaymessage(fd, msg_txt(sd,1068)); // No Save (Return to last Save Point)
 		else if (mapdata->save.x == -1 || mapdata->save.y == -1 ) {
@@ -4588,90 +4605,90 @@ ACMD_FUNC(mapinfo) {
 	}

 	strcpy(atcmd_output,msg_txt(sd,1049)); // Weather Flags:
-	if (map_getmapflag(m_id, MF_SNOW))
+	if (mapdata->getMapFlag(MF_SNOW))
 		strcat(atcmd_output, " Snow |");
-	if (map_getmapflag(m_id, MF_FOG))
+	if (mapdata->getMapFlag(MF_FOG))
 		strcat(atcmd_output, " Fog |");
-	if (map_getmapflag(m_id, MF_SAKURA))
+	if (mapdata->getMapFlag(MF_SAKURA))
 		strcat(atcmd_output, " Sakura |");
-	if (map_getmapflag(m_id, MF_CLOUDS))
+	if (mapdata->getMapFlag(MF_CLOUDS))
 		strcat(atcmd_output, " Clouds |");
-	if (map_getmapflag(m_id, MF_CLOUDS2))
+	if (mapdata->getMapFlag(MF_CLOUDS2))
 		strcat(atcmd_output, "  Clouds2 |");
-	if (map_getmapflag(m_id, MF_FIREWORKS))
+	if (mapdata->getMapFlag(MF_FIREWORKS))
 		strcat(atcmd_output, " Fireworks |");
-	if (map_getmapflag(m_id, MF_LEAVES))
+	if (mapdata->getMapFlag(MF_LEAVES))
 		strcat(atcmd_output, "  Leaves |");
-	if (map_getmapflag(m_id, MF_NIGHTENABLED))
+	if (mapdata->getMapFlag(MF_NIGHTENABLED))
 		strcat(atcmd_output, "  Displays Night |");
 	clif_displaymessage(fd, atcmd_output);

 	strcpy(atcmd_output,msg_txt(sd,1050)); // Other Flags:
-	if (map_getmapflag(m_id, MF_NOBRANCH))
+	if (mapdata->getMapFlag(MF_NOBRANCH))
 		strcat(atcmd_output, " NoBranch |");
-	if (map_getmapflag(m_id, MF_NOTRADE))
+	if (mapdata->getMapFlag(MF_NOTRADE))
 		strcat(atcmd_output, " NoTrade |");
-	if (map_getmapflag(m_id, MF_NOVENDING))
+	if (mapdata->getMapFlag(MF_NOVENDING))
 		strcat(atcmd_output, " NoVending |");
-	if (map_getmapflag(m_id, MF_NOBUYINGSTORE))
+	if (mapdata->getMapFlag(MF_NOBUYINGSTORE))
 		strcat(atcmd_output, " NoBuyingstore |");
-	if (map_getmapflag(m_id, MF_NODROP))
+	if (mapdata->getMapFlag(MF_NODROP))
 		strcat(atcmd_output, " NoDrop |");
-	if (map_getmapflag(m_id, MF_NOSKILL))
+	if (mapdata->getMapFlag(MF_NOSKILL))
 		strcat(atcmd_output, " NoSkill |");
-	if (map_getmapflag(m_id, MF_NOICEWALL))
+	if (mapdata->getMapFlag(MF_NOICEWALL))
 		strcat(atcmd_output, " NoIcewall |");
-	if (map_getmapflag(m_id, MF_ALLOWKS))
+	if (mapdata->getMapFlag(MF_ALLOWKS))
 		strcat(atcmd_output, " AllowKS |");
-	if (map_getmapflag(m_id, MF_RESET))
+	if (mapdata->getMapFlag(MF_RESET))
 		strcat(atcmd_output, " Reset |");
-	if (map_getmapflag(m_id, MF_HIDEMOBHPBAR))
+	if (mapdata->getMapFlag(MF_HIDEMOBHPBAR))
 		strcat(atcmd_output, " HideMobHPBar |");
-	if (map_getmapflag(m_id, MF_NOCOMMAND))
+	if (mapdata->getMapFlag(MF_NOCOMMAND))
 		strcat(atcmd_output, " NoCommand |");
-	if (map_getmapflag(m_id, MF_NOBASEEXP))
+	if (mapdata->getMapFlag(MF_NOBASEEXP))
 		strcat(atcmd_output, " NoBaseEXP |");
-	if (map_getmapflag(m_id, MF_NOJOBEXP))
+	if (mapdata->getMapFlag(MF_NOJOBEXP))
 		strcat(atcmd_output, " NoJobEXP |");
-	if (map_getmapflag(m_id, MF_NOMOBLOOT))
+	if (mapdata->getMapFlag(MF_NOMOBLOOT))
 		strcat(atcmd_output, " NoMobLoot |");
-	if (map_getmapflag(m_id, MF_NOMVPLOOT))
+	if (mapdata->getMapFlag(MF_NOMVPLOOT))
 		strcat(atcmd_output, " NoMVPLoot |");
-	if (map_getmapflag(m_id, MF_NORENEWALEXPPENALTY))
+	if (mapdata->getMapFlag(MF_NORENEWALEXPPENALTY))
 		strcat(atcmd_output, " NoRenewalExpPenalty |");
-	if (map_getmapflag(m_id, MF_NORENEWALDROPPENALTY))
+	if (mapdata->getMapFlag(MF_NORENEWALDROPPENALTY))
 		strcat(atcmd_output, " NoRenewalDropPenalty |");
-	if (map_getmapflag(m_id, MF_PARTYLOCK))
+	if (mapdata->getMapFlag(MF_PARTYLOCK))
 		strcat(atcmd_output, " PartyLock |");
-	if (map_getmapflag(m_id, MF_GUILDLOCK))
+	if (mapdata->getMapFlag(MF_GUILDLOCK))
 		strcat(atcmd_output, " GuildLock |");
-	if (map_getmapflag(m_id, MF_LOADEVENT))
+	if (mapdata->getMapFlag(MF_LOADEVENT))
 		strcat(atcmd_output, " Loadevent |");
-	if (map_getmapflag(m_id, MF_NODYNAMICNPC))
+	if (mapdata->getMapFlag(MF_NODYNAMICNPC))
 		strcat(atcmd_output, " NoDynamicNPC |");
-	if (map_getmapflag(m_id, MF_NOMAPCHANNELAUTOJOIN))
+	if (mapdata->getMapFlag(MF_NOMAPCHANNELAUTOJOIN))
 		strcat(atcmd_output, " NoMapChannelAutoJoin |");
-	if (map_getmapflag(m_id, MF_NOUSECART))
+	if (mapdata->getMapFlag(MF_NOUSECART))
 		strcat(atcmd_output, " NoUsecart |");
-	if (map_getmapflag(m_id, MF_NOITEMCONSUMPTION))
+	if (mapdata->getMapFlag(MF_NOITEMCONSUMPTION))
 		strcat(atcmd_output, " NoItemConsumption |");
-	if (map_getmapflag(m_id, MF_NOSUNMOONSTARMIRACLE))
+	if (mapdata->getMapFlag(MF_NOSUNMOONSTARMIRACLE))
 		strcat(atcmd_output, " NoSunMoonStarMiracle |");
-	if (map_getmapflag(m_id, MF_FORCEMINEFFECT))
+	if (mapdata->getMapFlag(MF_FORCEMINEFFECT))
 		strcat(atcmd_output, " ForceMinEffect |");
-	if (map_getmapflag(m_id, MF_NOLOCKON))
+	if (mapdata->getMapFlag(MF_NOLOCKON))
 		strcat(atcmd_output, " NoLockOn |");
-	if (map_getmapflag(m_id, MF_NOTOMB))
+	if (mapdata->getMapFlag(MF_NOTOMB))
 		strcat(atcmd_output, " NoTomb |");
-	if (map_getmapflag(m_id, MF_NOCOSTUME))
+	if (mapdata->getMapFlag(MF_NOCOSTUME))
 		strcat(atcmd_output, " NoCostume |");
-	if (map_getmapflag(m_id, MF_NOBANK))
+	if (mapdata->getMapFlag(MF_NOBANK))
 		strcat(atcmd_output, " NoBank |");
-	if (map_getmapflag(m_id, MF_NOCASHSHOP))
+	if (mapdata->getMapFlag(MF_NOCASHSHOP))
 		strcat(atcmd_output, " NoCashShop |");
-	if (map_getmapflag(m_id, MF_NORODEX))
+	if (mapdata->getMapFlag(MF_NORODEX))
 		strcat(atcmd_output, " NoRODex |");
-	if (map_getmapflag(m_id, MF_NOPETCAPTURE))
+	if (mapdata->getMapFlag(MF_NOPETCAPTURE))
 		strcat(atcmd_output, " NoPetCapture |");
 	clif_displaymessage(fd, atcmd_output);

@@ -6313,13 +6330,13 @@ ACMD_FUNC(displayskill)
 	status_data* status = status_get_status_data(sd->bl);
 	tick = gettick();
 	if (type == 0 || type == 1)
-		clif_skill_damage( sd->bl, sd->bl, tick, status->amotion, status->dmotion, 1, 1, skill_id, skill_lv, DMG_SINGLE );
+		clif_skill_damage(&sd->bl, &sd->bl, tick, status->amotion, status->dmotion, 1, 1, skill_id, skill_lv, DMG_SINGLE);
 	if (type == 0 || type == 2)
-		clif_skill_damage( sd->bl, sd->bl, tick, status->amotion, status->dmotion, 1, 1, skill_id, skill_lv, DMG_SPLASH );
+		clif_skill_damage(&sd->bl, &sd->bl, tick, status->amotion, status->dmotion, 1, 1, skill_id, skill_lv, DMG_SPLASH);
 	if (type == 0 || type == 3)
 		clif_skill_nodamage(&sd->bl, sd->bl, skill_id, skill_lv);
 	if (type == 0 || type == 4)
-		clif_skill_poseffect( sd->bl, skill_id, skill_lv, sd->bl.x, sd->bl.y, tick );
+		clif_skill_poseffect(&sd->bl, skill_id, skill_lv, sd->bl.x, sd->bl.y, tick);
 	return 0;
 }

@@ -7449,7 +7466,7 @@ ACMD_FUNC(summon)
 	clif_specialeffect(&md->bl,EF_ENTRY2,AREA);
 	mob_spawn(md);
 	sc_start4(nullptr,&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
-	clif_skill_poseffect( sd->bl, AM_CALLHOMUN, 1, md->bl.x, md->bl.y, tick );
+	clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,md->bl.x,md->bl.y,tick);
 	clif_displaymessage(fd, msg_txt(sd,39));	// All monster summoned!

 	return 0;
@@ -8837,7 +8854,6 @@ ACMD_FUNC(mapflag) {
 		if( mapflag != MF_INVALID ){
 			std::vector<e_mapflag> disabled_mf = { MF_NOSAVE,
 												MF_PVP_NIGHTMAREDROP,
-												MF_RESTRICTED,
 												MF_NOCOMMAND,
 												MF_BEXP,
 												MF_JEXP,
@@ -11165,6 +11181,7 @@ void atcommand_basecommands(void) {
 		ACMD_DEF2("reloadachievementdb",reload),
 		ACMD_DEF2("reloadattendancedb",reload),
 		ACMD_DEF2("reloadbarterdb",reload),
+		ACMD_DEF2("reloadzonedb",reload),
 		ACMD_DEF(partysharelvl),
 		ACMD_DEF(mapinfo),
 		ACMD_DEF(dye),
@@ -11636,6 +11653,13 @@ bool is_atcommand(const int fd, map_session_data* sd, const char* message, int t
 		}
 	}

+	struct map_data *mapdata = map_getmapdata(sd->bl.m);
+
+	if (mapdata->zone->isCommandDisabled(info->command, *sd)) {
+		clif_messagecolor(&sd->bl, color_table[COLOR_RED], msg_txt(sd, 833), false, SELF); // This command is disabled on this map.
+		return true;
+	}
+
 	//Attempt to use the command
 	if ( (info->func(fd, ssd, command, params) != 0) )
 	{
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -1526,6 +1526,34 @@ bool battle_status_block_damage(struct block_list *src, struct block_list *targe
 	return true;
 }

+/**
+ * Calculate any extra damage based on zone modifiers.
+ * @param bl: Block data
+ * @param damage: Damage done
+ * @param flag: Damage flag
+ * @return Modified damage
+ */
+static int64 battle_calc_zone_damage_rate(block_list &bl, int64 damage, int flag)
+{
+	map_data *mapdata = map_getmapdata(bl.m);
+
+	if (flag & BF_SKILL) { // Skills get a different reduction than non-skills. [Skotlex]
+		if (flag & BF_WEAPON)
+			damage = damage * mapdata->getMapFlag(MF_WEAPON_DAMAGE_RATE) / 100;
+		if (flag & BF_MAGIC)
+			damage = damage * mapdata->getMapFlag(MF_MAGIC_DAMAGE_RATE) / 100;
+		if (flag & BF_MISC)
+			damage = damage * mapdata->getMapFlag(MF_MISC_DAMAGE_RATE) / 100;
+	} else { // Normal attacks get reductions based on range.
+		if (flag & BF_SHORT)
+			damage = damage * mapdata->getMapFlag(MF_SHORT_DAMAGE_RATE) / 100;
+		if (flag & BF_LONG)
+			damage = damage * mapdata->getMapFlag(MF_LONG_DAMAGE_RATE) / 100;
+	}
+
+	return i64max(damage, 1);
+}
+
 /**
 * Check damage through status.
 * ATK may be MISS, BLOCKED FAIL, reduc, increase, end status.
@@ -1578,7 +1606,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 #endif
 		case SP_SOULEXPLOSION:
 			// Adjust these based on any possible PK damage rates.
-			if (battle_config.pk_mode == 1 && map_getmapflag(bl->m, MF_PVP) > 0)
+			if (battle_config.pk_mode > 0 && map_getmapflag(bl->m, MF_PVP))
 				damage = battle_calc_pk_damage(*src, *bl, damage, skill_id, flag);

 			return damage; //These skills bypass everything else.
@@ -1590,7 +1618,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 	// So can defense sphere's but what the heck is that??? [Rytech]
 	if (skill_id == SJ_NOVAEXPLOSING && !(tsc && (tsc->getSCE(SC_SAFETYWALL) || tsc->getSCE(SC_MILLENNIUMSHIELD)))) {
 		// Adjust this based on any possible PK damage rates.
-		if (battle_config.pk_mode == 1 && map_getmapflag(bl->m, MF_PVP) > 0)
+		if (battle_config.pk_mode > 0 && map_getmapflag(bl->m, MF_PVP))
 			damage = battle_calc_pk_damage(*src, *bl, damage, skill_id, flag);

 		return damage;
@@ -1982,7 +2010,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 	} //End of caster SC_ check

 	//PK damage rates
-	if (battle_config.pk_mode == 1 && map_getmapflag(bl->m, MF_PVP) > 0)
+	if (battle_config.pk_mode > 0 && map_getmapflag(bl->m, MF_PVP))
 		damage = battle_calc_pk_damage(*src, *bl, damage, skill_id, flag);

 	if(battle_config.skill_min_damage && damage > 0 && damage < div_) {
@@ -2073,22 +2101,7 @@ int64 battle_calc_bg_damage(struct block_list *src, struct block_list *bl, int64
 	if(skill_get_inf2(skill_id, INF2_IGNOREBGREDUCTION))
 		return damage; //skill that ignore bg map reduction

-	if( flag&BF_SKILL ) { //Skills get a different reduction than non-skills. [Skotlex]
-		if( flag&BF_WEAPON )
-			damage = damage * battle_config.bg_weapon_damage_rate / 100;
-		if( flag&BF_MAGIC )
-			damage = damage * battle_config.bg_magic_damage_rate / 100;
-		if(	flag&BF_MISC )
-			damage = damage * battle_config.bg_misc_damage_rate / 100;
-	} else { //Normal attacks get reductions based on range.
-		if( flag&BF_SHORT )
-			damage = damage * battle_config.bg_short_damage_rate / 100;
-		if( flag&BF_LONG )
-			damage = damage * battle_config.bg_long_damage_rate / 100;
-	}
-
-	damage = i64max(damage,1); //min 1 damage
-	return damage;
+	return i64max(battle_calc_zone_damage_rate(*bl, damage, flag), 1);
 }

 /**
@@ -2148,21 +2161,7 @@ int64 battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int64
 	if (skill_get_inf2(skill_id, INF2_IGNOREGVGREDUCTION)) //Skills with no gvg damage reduction.
 		return damage;

-	if (flag & BF_SKILL) { //Skills get a different reduction than non-skills. [Skotlex]
-		if (flag&BF_WEAPON)
-			damage = damage * battle_config.gvg_weapon_damage_rate / 100;
-		if (flag&BF_MAGIC)
-			damage = damage * battle_config.gvg_magic_damage_rate / 100;
-		if (flag&BF_MISC)
-			damage = damage * battle_config.gvg_misc_damage_rate / 100;
-	} else { //Normal attacks get reductions based on range.
-		if (flag & BF_SHORT)
-			damage = damage * battle_config.gvg_short_damage_rate / 100;
-		if (flag & BF_LONG)
-			damage = damage * battle_config.gvg_long_damage_rate / 100;
-	}
-	damage = i64max(damage,1);
-	return damage;
+	return i64max(battle_calc_zone_damage_rate(*bl, damage, flag), 1);
 }

 /**
@@ -2181,23 +2180,13 @@ int64 battle_calc_pk_damage(block_list &src, block_list &bl, int64 damage, uint1
 	if (battle_config.pk_mode == 0) // PK mode is disabled.
 		return damage;

-	if (src.type == BL_PC && bl.type == BL_PC) {
-		if (flag & BF_SKILL) { //Skills get a different reduction than non-skills. [Skotlex]
-			if (flag & BF_WEAPON)
-				damage = damage * battle_config.pk_weapon_damage_rate / 100;
-			if (flag & BF_MAGIC)
-				damage = damage * battle_config.pk_magic_damage_rate / 100;
-			if (flag & BF_MISC)
-				damage = damage * battle_config.pk_misc_damage_rate / 100;
-		} else { //Normal attacks get reductions based on range.
-			if (flag & BF_SHORT)
-				damage = damage * battle_config.pk_short_damage_rate / 100;
-			if (flag & BF_LONG)
-				damage = damage * battle_config.pk_long_damage_rate / 100;
-		}
-	}
+	if (skill_get_inf2(skill_id, INF2_IGNOREPKREDUCTION)) //Skills with no pk damage reduction.
+		return damage;

-	return i64max(damage, 1);
+	if (src.type == BL_PC && bl.type == BL_PC)
+		return i64max(battle_calc_zone_damage_rate(bl, damage, flag), 1);
+	else
+		return damage;
 }

 /**
@@ -2740,12 +2729,11 @@ static int battle_skill_damage_skill(struct block_list *src, struct block_list *

 	map_data *mapdata = map_getmapdata(src->m);

-	if ((damage->map&1 && (!mapdata->getMapFlag(MF_PVP) && !mapdata_flag_gvg2(mapdata) && !mapdata->getMapFlag(MF_BATTLEGROUND) && !mapdata->getMapFlag(MF_SKILL_DAMAGE) && !mapdata->getMapFlag(MF_RESTRICTED))) ||
+	if ((damage->map&1 && (!mapdata->getMapFlag(MF_PVP) && !mapdata_flag_gvg2(mapdata) && !mapdata->getMapFlag(MF_BATTLEGROUND) && !mapdata->getMapFlag(MF_SKILL_DAMAGE))) ||
 		(damage->map&2 && mapdata->getMapFlag(MF_PVP)) ||
 		(damage->map&4 && mapdata_flag_gvg2(mapdata)) ||
 		(damage->map&8 && mapdata->getMapFlag(MF_BATTLEGROUND)) ||
-		(damage->map&16 && mapdata->getMapFlag(MF_SKILL_DAMAGE)) ||
-		(damage->map&mapdata->zone && mapdata->getMapFlag(MF_RESTRICTED)))
+		(damage->map&16 && mapdata->getMapFlag(MF_SKILL_DAMAGE)))
 	{
 		return damage->rate[battle_skill_damage_type(target)];
 	}
@@ -7006,8 +6994,8 @@ static void battle_calc_weapon_final_atk_modifiers(struct Damage* wd, struct blo
 		rdamage = battle_calc_base_damage(target,tstatus,&tstatus->rhw,tsc,sstatus->size,0);
 		rdamage = (int64)rdamage * ratio / 100 + wd->damage * (10 + tsc->getSCE(SC_CRESCENTELBOW)->val1 * 20 / 10) / 10;
 		skill_blown(target, src, skill_get_blewcount(SR_CRESCENTELBOW_AUTOSPELL, tsc->getSCE(SC_CRESCENTELBOW)->val1), unit_getdir(src), BLOWN_NONE);
-		clif_skill_damage( *target, *src, gettick(), status_get_amotion(src), 0, rdamage,
-			1, SR_CRESCENTELBOW_AUTOSPELL, tsc->getSCE(SC_CRESCENTELBOW)->val1, DMG_SINGLE ); // This is how official does
+		clif_skill_damage(target, src, gettick(), status_get_amotion(src), 0, rdamage,
+			1, SR_CRESCENTELBOW_AUTOSPELL, tsc->getSCE(SC_CRESCENTELBOW)->val1, DMG_SINGLE); // This is how official does
 		clif_damage(*src, *target, gettick(), status_get_amotion(src)+1000, 0, rdamage/10, 1, DMG_NORMAL, 0, false);
 		battle_fix_damage(target, src, rdamage, 0, SR_CRESCENTELBOW);
 		status_damage(src, target, rdamage/10, 0, 0, 1, 0);
@@ -9507,7 +9495,7 @@ int64 battle_calc_return_damage(struct block_list* tbl, struct block_list *src,
 					int64 rd1 = i64min(damage, status_get_max_hp(tbl)) * tsc->getSCE(SC_DEATHBOUND)->val2 / 100; // Amplify damage.

 					*dmg = rd1 * 30 / 100; // Received damage = 30% of amplified damage.
-					clif_skill_damage( *src, *tbl, gettick(), status_get_amotion(src), 0, -30000, 1, RK_DEATHBOUND, tsc->getSCE(SC_DEATHBOUND)->val1, DMG_SINGLE );
+					clif_skill_damage(src, tbl, gettick(), status_get_amotion(src), 0, -30000, 1, RK_DEATHBOUND, tsc->getSCE(SC_DEATHBOUND)->val1, DMG_SINGLE);
 					skill_blown(tbl, src, skill_get_blewcount(RK_DEATHBOUND, tsc->getSCE(SC_DEATHBOUND)->val1), unit_getdir(src), BLOWN_NONE);
 					status_change_end(tbl, SC_DEATHBOUND);
 					rdamage += rd1 * 70 / 100; // Target receives 70% of the amplified damage. [Rytech]
@@ -9527,7 +9515,7 @@ int64 battle_calc_return_damage(struct block_list* tbl, struct block_list *src,
 		rdamage = battle_calc_gvg_damage(src, tbl, rdamage, skill_id, flag);
 	else if (mapdata->getMapFlag(MF_BATTLEGROUND))
 		rdamage = battle_calc_bg_damage(src, tbl, rdamage, skill_id, flag);
-	else if (mapdata->getMapFlag(MF_PVP))
+	else if (battle_config.pk_mode > 0 && mapdata->getMapFlag(MF_PVP))
 		rdamage = battle_calc_pk_damage(*src, *tbl, rdamage, skill_id, flag);

 	// Skill damage adjustment
@@ -9901,7 +9889,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 		if(sc_start4(src,src, SC_BLADESTOP, 100, sd?pc_checkskill(sd, MO_BLADESTOP):5, 0, 0, target->id, duration))
 		{	//Target locked.
 			clif_damage(*src, *target, tick, sstatus->amotion, 1, 0, 1, DMG_NORMAL, 0, false); //Display MISS.
-			clif_bladestop( *target, src->id, true );
+			clif_bladestop(target, src->id, 1);
 			sc_start4(src,target, SC_BLADESTOP, 100, skill_lv, 0, 0, src->id, duration);
 			return ATK_BLOCK;
 		}
@@ -10106,7 +10094,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 			s_elemental_data *ed = ((TBL_PC*)target)->ed;

 			if (ed) {
-				clif_skill_damage( ed->bl, *target, tick, status_get_amotion(src), 0, -30000, 1, EL_CIRCLE_OF_FIRE, tsc->getSCE(SC_CIRCLE_OF_FIRE_OPTION)->val1, DMG_SINGLE );
+				clif_skill_damage(&ed->bl, target, tick, status_get_amotion(src), 0, -30000, 1, EL_CIRCLE_OF_FIRE, tsc->getSCE(SC_CIRCLE_OF_FIRE_OPTION)->val1, DMG_SINGLE);
 				skill_attack(BF_WEAPON,&ed->bl,&ed->bl,src,EL_CIRCLE_OF_FIRE,tsc->getSCE(SC_CIRCLE_OF_FIRE_OPTION)->val1,tick,wd.flag);
 			}
 		}
@@ -11079,17 +11067,6 @@ static const struct _battle_data {
 	{ "player_cloak_check_type",            &battle_config.pc_cloak_check_type,             1,      0,      1|2|4,          },
 	{ "monster_cloak_check_type",           &battle_config.monster_cloak_check_type,        4,      0,      1|2|4,          },
 	{ "sense_type",                         &battle_config.estimation_type,                 1|2,    0,      1|2,            },
-	{ "gvg_short_attack_damage_rate",       &battle_config.gvg_short_damage_rate,           80,     0,      INT_MAX,        },
-	{ "gvg_long_attack_damage_rate",        &battle_config.gvg_long_damage_rate,            80,     0,      INT_MAX,        },
-	{ "gvg_weapon_attack_damage_rate",      &battle_config.gvg_weapon_damage_rate,          60,     0,      INT_MAX,        },
-	{ "gvg_magic_attack_damage_rate",       &battle_config.gvg_magic_damage_rate,           60,     0,      INT_MAX,        },
-	{ "gvg_misc_attack_damage_rate",        &battle_config.gvg_misc_damage_rate,            60,     0,      INT_MAX,        },
-	{ "gvg_flee_penalty",                   &battle_config.gvg_flee_penalty,                20,     0,      INT_MAX,        },
-	{ "pk_short_attack_damage_rate",        &battle_config.pk_short_damage_rate,            80,     0,      INT_MAX,        },
-	{ "pk_long_attack_damage_rate",         &battle_config.pk_long_damage_rate,             70,     0,      INT_MAX,        },
-	{ "pk_weapon_attack_damage_rate",       &battle_config.pk_weapon_damage_rate,           60,     0,      INT_MAX,        },
-	{ "pk_magic_attack_damage_rate",        &battle_config.pk_magic_damage_rate,            60,     0,      INT_MAX,        },
-	{ "pk_misc_attack_damage_rate",         &battle_config.pk_misc_damage_rate,             60,     0,      INT_MAX,        },
 	{ "mob_changetarget_byskill",           &battle_config.mob_changetarget_byskill,        0,      0,      1,              },
 	{ "attack_direction_change",            &battle_config.attack_direction_change,         BL_ALL, BL_NUL, BL_ALL,         },
 	{ "land_skill_limit",                   &battle_config.land_skill_limit,                BL_ALL, BL_NUL, BL_ALL,         },
@@ -11293,12 +11270,6 @@ static const struct _battle_data {
 	{ "npc_emotion_behavior",               &battle_config.npc_emotion_behavior,            0,      0,      1,              },
 // BattleGround Settings
 	{ "bg_update_interval",                 &battle_config.bg_update_interval,              1000,   100,    INT_MAX,        },
-	{ "bg_short_attack_damage_rate",        &battle_config.bg_short_damage_rate,            80,     0,      INT_MAX,        },
-	{ "bg_long_attack_damage_rate",         &battle_config.bg_long_damage_rate,             80,     0,      INT_MAX,        },
-	{ "bg_weapon_attack_damage_rate",       &battle_config.bg_weapon_damage_rate,           60,     0,      INT_MAX,        },
-	{ "bg_magic_attack_damage_rate",        &battle_config.bg_magic_damage_rate,            60,     0,      INT_MAX,        },
-	{ "bg_misc_attack_damage_rate",         &battle_config.bg_misc_damage_rate,             60,     0,      INT_MAX,        },
-	{ "bg_flee_penalty",                    &battle_config.bg_flee_penalty,                 20,     0,      INT_MAX,        },
 // rAthena
 	{ "max_third_parameter",				&battle_config.max_third_parameter,				135,	10,		SHRT_MAX,		},
 	{ "max_baby_third_parameter",			&battle_config.max_baby_third_parameter,		108,	10,		SHRT_MAX,		},
--- a/src/map/battle.hpp
+++ b/src/map/battle.hpp
@@ -320,17 +320,6 @@ struct Battle_Config
 	int pc_cloak_check_type;
 	int monster_cloak_check_type;
 	int estimation_type;
-	int gvg_short_damage_rate;
-	int gvg_long_damage_rate;
-	int gvg_weapon_damage_rate;
-	int gvg_magic_damage_rate;
-	int gvg_misc_damage_rate;
-	int gvg_flee_penalty;
-	int pk_short_damage_rate;
-	int pk_long_damage_rate;
-	int pk_weapon_damage_rate;
-	int pk_magic_damage_rate;
-	int pk_misc_damage_rate;
 	int mob_changetarget_byskill;
 	int attack_direction_change;
 	int land_skill_limit;
@@ -534,12 +523,6 @@ struct Battle_Config

 	// [BattleGround Settings]
 	int bg_update_interval;
-	int bg_short_damage_rate;
-	int bg_long_damage_rate;
-	int bg_weapon_damage_rate;
-	int bg_magic_damage_rate;
-	int bg_misc_damage_rate;
-	int bg_flee_penalty;

 	// rAthena
 	int max_third_parameter;
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -1065,7 +1065,7 @@ int chrif_deadopt(uint32 father_id, uint32 mother_id, uint32 child_id) {
 		sd->status.skill[idx].id = 0;
 		sd->status.skill[idx].lv = 0;
 		sd->status.skill[idx].flag = SKILL_FLAG_PERMANENT;
-		clif_deleteskill(sd,WE_CALLBABY);
+		clif_deleteskill(*sd,WE_CALLBABY);
 	}

 	if( mother_id && ( sd = map_charid2sd(mother_id) ) != nullptr && sd->status.child == child_id ) {
@@ -1073,7 +1073,7 @@ int chrif_deadopt(uint32 father_id, uint32 mother_id, uint32 child_id) {
 		sd->status.skill[idx].id = 0;
 		sd->status.skill[idx].lv = 0;
 		sd->status.skill[idx].flag = SKILL_FLAG_PERMANENT;
-		clif_deleteskill(sd,WE_CALLBABY);
+		clif_deleteskill(*sd,WE_CALLBABY);
 	}

 	return 0;
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -1741,10 +1741,8 @@ int clif_spawn( struct block_list *bl, bool walking ){
 		}
 		break;
 	case BL_PET:
-		if (vd->head_bottom) { // needed to display pet equip properly
-			pet_data* pd = BL_CAST( BL_PET, bl );
-			clif_pet_equip_area( *pd );
-		}
+		if (vd->head_bottom)
+			clif_pet_equip_area((TBL_PET*)bl); // needed to display pet equip properly
 		break;
 	}
 	return 0;
@@ -2038,10 +2036,8 @@ void clif_move( struct unit_data& ud )
 		}
 	break;
 	case BL_PET:
-		if (vd->head_bottom) { // needed to display pet equip properly
-			pet_data* pd = reinterpret_cast<pet_data*>( bl );
-			clif_pet_equip_area( *pd );
-		}
+		if (vd->head_bottom) // needed to display pet equip properly
+			clif_pet_equip_area(BL_CAST(BL_PET, bl));
 		break;
 	}

@@ -5053,10 +5049,8 @@ void clif_getareachar_unit( map_session_data* sd,struct block_list *bl ){
 		}
 		break;
 	case BL_PET:
-		if (vd->head_bottom) { // needed to display pet equip properly
-			pet_data* pd = BL_CAST( BL_PET, bl );
-			clif_pet_equip( sd, *pd );
-		}
+		if (vd->head_bottom)
+			clif_pet_equip(sd, (TBL_PET*)bl); // needed to display pet equip properly
 		break;
 	}
 }
@@ -5092,13 +5086,8 @@ static int clif_calc_walkdelay(struct block_list *bl,int delay, char type, int64
 /*========================================== [Playtester]
 * Returns hallucination damage the client displays
 *------------------------------------------*/
-static int64 clif_hallucination_damage( block_list& bl, int64 damage ){
-	status_change *sc;
-
-	if (!((sc = status_get_sc(&bl)) && sc->count && sc->getSCE(SC_HALLUCINATION) && damage)) {
-		return damage;
-	}
-
+static int clif_hallucination_damage()
+{
 	int digit = rnd() % 5 + 1;
 	switch (digit)
 	{
@@ -5142,9 +5131,15 @@ int clif_damage(block_list& src, block_list& dst, t_tick tick, int sdelay, int d
 	if (type != DMG_MULTI_HIT_CRITICAL)
 		type = clif_calc_delay(type,div,damage+damage2,ddelay);

-	damage = static_cast<int32>(clif_hallucination_damage( dst, damage ));
-	if (damage2)
-		damage2 = static_cast<int32>(clif_hallucination_damage( dst, damage2 ));
+	status_change *sc = status_get_sc(&dst);
+
+	if(sc && sc->count) {
+		if(sc->getSCE(SC_HALLUCINATION)) {
+			damage = clif_hallucination_damage();
+			if(damage2)
+				damage2 = clif_hallucination_damage();
+		}
+	}

 	// Calculate what sdelay to send to the client so it applies damage at the same time as the server
 	if (battle_config.synchronize_damage && src.type == BL_MOB) {
@@ -5703,28 +5698,26 @@ void clif_addskill(map_session_data *sd, int skill_id)
 }


-/// Deletes a skill from the skill tree (ZC_SKILLINFO_DELETE).
-/// 0441 <skill id>.W
-void clif_deleteskill(map_session_data *sd, int skill_id, bool skip_infoblock)
-{
-#if PACKETVER >= 20081217
-	nullpo_retv(sd);
-
-	int fd = sd->fd;
+/// Deletes a skill from the skill tree.
+/// 0441 <skill id>.W (ZC_SKILLINFO_DELETE)
+void clif_deleteskill(map_session_data& sd, uint16 skill_id, bool skip_infoblock){
+#if PACKETVER >= 20081126
 	uint16 idx = skill_get_index(skill_id);

-	if (!session_isActive(fd) || !idx)
+	if (idx == 0)
 		return;

-	WFIFOHEAD(fd,packet_len(0x441));
-	WFIFOW(fd,0) = 0x441;
-	WFIFOW(fd,2) = skill_id;
-	WFIFOSET(fd,packet_len(0x441));
+	PACKET_ZC_SKILLINFO_DELETE p{};
+
+	p.packetType = HEADER_ZC_SKILLINFO_DELETE;
+	p.skillID = skill_id;
+
+	clif_send(&p,sizeof(p),&sd.bl,SELF);
 #endif
 #if PACKETVER_MAIN_NUM >= 20190807 || PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190918
 	if (!skip_infoblock)
 #endif
-		clif_skillinfoblock(sd);
+		clif_skillinfoblock(&sd);
 }

 /// Updates a skill in the skill tree (ZC_SKILLINFO_UPDATE).
@@ -5928,61 +5921,96 @@ void clif_skill_cooldown( map_session_data &sd, uint16 skill_id, t_tick tick ){
 /// Skill attack effect and damage.
 /// 0114 <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.W <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL)
 /// 01de <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.L <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL2)
-int clif_skill_damage( block_list& src, block_list& dst, t_tick tick, int32 sdelay, int32 ddelay, int64 sdamage, int32 div, uint16 skill_id, uint16 skill_lv, e_damage_type type ){
-	type = clif_calc_delay( type, div, sdamage, ddelay );
-	sdamage = clif_hallucination_damage( dst, sdamage );
+int clif_skill_damage(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int64 sdamage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type)
+{
+	unsigned char buf[64];
+	status_change *sc;
+	int damage = (int)cap_value(sdamage,INT_MIN,INT_MAX);

-	PACKET_ZC_NOTIFY_SKILL packet{};
+	nullpo_ret(src);
+	nullpo_ret(dst);

-	packet.PacketType = HEADER_ZC_NOTIFY_SKILL;
-	packet.SKID = skill_id;
-	packet.AID = src.id;
-	packet.targetID = dst.id;
-	packet.startTime = client_tick( tick );
-	packet.attackMT = sdelay;
-	packet.attackedMT = ddelay;
+	type = clif_calc_delay(type,div,damage,ddelay);

-	auto damage = std::min( static_cast<decltype(packet.damage)>( sdamage ), std::numeric_limits<decltype(packet.damage)>::max() );
-
-	if (battle_config.hide_woe_damage && map_flag_gvg(src.m)) {
-		packet.damage = static_cast<decltype(packet.damage)>(damage ? div : 0);
-	} else {
-		packet.damage = damage;
+	if( ( sc = status_get_sc(dst) ) && sc->count ) {
+		if(sc->getSCE(SC_HALLUCINATION) && damage)
+			damage = clif_hallucination_damage();
 	}
-	packet.level = skill_lv;
-	packet.count = static_cast<decltype(packet.count)>(div);

+#if PACKETVER < 3
+	WBUFW(buf,0)=0x114;
+	WBUFW(buf,2)=skill_id;
+	WBUFL(buf,4)=src->id;
+	WBUFL(buf,8)=dst->id;
+	WBUFL(buf,12)=client_tick(tick);
+	WBUFL(buf,16)=sdelay;
+	WBUFL(buf,20)=ddelay;
+	if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
+		WBUFW(buf,24)=damage?div:0;
+	} else {
+		WBUFW(buf,24)=damage;
+	}
+	WBUFW(buf,26)=skill_lv;
+	WBUFW(buf,28)=div;
+	WBUFB(buf,30)=type;
+	if (disguised(dst)) {
+		clif_send(buf,packet_len(0x114),dst,AREA_WOS);
+		WBUFL(buf,8)=disguised_bl_id(dst->id);
+		clif_send(buf,packet_len(0x114),dst,SELF);
+	} else
+		clif_send(buf,packet_len(0x114),dst,AREA);
+
+	if(disguised(src)) {
+		WBUFL(buf,4)=disguised_bl_id(src->id);
+		if (disguised(dst))
+			WBUFL(buf,8)=dst->id;
+		if(damage > 0)
+			WBUFW(buf,24)=-1;
+		clif_send(buf,packet_len(0x114),src,SELF);
+	}
+#else
+	WBUFW(buf,0)=0x1de;
+	WBUFW(buf,2)=skill_id;
+	WBUFL(buf,4)=src->id;
+	WBUFL(buf,8)=dst->id;
+	WBUFL(buf,12)=client_tick(tick);
+	WBUFL(buf,16)=sdelay;
+	WBUFL(buf,20)=ddelay;
+	if (battle_config.hide_woe_damage && map_flag_gvg(src->m)) {
+		WBUFL(buf,24)=damage?div:0;
+	} else {
+		WBUFL(buf,24)=damage;
+	}
+	WBUFW(buf,28)=skill_lv;
+	WBUFW(buf,30)=div;
 	// For some reason, late 2013 and newer clients have
 	// a issue that causes players and monsters to endure
 	// type 6 (ACTION_SKILL) skills. So we have to do a small
 	// hack to set all type 6 to be sent as type 8 ACTION_ATTACK_MULTIPLE
 #if PACKETVER < 20131223
-	packet.action = static_cast<decltype(packet.action)>(type);
+	WBUFB(buf,32)=type;
 #else
-	packet.action = static_cast<decltype(packet.action)>(( type == DMG_SINGLE ) ? DMG_MULTI_HIT : type);
+	WBUFB(buf,32)=( type == DMG_SINGLE ) ? DMG_MULTI_HIT : type;
+#endif
+	if (disguised(dst)) {
+		clif_send(buf,packet_len(0x1de),dst,AREA_WOS);
+		WBUFL(buf,8)=disguised_bl_id(dst->id);
+		clif_send(buf,packet_len(0x1de),dst,SELF);
+	} else
+		clif_send(buf,packet_len(0x1de),dst,AREA);
+
+	if(disguised(src)) {
+		WBUFL(buf,4)=disguised_bl_id(src->id);
+		if (disguised(dst))
+			WBUFL(buf,8)=dst->id;
+		if(damage > 0)
+			WBUFL(buf,24)=-1;
+		clif_send(buf,packet_len(0x1de),src,SELF);
+	}
 #endif

-	if (disguised(&dst)) {
-		clif_send( &packet, sizeof( packet ), &dst, AREA_WOS );
-		packet.targetID = disguised_bl_id( dst.id );
-		clif_send( &packet, sizeof( packet ), &dst, SELF );
-	} else {
-		clif_send( &packet, sizeof( packet ), &dst, AREA );
-	}
-	
-	if (disguised(&src)) {
-		packet.AID = disguised_bl_id( src.id );
-		if (disguised(&dst)) {
-			packet.targetID = dst.id;
-		}
-		if (damage > 0) {
-			packet.damage = -1;
-		}
-		clif_send( &packet, sizeof( packet ), &src, SELF );
-	}
-
 	//Because the damage delay must be synced with the client, here is where the can-walk tick must be updated. [Skotlex]
-	return clif_calc_walkdelay( &dst, ddelay, type, damage, div );
+	return clif_calc_walkdelay(dst,ddelay,type,damage,div);
 }


@@ -5992,14 +6020,19 @@ int clif_skill_damage( block_list& src, block_list& dst, t_tick tick, int32 sdel
 int clif_skill_damage2(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int damage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type)
 {
 	unsigned char buf[64];
+	status_change *sc;

 	nullpo_ret(src);
 	nullpo_ret(dst);

 	type = (type>DMG_NORMAL)?type:skill_get_hit(skill_id);
 	type = clif_calc_delay(type,div,damage,ddelay);
+	sc = status_get_sc(dst);

-	damage = clif_hallucination_damage( *dst, damage );
+	if(sc && sc->count) {
+		if(sc->getSCE(SC_HALLUCINATION) && damage)
+			damage = clif_hallucination_damage();
+	}

 	WBUFW(buf,0)=0x115;
 	WBUFW(buf,2)=skill_id;
@@ -6075,27 +6108,28 @@ bool clif_skill_nodamage( block_list* src, block_list& dst, uint16 skill_id, int
 	return success;
 }

-/// Non-damaging ground skill effect.
-/// 0117 <skill id>.W <src id>.L <level>.W <x>.W <y>.W <tick>.L (ZC_NOTIFY_GROUNDSKILL)
-void clif_skill_poseffect( block_list& bl, uint16 skill_id, uint16 skill_lv, int32 x, int32 y, t_tick tick ){
-	PACKET_ZC_NOTIFY_GROUNDSKILL packet{};

-	packet.PacketType = HEADER_ZC_NOTIFY_GROUNDSKILL;
-	packet.SKID = skill_id;
-	packet.AID = bl.id;
-	packet.level = skill_lv;
-	packet.xPos = static_cast<decltype(packet.xPos)>( x );
-	packet.yPos = static_cast<decltype(packet.yPos)>( y );
-	packet.startTime = client_tick( tick );
+/// Non-damaging ground skill effect (ZC_NOTIFY_GROUNDSKILL).
+/// 0117 <skill id>.W <src id>.L <level>.W <x>.W <y>.W <tick>.L
+void clif_skill_poseffect(struct block_list *src,uint16 skill_id,int val,int x,int y,t_tick tick)
+{
+	unsigned char buf[32];

-	if (disguised(&bl)) {
-		clif_send( &packet, sizeof( packet ), &bl, AREA_WOS );
-		
-		packet.AID = disguised_bl_id( bl.id );
-		clif_send( &packet, sizeof( packet ), &bl, SELF );
-	} else {
-		clif_send( &packet, sizeof( packet ), &bl, AREA );
-	}
+	nullpo_retv(src);
+
+	WBUFW(buf,0)=0x117;
+	WBUFW(buf,2)=skill_id;
+	WBUFL(buf,4)=src->id;
+	WBUFW(buf,8)=val;
+	WBUFW(buf,10)=x;
+	WBUFW(buf,12)=y;
+	WBUFL(buf,14)=client_tick(tick);
+	if(disguised(src)) {
+		clif_send(buf,packet_len(0x117),src,AREA_WOS);
+		WBUFL(buf,4)=disguised_bl_id(src->id);
+		clif_send(buf,packet_len(0x117),src,SELF);
+	} else
+		clif_send(buf,packet_len(0x117),src,AREA);
 }

 /// Presents a list of available warp destinations.
@@ -6205,33 +6239,38 @@ void clif_skill_teleportmessage( map_session_data& sd, e_notify_mapinfo_result r
 }


-/// Displays Sense (WZ_ESTIMATION) information window.
+/// Displays Sense (WZ_ESTIMATION) information window (ZC_MONSTER_INFO).
 /// 018c <class>.W <level>.W <size>.W <hp>.L <def>.W <race>.W <mdef>.W <element>.W
-///     <water%>.B <earth%>.B <fire%>.B <wind%>.B <poison%>.B <holy%>.B <shadow%>.B <ghost%>.B <undead%>.B (ZC_MONSTER_INFO)
-void clif_skill_estimation( map_session_data& sd, mob_data& md ){
-	PACKET_ZC_MONSTER_INFO packet{};
+///     <water%>.B <earth%>.B <fire%>.B <wind%>.B <poison%>.B <holy%>.B <shadow%>.B <ghost%>.B <undead%>.B
+void clif_skill_estimation(map_session_data *sd,struct block_list *dst)
+{
+	unsigned char buf[64];
+	int i, fix;

-	packet.packetType = HEADER_ZC_MONSTER_INFO;
-	packet.class_ = md.vd->class_;
-	packet.level = static_cast<decltype(packet.level)>( md.level );
-	packet.size = md.status.size;
-	packet.hp = md.status.hp;
-	packet.def = static_cast<decltype(packet.def)>( ((battle_config.estimation_type&1) ? md.status.def : 0 ) + ((battle_config.estimation_type&2) ? md.status.def2 : 0 ) );
-	packet.race = md.status.race;
-	packet.mdef = static_cast<decltype(packet.mdef)>( ((battle_config.estimation_type&1) ? md.status.mdef : 0 ) + ((battle_config.estimation_type&2) ? md.status.mdef2 : 0 ) );
-	packet.element = md.status.def_ele;
-	// The following caps negative attributes to 0 since the client displays them as 255-fix. [Skotlex]
-	packet.water = static_cast<decltype(packet.water)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 1, md.status.def_ele), (int16)0 ) );
-	packet.earth = static_cast<decltype(packet.earth)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 2, md.status.def_ele), (int16)0 ) );
-	packet.fire = static_cast<decltype(packet.fire)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 3, md.status.def_ele), (int16)0 ) );
-	packet.wind = static_cast<decltype(packet.wind)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 4, md.status.def_ele), (int16)0 ) );
-	packet.poison = static_cast<decltype(packet.poison)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 5, md.status.def_ele), (int16)0 ) );
-	packet.holy = static_cast<decltype(packet.holy)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 6, md.status.def_ele), (int16)0 ) );
-	packet.shadow = static_cast<decltype(packet.shadow)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 7, md.status.def_ele), (int16)0 ) );
-	packet.ghost = static_cast<decltype(packet.ghost)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 8, md.status.def_ele), (int16)0 ) );
-	packet.undead = static_cast<decltype(packet.undead)>( std::max( elemental_attribute_db.getAttribute(md.status.ele_lv, 9, md.status.def_ele), (int16)0 ) );
+	nullpo_retv(sd);
+	nullpo_retv(dst);

-	clif_send( &packet, sizeof( packet ), &sd.bl, (sd.status.party_id > 0) ? PARTY_SAMEMAP : SELF );
+	if( dst->type != BL_MOB )
+		return;
+
+	status_data* status = status_get_status_data(*dst);
+
+	WBUFW(buf, 0)=0x18c;
+	WBUFW(buf, 2)=status_get_class(dst);
+	WBUFW(buf, 4)=status_get_lv(dst);
+	WBUFW(buf, 6)=status->size;
+	WBUFL(buf, 8)=status->hp;
+	WBUFW(buf,12)= (battle_config.estimation_type&1?status->def:0)
+		+(battle_config.estimation_type&2?status->def2:0);
+	WBUFW(buf,14)=status->race;
+	WBUFW(buf,16)= (battle_config.estimation_type&1?status->mdef:0)
+		+(battle_config.estimation_type&2?status->mdef2:0);
+	WBUFW(buf,18)= status->def_ele;
+	for(i=0;i<9;i++)
+//		The following caps negative attributes to 0 since the client displays them as 255-fix. [Skotlex]
+		WBUFB(buf,20+i)= (unsigned char)((fix=elemental_attribute_db.getAttribute(status->ele_lv, i+1, status->def_ele))<0?0:fix);
+
+	clif_send(buf,packet_len(0x18c),&sd->bl,sd->status.party_id>0?PARTY_SAMEMAP:SELF);
 }


@@ -6782,7 +6821,7 @@ void clif_map_property(struct block_list *bl, enum map_property property, enum s

 	WBUFL(buf,4) = ((mapdata->getMapFlag(MF_PVP) || (sd && sd->duel_group > 0))<<0)| // PARTY - Show attack cursor on non-party members (PvP)
 		((mapdata->getMapFlag(MF_BATTLEGROUND) || mapdata_flag_gvg2(mapdata))<<1)|// GUILD - Show attack cursor on non-guild members (GvG)
-		((mapdata->getMapFlag(MF_BATTLEGROUND) || mapdata_flag_gvg2(mapdata))<<2)|// SIEGE - Show emblem over characters heads when in GvG (WoE castle)
+		((mapdata->getMapFlag(MF_BATTLEGROUND) || mapdata->getMapFlag(MF_HIDEDAMAGE) || mapdata_flag_gvg2(mapdata))<<2)|// SIEGE - Show emblem over characters heads when in GvG (WoE castle)
 		((mapdata->getMapFlag(MF_FORCEMINEFFECT) || mapdata_flag_gvg2(mapdata))<<3)| // USE_SIMPLE_EFFECT - Forces simpler skill effects, like /mineffect command
 		((mapdata->getMapFlag(MF_NOLOCKON) || mapdata_flag_vs(mapdata) || (sd && sd->duel_group > 0))<<4)| // DISABLE_LOCKON - Only allow attacks on other players with shift key or /ns active
 		((mapdata->getMapFlag(MF_PVP))<<5)| // COUNT_PK - Show the PvP counter
@@ -6946,20 +6985,25 @@ void clif_wis_end( map_session_data& sd, e_ack_whisper result ){
 }


-/// Returns character name requested by char_id.
-/// 0194 <char id>.L <name>.24B (ZC_ACK_REQNAME_BYGID)
-/// 0af7 <flag>.W <char id>.L <name>.24B (ZC_ACK_REQNAME_BYGID)
-void clif_solved_charname( map_session_data& sd, uint32 charid, const char* name ){
-	PACKET_ZC_ACK_REQNAME_BYGID packet{};
-
-	packet.packetType = HEADER_ZC_ACK_REQNAME_BYGID;
+/// Returns character name requested by char_id (ZC_ACK_REQNAME_BYGID).
+/// 0194 <char id>.L <name>.24B
+/// 0af7 <flag>.W <char id>.L <name>.24B
+void clif_solved_charname(int fd, int charid, const char* name)
+{
 #if PACKETVER >= 20180221
-	packet.flag = name[0] ? 3 : 2;
+	WFIFOHEAD(fd,packet_len(0xaf7));
+	WFIFOW(fd,0) = 0xaf7;
+	WFIFOW(fd,2) = name[0] ? 3 : 2;
+	WFIFOL(fd,4) = charid;
+	safestrncpy(WFIFOCP(fd, 8), name, NAME_LENGTH);
+	WFIFOSET(fd,packet_len(0x0af7));
+#else
+	WFIFOHEAD(fd,packet_len(0x194));
+	WFIFOW(fd,0)=0x194;
+	WFIFOL(fd,2)=charid;
+	safestrncpy(WFIFOCP(fd,6), name, NAME_LENGTH);
+	WFIFOSET(fd,packet_len(0x194));
 #endif
-	packet.CID = charid;
-	safestrncpy( packet.name, name, NAME_LENGTH );
-
-	clif_send( &packet, sizeof( packet ), &sd.bl, SELF );
 }


@@ -8093,7 +8137,7 @@ void clif_movetoattack( map_session_data& sd, block_list& bl ){
 void clif_produceeffect(map_session_data* sd,int flag, t_itemid nameid){
 	nullpo_retv( sd );

-	clif_solved_charname( *sd, sd->status.char_id, sd->status.name );
+	clif_solved_charname( sd->fd, sd->status.char_id, sd->status.name );

 	PACKET_ZC_ACK_REQMAKINGITEM p = {};

@@ -8161,8 +8205,8 @@ void clif_sendegg(map_session_data *sd)
 }


-/// Sends a specific pet data update.
-/// 01a4 <type>.B <id>.L <data>.L (ZC_CHANGESTATE_PET)
+/// Sends a specific pet data update (ZC_CHANGESTATE_PET).
+/// 01a4 <type>.B <id>.L <data>.L
 /// type:
 ///     0 = pre-init (data = 0)
 ///     1 = intimacy (data = 0~4)
@@ -8173,53 +8217,66 @@ void clif_sendegg(map_session_data *sd)
 ///     6 = close egg selection ui and update egg in inventory (PACKETVER >= 20180704)
 ///
 /// If sd is null, the update is sent to nearby objects, otherwise it is sent only to that player.
-void clif_send_petdata( map_session_data* sd, pet_data& pd, e_changestate_pet data_type, int32 value ){
-	PACKET_ZC_CHANGESTATE_PET packet{};
+void clif_send_petdata(map_session_data* sd, struct pet_data* pd, int type, int param)
+{
+	uint8 buf[16];
+	nullpo_retv(pd);

-	packet.PacketType = HEADER_ZC_CHANGESTATE_PET;
-	packet.type = static_cast<decltype(packet.type)>( data_type );
-	packet.GID = pd.bl.id;
-	packet.data = value;
-
-	if (sd != nullptr)
-		clif_send( &packet, sizeof( packet ), &sd->bl, SELF );
+	WBUFW(buf,0) = 0x1a4;
+	WBUFB(buf,2) = type;
+	WBUFL(buf,3) = pd->bl.id;
+	WBUFL(buf,7) = param;
+	if (sd)
+		clif_send(buf, packet_len(0x1a4), &sd->bl, SELF);
 	else
-		clif_send( &packet, sizeof( packet ), &pd.bl, AREA );
+		clif_send(buf, packet_len(0x1a4), &pd->bl, AREA);
 }


-/// Pet's base data.
-/// 01a2 <name>.24B <renamed>.B <level>.W <hunger>.W <intimacy>.W <accessory id>.W <class>.W (ZC_PROPERTY_PET)
-void clif_send_petstatus( map_session_data& sd, pet_data& pd ){
-	PACKET_ZC_PROPERTY_PET packet{};
+/// Pet's base data (ZC_PROPERTY_PET).
+/// 01a2 <name>.24B <renamed>.B <level>.W <hunger>.W <intimacy>.W <accessory id>.W <class>.W
+void clif_send_petstatus(map_session_data *sd)
+{
+	int fd;
+	struct s_pet *pet;

-	packet.PacketType = HEADER_ZC_PROPERTY_PET;
-	safestrncpy( packet.szName, pd.pet.name, NAME_LENGTH );
-	packet.bModified = battle_config.pet_rename ? 0 : pd.pet.rename_flag;
-	packet.nLevel = pd.pet.level;
-	packet.nFullness = pd.pet.hungry;
-	packet.nRelationship = pd.pet.intimate;
-	packet.ITID = static_cast<decltype(packet.ITID)>( pd.pet.equip );
+	nullpo_retv(sd);
+	nullpo_retv(sd->pd);
+
+	fd=sd->fd;
+	pet = &sd->pd->pet;
+	WFIFOHEAD(fd,packet_len(0x1a2));
+	WFIFOW(fd,0)=0x1a2;
+	safestrncpy(WFIFOCP(fd,2),pet->name,NAME_LENGTH);
+	WFIFOB(fd,26)=battle_config.pet_rename?0:pet->rename_flag;
+	WFIFOW(fd,27)=pet->level;
+	WFIFOW(fd,29)=pet->hungry;
+	WFIFOW(fd,31)=pet->intimate;
+	WFIFOW(fd,33)=pet->equip;
 #if PACKETVER >= 20081126
-	packet.job = pd.pet.class_;
+	WFIFOW(fd,35)=pet->class_;
 #endif
-
-	clif_send( &packet, sizeof( packet ), &sd.bl, SELF );
+	WFIFOSET(fd,packet_len(0x1a2));
 }


-/// Notification about a pet's emotion/talk.
-/// 01aa <id>.L <data>.L (ZC_PET_ACT)
+/// Notification about a pet's emotion/talk (ZC_PET_ACT).
+/// 01aa <id>.L <data>.L
 /// data:
 ///     @see CZ_PET_ACT.
-void clif_pet_emotion( pet_data& pd, int32 param ){
-	PACKET_ZC_PET_ACT packet{};
+void clif_pet_emotion(struct pet_data *pd,int param)
+{
+	unsigned char buf[16];

-	packet.packetType = HEADER_ZC_PET_ACT;
-	packet.GID = pd.bl.id;
-	packet.data = param;
+	nullpo_retv(pd);

-	clif_send( &packet, sizeof( packet ), &pd.bl, AREA );
+	memset(buf,0,packet_len(0x1aa));
+
+	WBUFW(buf,0)=0x1aa;
+	WBUFL(buf,2)=pd->bl.id;
+	WBUFL(buf,6)=param;
+
+	clif_send(buf,packet_len(0x1aa),&pd->bl,AREA);
 }


@@ -8394,46 +8451,52 @@ void clif_spiritball( struct block_list *bl, struct block_list* target, enum sen
 	clif_send( &p, sizeof( p ), target == nullptr ? bl : target, send_target );
 }

+/// Notifies clients in area of a character's combo delay (ZC_COMBODELAY).
+/// 01d2 <account id>.L <delay>.L
+void clif_combo_delay(struct block_list *bl,t_tick wait)
+{
+	unsigned char buf[32];

-/// Notifies clients in area of a character's combo delay.
-/// 01d2 <account id>.L <delay>.L (ZC_COMBODELAY)
-void clif_combo_delay( block_list& bl, t_tick wait ){
-	PACKET_ZC_COMBODELAY packet{};
+	nullpo_retv(bl);

-	packet.packetType = HEADER_ZC_COMBODELAY;
-	packet.AID = bl.id;
-	packet.delay = client_tick( wait );
-
-	clif_send( &packet, sizeof( packet ), &bl, AREA );
+	WBUFW(buf,0)=0x1d2;
+	WBUFL(buf,2)=bl->id;
+	WBUFL(buf,6)=client_tick(wait);
+	clif_send(buf,packet_len(0x1d2),bl,AREA);
 }


-/// Notifies clients in area that a character has blade-stopped another.
-/// 01d1 <src id>.L <dst id>.L <flag>.L (ZC_BLADESTOP)
+/// Notifies clients in area that a character has blade-stopped another (ZC_BLADESTOP).
+/// 01d1 <src id>.L <dst id>.L <flag>.L
 /// flag:
 ///     0 = inactive
 ///     1 = active
-void clif_bladestop( block_list& src, uint32 target_id, bool active ){
-	PACKET_ZC_BLADESTOP packet{};
+void clif_bladestop(struct block_list *src, int dst_id, int active)
+{
+	unsigned char buf[32];

-	packet.packetType = HEADER_ZC_BLADESTOP;
-	packet.srcId = src.id;
-	packet.targetId = target_id;
-	packet.flag = active;
+	nullpo_retv(src);

-	clif_send( &packet, sizeof( packet ), &src, AREA );
+	WBUFW(buf,0)=0x1d1;
+	WBUFL(buf,2)=src->id;
+	WBUFL(buf,6)=dst_id;
+	WBUFL(buf,10)=active;
+
+	clif_send(buf,packet_len(0x1d1),src,AREA);
 }


-/// MVP effect.
-/// 010c <account id>.L (ZC_MVP)
-void clif_mvp_effect( map_session_data& sd ){
-	PACKET_ZC_MVP packet{};
+/// MVP effect (ZC_MVP).
+/// 010c <account id>.L
+void clif_mvp_effect(map_session_data *sd)
+{
+	unsigned char buf[16];

-	packet.packetType = HEADER_ZC_MVP;
-	packet.AID = sd.bl.id;
+	nullpo_retv(sd);

-	clif_send( &packet, sizeof( packet ), &sd.bl, AREA );
+	WBUFW(buf,0)=0x10c;
+	WBUFL(buf,2)=sd->bl.id;
+	clif_send(buf,packet_len(0x10c),&sd->bl,AREA);
 }


@@ -8449,36 +8512,41 @@ void clif_mvp_item( map_session_data *sd, t_itemid nameid ){
 }


-/// MVP EXP reward message.
-/// 010b <exp>.L (ZC_MVP_GETTING_SPECIAL_EXP)
-void clif_mvp_exp( map_session_data& sd, t_exp exp ){
+/// MVP EXP reward message (ZC_MVP_GETTING_SPECIAL_EXP).
+/// 010b <exp>.L
+void clif_mvp_exp(map_session_data *sd, t_exp exp) {
 #if PACKETVER >= 20131223		// Kro remove this packet [Napster]
 	if (battle_config.mvp_exp_reward_message) {
 		char e_msg[CHAT_SIZE_MAX];
-		sprintf(e_msg, msg_txt(&sd, 717), exp);
-		clif_messagecolor( &sd.bl, color_table[COLOR_CYAN], e_msg, false, SELF );		// Congratulations! You are the MVP! Your reward EXP Points are %u !!
+		sprintf(e_msg, msg_txt(sd, 717), exp);
+		clif_messagecolor(&sd->bl, color_table[COLOR_CYAN], e_msg, false, SELF);		// Congratulations! You are the MVP! Your reward EXP Points are %u !!
 	}
 #else
-	PACKET_ZC_MVP_GETTING_SPECIAL_EXP packet{};
+	int fd;

-	packet.packetType = HEADER_ZC_MVP_GETTING_SPECIAL_EXP;
-	packet.exp = std::min( static_cast<decltype(packet.exp)>( exp ), MAX_EXP );
+	nullpo_retv(sd);

-	clif_send( &packet, sizeof( packet ), &sd.bl, SELF );
+	fd = sd->fd;
+	WFIFOHEAD(fd, packet_len(0x10b));
+	WFIFOW(fd,0) = 0x10b;
+	WFIFOL(fd,2) = (uint32)u64min( exp, MAX_EXP );
+	WFIFOSET(fd, packet_len(0x10b));
 #endif
 }


-/// Dropped MVP item reward message.
-/// 010d (ZC_THROW_MVPITEM)
+/// Dropped MVP item reward message (ZC_THROW_MVPITEM).
+/// 010d
 ///
-/// "You are the MVP, but cannot obtain the reward because you are overweight."
-void clif_mvp_noitem( map_session_data& sd ){
-	PACKET_ZC_THROW_MVPITEM packet{};
+/// "You are the MVP, but cannot obtain the reward because
+///     you are overweight."
+void clif_mvp_noitem(map_session_data* sd)
+{
+	int fd = sd->fd;

-	packet.packetType = HEADER_ZC_THROW_MVPITEM;
-
-	clif_send( &packet, sizeof( packet ), &sd.bl, SELF );
+	WFIFOHEAD(fd,packet_len(0x10d));
+	WFIFOW(fd,0) = 0x10d;
+	WFIFOSET(fd,packet_len(0x10d));
 }


@@ -8803,13 +8871,14 @@ static void clif_guild_positioninfolist(map_session_data& sd){

 	for(size_t i=0;i<MAX_GUILDPOSITION;i++){
 		guild_position& gp = g->guild.position[i];
+		PACKET_ZC_POSITION_INFO_sub& position = p->posInfo[i];

-		p->posInfo[i].positionID = i;
-		p->posInfo[i].right = gp.mode;
-		p->posInfo[i].ranking = i;
-		p->posInfo[i].payRate = gp.exp_mode;
+		position.positionID = static_cast<decltype(position.positionID)>( i );
+		position.right = gp.mode;
+		position.ranking = static_cast<decltype(position.ranking)>( i );
+		position.payRate = gp.exp_mode;

-		p->PacketLength += static_cast<decltype(p->PacketLength)>( sizeof( p->posInfo[0] ) );
+		p->PacketLength += static_cast<decltype(p->PacketLength)>( sizeof( position ) );
 	}

 	clif_send(p,p->PacketLength,&sd.bl,SELF);
@@ -10639,8 +10708,8 @@ void clif_parse_LoadEndAck(int fd,map_session_data *sd)
 	struct map_data *mapdata = map_getmapdata(sd->bl.m);

 	if(battle_config.pc_invincible_time > 0) {
-		if(mapdata_flag_gvg(mapdata))
-			pc_setinvincibletimer(sd,battle_config.pc_invincible_time<<1);
+		if (mapdata->getMapFlag(MF_INVINCIBLE_TIME) > 0)
+			pc_setinvincibletimer(sd, mapdata->getMapFlag(MF_INVINCIBLE_TIME));
 		else
 			pc_setinvincibletimer(sd,battle_config.pc_invincible_time);
 	}
@@ -10701,8 +10770,8 @@ void clif_parse_LoadEndAck(int fd,map_session_data *sd)
 			if(map_addblock(&sd->pd->bl))
 				return;
 			clif_spawn(&sd->pd->bl);
-			clif_send_petdata( sd, *sd->pd, CHANGESTATEPET_INIT, 0 );
-			clif_send_petstatus( *sd, *sd->pd );
+			clif_send_petdata(sd,sd->pd,0,0);
+			clif_send_petstatus(sd);
 //			skill_unit_move(&sd->pd->bl,gettick(),1);
 		}
 	}
@@ -10777,7 +10846,7 @@ void clif_parse_LoadEndAck(int fd,map_session_data *sd)
 		}

 		if(sd->pd && sd->pd->pet.intimate > 900)
-			clif_pet_emotion( *sd->pd, (sd->pd->pet.class_ - 100)*100 + 50 + pet_hungry_val(sd->pd) );
+			clif_pet_emotion(sd->pd,(sd->pd->pet.class_ - 100)*100 + 50 + pet_hungry_val(sd->pd));

 		if(hom_is_active(sd->hd))
 			hom_init_timers(sd->hd);
@@ -10853,11 +10922,10 @@ void clif_parse_LoadEndAck(int fd,map_session_data *sd)
 			guild_notice = false; // Do not display it twice
 		}

-		if (battle_config.bg_flee_penalty != 100 || battle_config.gvg_flee_penalty != 100) {
-			struct map_data *pmap = map_getmapdata(sd->state.pmap);
+		map_data *pmap = map_getmapdata(sd->state.pmap);

-			if ((pmap != nullptr && (mapdata_flag_gvg(pmap) || pmap->getMapFlag(MF_BATTLEGROUND))) || (mapdata != nullptr && (mapdata_flag_gvg(mapdata) || mapdata->getMapFlag(MF_BATTLEGROUND))))
-				status_calc_bl(&sd->bl, { SCB_FLEE }); //Refresh flee penalty
+		if (pmap != nullptr && pmap->getMapFlag(MF_FLEE_PENALTY)) {
+			status_calc_bl(&sd->bl, { SCB_FLEE }); //Refresh flee penalty
 		}

 		if( night_flag && mapdata->getMapFlag(MF_NIGHTENABLED) )
@@ -10893,7 +10961,8 @@ void clif_parse_LoadEndAck(int fd,map_session_data *sd)
 			sd->state.hpmeter_visible = 1;
 		}

-		status_change_clear_onChangeMap(&sd->bl, &sd->sc);
+		if (mapdata->zone != nullptr)
+			mapdata->zone->clear_all_disabled_status(sd->bl);
 		map_iwall_get(sd); // Updates Walls Info on this Map to Client
 		status_calc_pc(sd, sd->state.autotrade ? SCO_FIRST : SCO_NONE); // Some conditions are map-dependent so we must recalculate

@@ -10973,7 +11042,7 @@ void clif_parse_LoadEndAck(int fd,map_session_data *sd)
 	}

 	// Trigger skill effects if you appear standing on them
-	if(!battle_config.pc_invincible_time)
+	if (sd->invincible_timer == INVALID_TIMER)
 		skill_unit_move(&sd->bl,gettick(),1);

 	pc_show_questinfo_reinit(sd);
@@ -14470,7 +14539,7 @@ void clif_parse_SelectEgg(int fd, map_session_data *sd){
 void clif_parse_SendEmotion(int fd, map_session_data *sd)
 {
 	if(sd->pd)
-		clif_pet_emotion( *sd->pd, RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]) );
+		clif_pet_emotion(sd->pd,RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]));
 }


--- a/src/map/clif.hpp
+++ b/src/map/clif.hpp
@@ -372,31 +372,37 @@ enum map_property : uint8_t

 enum e_map_type : uint8_t 
 {// clif_map_type
-	MAPTYPE_VILLAGE              = 0,
-	MAPTYPE_VILLAGE_IN           = 1,
-	MAPTYPE_FIELD                = 2,
-	MAPTYPE_DUNGEON              = 3,
-	MAPTYPE_ARENA                = 4,
-	MAPTYPE_PENALTY_FREEPKZONE   = 5,
-	MAPTYPE_NOPENALTY_FREEPKZONE = 6,
-	MAPTYPE_EVENT_GUILDWAR       = 7,
-	MAPTYPE_AGIT                 = 8,
-	MAPTYPE_DUNGEON2             = 9,
-	MAPTYPE_DUNGEON3             = 10,
-	MAPTYPE_PKSERVER             = 11,
-	MAPTYPE_PVPSERVER            = 12,
-	MAPTYPE_DENYSKILL            = 13,
-	MAPTYPE_TURBOTRACK           = 14,
-	MAPTYPE_JAIL                 = 15,
-	MAPTYPE_MONSTERTRACK         = 16,
-	MAPTYPE_PORINGBATTLE         = 17,
-	MAPTYPE_AGIT_SIEGEV15        = 18,
-	MAPTYPE_BATTLEFIELD          = 19,
-	MAPTYPE_PVP_TOURNAMENT       = 20,
-	//Map types 21 - 24 not used.
-	MAPTYPE_SIEGE_LOWLEVEL       = 25,
-	//Map types 26 - 28 remains opens for future types.
-	MAPTYPE_UNUSED               = 29,
+	MAPTYPE_VILLAGE = 0,
+	MAPTYPE_VILLAGE_IN,
+	MAPTYPE_FIELD,
+	MAPTYPE_DUNGEON,
+	MAPTYPE_QUEST,
+	MAPTYPE_PENALTY_FREEPKZONE,
+	MAPTYPE_NOPENALTY_FREEPKZONE,
+	MAPTYPE_EVENT_GUILDWAR,
+	MAPTYPE_AGIT,
+	MAPTYPE_DUNGEON2,
+	MAPTYPE_DUNGEON3,
+	MAPTYPE_PKSERVER,
+	MAPTYPE_PVPSERVER,
+	MAPTYPE_DENYSKILL,
+	MAPTYPE_TURBOTRACK,
+	MAPTYPE_JAIL,
+	MAPTYPE_MONSTERTRACK,
+	MAPTYPE_PORINGBATTLE,
+	MAPTYPE_AGIT_SIEGEV15,
+	MAPTYPE_BATTLEFIELD,
+	MAPTYPE_PVP_TOURNAMENT,
+	MAPTYPE_UNKNOWN_SEALED_SHRINE,
+	MAPTYPE_UNKNOWN_FRANCEPVP,
+	MAPTYPE_UNKNOWN_TOWN2,
+	MAPTYPE_UNKNOWN_TRAINING_GROUNDS,
+	MAPTYPE_SIEGE_LOWLEVEL,
+	MAPTYPE_2012_RWC_BATTLE_FIELD,
+	MAPTYPE_UNKNOWN_BOSSNIA,
+	MAPTYPE_UNKNOWN_BLOODY_BRANCH,
+	MAPTYPE_UNKNOWN_RWC,
+	MAPTYPE_UNUSED,
 };

 enum useskill_fail_cause : uint8_t 
@@ -815,16 +821,6 @@ enum e_ack_additem_to_cart : uint8 {
 	ADDITEM_TO_CART_FAIL_COUNT = 1
 };

-enum e_changestate_pet : uint8 {
-	CHANGESTATEPET_INIT = 0,
-	CHANGESTATEPET_INTIMACY = 1,
-	CHANGESTATEPET_HUNGER = 2,
-	CHANGESTATEPET_ACCESSORY = 3,
-	CHANGESTATEPET_PERFORMANCE = 4,
-	CHANGESTATEPET_HAIRSTYLE = 5,
-	CHANGESTATEPET_UPDATE_EGG = 6,
-};
-
 int clif_setip(const char* ip);
 void clif_setbindip(const char* ip);
 void clif_setport(uint16 port);
@@ -943,17 +939,17 @@ void clif_skillinfoblock(map_session_data *sd);
 void clif_skillup(map_session_data *sd, uint16 skill_id, int lv, int range, int upgradable);
 void clif_skillinfo(map_session_data *sd,int skill_id, int inf);
 void clif_addskill(map_session_data *sd, int skill_id);
-void clif_deleteskill(map_session_data *sd, int skill_id, bool skip_infoblock = false);
+void clif_deleteskill(map_session_data& sd, uint16 skill_id, bool skip_infoblock = false);

 void clif_skillcasting(struct block_list* bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, uint16 skill_lv, int property, int casttime);
 void clif_skillcastcancel( block_list& bl );
 void clif_skill_fail( map_session_data& sd, uint16 skill_id, enum useskill_fail_cause cause = USESKILL_FAIL_LEVEL, int btype = 0, t_itemid itemId = 0 );
 void clif_skill_cooldown( map_session_data &sd, uint16 skill_id, t_tick tick );
-int clif_skill_damage( block_list& src, block_list& dst, t_tick tick, int32 sdelay, int32 ddelay, int64 sdamage, int32 div, uint16 skill_id, uint16 skill_lv, e_damage_type type );
+int clif_skill_damage(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int64 sdamage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type);
 //int clif_skill_damage2(struct block_list *src,struct block_list *dst,t_tick tick,int sdelay,int ddelay,int damage,int div,uint16 skill_id,uint16 skill_lv,enum e_damage_type type);
 bool clif_skill_nodamage( block_list* src, block_list& dst, uint16 skill_id, int32 heal, bool success = true );
-void clif_skill_poseffect( block_list& bl, uint16 skill_id, uint16 skill_lv, int32 x, int32 y, t_tick tick );
-void clif_skill_estimation( map_session_data& sd, mob_data& md );
+void clif_skill_poseffect(struct block_list *src,uint16 skill_id,int val,int x,int y,t_tick tick);
+void clif_skill_estimation(map_session_data *sd,struct block_list *dst);
 void clif_skill_warppoint( map_session_data& sd, uint16 skill_id, uint16 skill_lv, std::vector<std::string>& maps );
 void clif_skill_memomessage( map_session_data& sd, e_ack_remember_warppoint_result result );
 void clif_skill_teleportmessage( map_session_data& sd, e_notify_mapinfo_result result );
@@ -974,8 +970,8 @@ void clif_spiritball( struct block_list *bl, struct block_list* target = nullptr
 void clif_soulball( map_session_data *sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
 void clif_servantball( map_session_data& sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
 void clif_abyssball( map_session_data& sd, struct block_list* target = nullptr, enum send_target send_target = AREA );
-void clif_combo_delay( block_list& bl, t_tick wait );
-void clif_bladestop( block_list& src, uint32 target_id, bool active );
+void clif_combo_delay(struct block_list *bl,t_tick wait);
+void clif_bladestop(struct block_list *src, int dst_id, int active);
 void clif_changemapcell(int fd, int16 m, int x, int y, int type, enum send_target target);

 #define clif_status_load(bl, type, flag) clif_status_change((bl), (type), (flag), 0, 0, 0, 0)
@@ -986,7 +982,7 @@ void clif_efst_status_change_sub(struct block_list *tbl, struct block_list *bl,
 void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, size_t mes_len, int gmlvl);
 void clif_wis_end( map_session_data& sd, e_ack_whisper result );

-void clif_solved_charname( map_session_data& sd, uint32 charid, const char* name );
+void clif_solved_charname(int fd, int charid, const char* name);
 void clif_name( struct block_list* src, struct block_list *bl, send_target target );
 #define clif_name_self(bl) clif_name( (bl), (bl), SELF )
 #define clif_name_area(bl) clif_name( (bl), (bl), AREA )
@@ -1014,10 +1010,10 @@ void clif_hat_effect_single( map_session_data& sd, uint16 effectId, bool enable

 void clif_item_skill(map_session_data *sd,uint16 skill_id,uint16 skill_lv);

-void clif_mvp_effect( map_session_data& sd );
+void clif_mvp_effect(map_session_data *sd);
 void clif_mvp_item(map_session_data *sd, t_itemid nameid);
-void clif_mvp_exp( map_session_data& sd, t_exp exp );
-void clif_mvp_noitem( map_session_data& sd );
+void clif_mvp_exp(map_session_data *sd, t_exp exp);
+void clif_mvp_noitem(map_session_data* sd);
 void clif_changed_dir(block_list& bl, enum send_target target);

 // vending
@@ -1124,11 +1120,12 @@ void clif_upgrademessage( map_session_data* sd, int result, t_itemid item_id );
 void clif_catch_process( map_session_data& sd );
 void clif_pet_roulette( map_session_data& sd, bool success );
 void clif_sendegg(map_session_data *sd);
-void clif_send_petstatus( map_session_data& sd, pet_data& pd );
-void clif_send_petdata( map_session_data* sd, pet_data& pd, e_changestate_pet data_type, int32 value );
-#define clif_pet_equip(sd, pd) clif_send_petdata(sd, pd, CHANGESTATEPET_ACCESSORY, (pd).vd.head_bottom)
-#define clif_pet_equip_area(pd) clif_send_petdata(nullptr, pd, CHANGESTATEPET_ACCESSORY, (pd).vd.head_bottom)
-void clif_pet_emotion( pet_data& pd, int32 param );
+void clif_send_petstatus(map_session_data *sd);
+void clif_send_petdata(map_session_data* sd, struct pet_data* pd, int type, int param);
+#define clif_pet_equip(sd, pd) clif_send_petdata(sd, pd, 3, (pd)->vd.head_bottom)
+#define clif_pet_equip_area(pd) clif_send_petdata(nullptr, pd, 3, (pd)->vd.head_bottom)
+#define clif_pet_performance(pd, param) clif_send_petdata(nullptr, pd, 4, param)
+void clif_pet_emotion(struct pet_data *pd,int param);
 void clif_pet_food( map_session_data& sd, int32 foodid, bool success );
 void clif_pet_autofeed_status(map_session_data* sd, bool force);

--- a/src/map/clif_packetdb.hpp
+++ b/src/map/clif_packetdb.hpp
@@ -118,6 +118,9 @@
 	parseable_packet(0x0108,-1,clif_parse_PartyMessage,2,4);
 	packet(0x0109,-1);
 	packet( HEADER_ZC_MVP_GETTING_ITEM, sizeof( struct PACKET_ZC_MVP_GETTING_ITEM ) );
+	packet(0x010b,6);
+	packet(0x010c,6);
+	packet(0x010d,2);
 	packet(0x010e,11);
 	packet(0x010f,-1);
 	packet( HEADER_ZC_ACK_TOUSESKILL, sizeof( PACKET_ZC_ACK_TOUSESKILL ) );
@@ -127,6 +130,7 @@
 	packet(0x0114,31);
 	packet(0x0115,35);
 	parseable_packet(0x0116,10,clif_parse_UseSkillToPos,2,4,6,8);
+	packet(0x0117,18);
 	parseable_packet(0x0118,2,clif_parse_StopAttack,0);
 	packet(0x0119,13);
 	parseable_packet(0x011b,20,clif_parse_UseSkillMap,2,4);
@@ -197,12 +201,14 @@
 	packet(0x0187,6);
 	parseable_packet(0x018a,4,clif_parse_QuitGame,2);
 	packet(0x018b,4);
+	packet(0x018c,29);
 	parseable_packet( HEADER_CZ_REQMAKINGITEM, sizeof( struct PACKET_CZ_REQMAKINGITEM ), clif_parse_ProduceMix, 0 );
 	packet( HEADER_ZC_ACK_REQMAKINGITEM, sizeof( PACKET_ZC_ACK_REQMAKINGITEM ) );
 	parseable_packet(0x0190,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10);
 	packet( HEADER_ZC_TALKBOX_CHATCONTENTS, sizeof( struct PACKET_ZC_TALKBOX_CHATCONTENTS ) );
 	packet(0x0192,24);
 	parseable_packet(0x0193,6,clif_parse_SolveCharName,2);
+	packet(0x0194,30);
 	packet( HEADER_ZC_ACK_REQNAMEALL, sizeof( struct PACKET_ZC_ACK_REQNAMEALL ) );
 	packet(0x0196,9);
 	parseable_packet(0x0197,4,clif_parse_ResetChar,2);
@@ -213,12 +219,15 @@
 	parseable_packet(0x019d,6,clif_parse_GMHide,2);
 	parseable_packet(0x019f,6,clif_parse_CatchPet,2);
 	parseable_packet(0x01a1,3,clif_parse_PetMenu,2);
+	packet(0x01a2,35);
 	packet(0x01a3,5);
+	packet(0x01a4,11);
 	parseable_packet(0x01a5,26,clif_parse_ChangePetName,2);
 	packet(0x01a6,-1);
 	parseable_packet(0x01a7,4,clif_parse_SelectEgg,2);
 	packet(0x01a8,4);
 	parseable_packet(0x01a9,6,clif_parse_SendEmotion,2);
+	packet(0x01aa,10);
 	packet(0x01ac,6);
 	packet(0x01ad,-1);
 	parseable_packet( HEADER_CZ_REQ_MAKINGARROW, sizeof( PACKET_CZ_REQ_MAKINGARROW ), clif_parse_SelectArrow, 0 );
@@ -248,6 +257,8 @@
 	parseable_packet(0x01ce,6,clif_parse_AutoSpell,2);
 	packet(0x01cf,28);
 	packet(0x01d0,8);
+	packet(0x01d1,14);
+	packet(0x01d2,10);
 	parseable_packet(0x01d5,-1,clif_parse_NpcStringInput,2,4,8);
 	packet(0x01d7,11);
 	packet(0x01d8,54);
@@ -1197,7 +1208,7 @@

 // 2008-11-26aSakexe
 #if PACKETVER >= 20081126
-	packet(0x0441,4);
+	packet(0x01a2,37);
 #endif

 // 2008-12-10aSakexe
@@ -1274,6 +1285,7 @@

 // 2008-12-17aRagexeRE
 #if PACKETVER >= 20081217
+	packet(0x01a2,37);
 #endif

 // 2008-12-17bRagexeRE
@@ -1986,6 +1998,7 @@
 // 2018-02-21aRagexeRE or 2018-02-21bRagexeRE
 #if PACKETVER >= 20180221
 	packet(0x0206,35); // ZC_FRIENDS_STATE
+	packet(0x0af7,32);
 #endif

 // 2018-03-07bRagexeRE
--- a/src/map/itemdb.cpp
+++ b/src/map/itemdb.cpp
@@ -3586,32 +3586,6 @@ void ItemGroupDatabase::loadingFinished() {
 	TypesafeYamlDatabase::loadingFinished();
 }

-/** Read item forbidden by mapflag (can't equip item)
-* Structure: <nameid>,<mode>
-*/
-static bool itemdb_read_noequip( char* str[], size_t columns, size_t current ){
-	t_itemid nameid;
-	int flag;
-
-	nameid = strtoul(str[0], nullptr, 10);
-	flag = atoi(str[1]);
-
-	std::shared_ptr<item_data> id = item_db.find(nameid);
-
-	if( id == nullptr )
-	{
-		ShowWarning("itemdb_read_noequip: Invalid item id %u.\n", nameid);
-		return false;
-	}
-
-	if (flag >= 0)
-		id->flag.no_equip |= flag;
-	else
-		id->flag.no_equip &= ~abs(flag);
-
-	return true;
-}
-
 const std::string ComboDatabase::getDefaultLocation() {
 	return std::string(db_path) + "/item_combos.yml";
 }
@@ -4257,24 +4231,19 @@ static int itemdb_read_sqldb(void) {
 	return 0;
 }

-/** Check if the item is restricted by item_noequip.txt
-* @param id Item that will be checked
-* @param m Map ID
-* @return true: can't be used; false: can be used
-*/
-bool itemdb_isNoEquip(struct item_data *id, uint16 m) {
-	if (!id->flag.no_equip)
-		return false;
-	
-	struct map_data *mapdata = map_getmapdata(m);
+/**
+ * Check if the item is restricted.
+ * @param sd: Player data
+ * @param nameid: Item that will be checked
+ * @return true: can't be used; false: can be used
+ */
+bool itemdb_isNoEquip(map_session_data &sd, t_itemid nameid) {
+	struct map_data *mapdata = map_getmapdata(sd.bl.m);

-	if ((id->flag.no_equip&1 && !mapdata_flag_vs2(mapdata)) || // Normal
-		(id->flag.no_equip&2 && mapdata->getMapFlag(MF_PVP)) || // PVP
-		(id->flag.no_equip&4 && mapdata_flag_gvg2_no_te(mapdata)) || // GVG
-		(id->flag.no_equip&8 && mapdata->getMapFlag(MF_BATTLEGROUND)) || // Battleground
-		(id->flag.no_equip&16 && mapdata_flag_gvg2_te(mapdata)) || // WOE:TE
-		(id->flag.no_equip&(mapdata->zone) && mapdata->getMapFlag(MF_RESTRICTED)) // Zone restriction
-		)
+	if (!mapdata)
+		return true;
+
+	if (mapdata->zone->isItemDisabled(nameid, sd))
 		return true;
 	return false;
 }
@@ -4702,37 +4671,10 @@ bool RandomOptionGroupDatabase::option_get_id(std::string name, uint16 &id) {
 * Read all item-related databases
 */
 static void itemdb_read(void) {
-	int i;
-	const char* dbsubpath[] = {
-		"",
-		"/" DBIMPORT,
-	};
-	
 	if (db_use_sqldbs)
 		itemdb_read_sqldb();
 	else
 		item_db.load();
-	
-	for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
-		uint8 n1 = (uint8)(strlen(db_path)+strlen(dbsubpath[i])+1);
-		uint8 n2 = (uint8)(strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1);
-		char* dbsubpath1 = (char*)aMalloc(n1+1);
-		char* dbsubpath2 = (char*)aMalloc(n2+1);
-		
-
-		if(i==0) {
-			safesnprintf(dbsubpath1,n1,"%s%s",db_path,dbsubpath[i]);
-			safesnprintf(dbsubpath2,n2,"%s/%s%s",db_path,DBPATH,dbsubpath[i]);
-		}
-		else {
-			safesnprintf(dbsubpath1,n1,"%s%s",db_path,dbsubpath[i]);
-			safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]);
-		}
-
-		sv_readdb(dbsubpath2, "item_noequip.txt",       ',', 2, 2, -1, &itemdb_read_noequip, i > 0);
-		aFree(dbsubpath1);
-		aFree(dbsubpath2);
-	}

 	random_option_db.load();
 	random_option_group.load();
--- a/src/map/itemdb.hpp
+++ b/src/map/itemdb.hpp
@@ -3438,7 +3438,7 @@ bool itemdb_isequip2(struct item_data *id);
 char itemdb_isidentified(t_itemid nameid);
 bool itemdb_isstackable2(struct item_data *id);
 #define itemdb_isstackable(nameid) itemdb_isstackable2(itemdb_search(nameid))
-bool itemdb_isNoEquip(struct item_data *id, uint16 m);
+bool itemdb_isNoEquip(map_session_data &sd, t_itemid nameid);

 bool itemdb_parse_roulette_db(void);

--- a/src/map/map-server-generator.vcxproj
+++ b/src/map/map-server-generator.vcxproj
@@ -341,11 +341,9 @@
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_combos.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_combos.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_group_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_group_db.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_noequip.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_noequip.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_randomopt_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_randomopt_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_randomopt_group.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_randomopt_group.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_reform.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_reform.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\job_noenter_map.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\job_noenter_map.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\job_stats.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\job_stats.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\laphine_synthesis.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\laphine_synthesis.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\laphine_upgrade.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\laphine_upgrade.yml')" />
@@ -354,6 +352,7 @@
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_cache.dat" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_cache.dat')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_drops.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_drops.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_index.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_index.txt')" />
+    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_zones.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_zones.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\mercenary_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mercenary_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\mob_avail.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mob_avail.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\mob_summon.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mob_summon.yml')" />
@@ -370,11 +369,9 @@
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_changematerial_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_changematerial_db.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_damage_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_damage_db.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_db.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_nocast_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_nocast_db.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_tree.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_tree.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\spellbook_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\spellbook_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\statpoint.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\statpoint.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\status_disabled.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\status_disabled.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\status.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\status.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\stylist.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\stylist.yml')" />
    <MakeDir Directories="$(SolutionDir)generated\clientside\data\luafiles514\lua files\navigation\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)generated\clientside\data\luafiles514\lua files\navigation\')" />
--- a/src/map/map-server.vcxproj
+++ b/src/map/map-server.vcxproj
@@ -347,12 +347,10 @@
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_enchant.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_enchant.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_group_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_group_db.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_noequip.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_noequip.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_packages.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_packages.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_randomopt_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_randomopt_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_randomopt_group.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_randomopt_group.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\item_reform.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\item_reform.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\job_noenter_map.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\job_noenter_map.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\job_stats.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\job_stats.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\laphine_synthesis.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\laphine_synthesis.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\laphine_upgrade.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\laphine_upgrade.yml')" />
@@ -361,6 +359,7 @@
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_cache.dat" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_cache.dat')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_drops.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_drops.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_index.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_index.txt')" />
+    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\map_zones.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\map_zones.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\mercenary_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mercenary_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\mob_avail.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mob_avail.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\mob_summon.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\mob_summon.yml')" />
@@ -377,11 +376,9 @@
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_changematerial_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_changematerial_db.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_damage_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_damage_db.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_db.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_nocast_db.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_nocast_db.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\skill_tree.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\skill_tree.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\spellbook_db.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\spellbook_db.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\statpoint.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\statpoint.yml')" />
-    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\status_disabled.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\status_disabled.txt')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\status.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\status.yml')" />
    <Copy SourceFiles="$(SolutionDir)db\import-tmpl\stylist.yml" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\stylist.yml')" />
  </Target>
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -194,6 +194,536 @@ struct s_generator_options {
 } gen_options;
 #endif

+const std::string MapZoneDatabase::getDefaultLocation() {
+	return std::string(db_path) + "/map_zones.yml";
+}
+
+/**
+ * Reads and parses an entry from map_zones.
+ * @param node: YAML node containing the entry.
+ * @return count of successfully parsed rows
+ */
+uint64 MapZoneDatabase::parseBodyNode(const ryml::NodeRef& node) {
+	std::string zone_name;
+
+	if (!this->asString(node, "Id", zone_name))
+		return 0;
+
+	std::string zone_constant = "MAPTYPE_" + zone_name;
+	int64 zone_id_const;
+
+	if (!script_get_constant(zone_constant.c_str(), &zone_id_const)) {
+		this->invalidWarning(node["Id"], "Zone %s is not valid.\n", zone_name.c_str());
+		return 0;
+	}
+
+	uint16 zone_id = static_cast<uint16>(zone_id_const);
+	std::shared_ptr<c_map_zone> zone = this->find(zone_id);
+	bool exists = zone != nullptr;
+
+	if (!exists) {
+		zone = std::make_shared<c_map_zone>();
+		zone->id = static_cast<e_map_type>(zone_id);
+	}
+
+	if (this->nodeExists(node, "DisabledCommands")) {
+		const auto &commandNode = node["DisabledCommands"];
+
+		for (const auto &it : commandNode) {
+			std::string command_name;
+			c4::from_chars(it.key(), &command_name);
+			util::tolower(command_name);
+
+			if (!atcommand_exists(command_name.c_str())) {
+				this->invalidWarning(commandNode, "Atcommand %s does not exist.\n", command_name.c_str());
+				continue;
+			}
+
+			uint16 group_lv;
+
+			if (!this->asUInt16(commandNode, command_name, group_lv))
+				continue;
+
+			if (group_lv > 100) {
+				this->invalidWarning(commandNode, "Atcommand %s's Group Level can not be above 100, capping to 100.\n", command_name.c_str());
+				group_lv = 100;
+			}
+
+			if (group_lv == 0) {
+				if (zone->disabled_commands.erase(command_name) == 0)
+					this->invalidWarning(commandNode, "Attempting to remove atcommand %s that is not part of the disabled list.\n", command_name.c_str());
+			} else
+				zone->disabled_commands[command_name] = group_lv;
+		}
+	}
+
+	if (this->nodeExists(node, "DisabledSkills")) {
+		const auto &skillNode = node["DisabledSkills"];
+
+		for (const auto &it : skillNode) {
+			std::string skill_name;
+
+			if (!this->asString(it, "Skill", skill_name))
+				return 0;
+
+			uint16 skill_id = skill_name2id(skill_name.c_str());
+
+			if (skill_id == 0) {
+				this->invalidWarning(skillNode, "Skill %s does not exist.\n", skill_name.c_str());
+				continue;
+			}
+
+			for (const auto &subBl : it) {
+				std::string bl_name;
+				c4::from_chars(subBl.key(), &bl_name);
+
+				// Skip the skill sequence key on the second loop
+				if (bl_name.compare("Skill") == 0)
+					continue;
+
+				std::string bl_name_constant = "BL_" + bl_name;
+				int64 type_const;
+
+				if (!script_get_constant(bl_name_constant.c_str(), &type_const)) {
+					this->invalidWarning(it, "Skill object %s is not a valid object type.\n", bl_name.c_str());
+					continue;
+				}
+
+				uint16 type = static_cast<uint16>(type_const);
+
+				if (type == BL_NUL) {
+					this->invalidWarning(it, "Skill %s's Object Type can not be BL_NUL, skipping.\n", bl_name.c_str());
+					continue;
+				}
+
+				if (type & BL_SKILL)
+					continue;
+
+				uint16 group_lv;
+
+				if (!this->asUInt16(it, bl_name, group_lv))
+					continue;
+
+				if (group_lv > 100) {
+					this->invalidWarning(it, "Skill %s's Group Level can not be above 100, capping to 100.\n", bl_name.c_str());
+					group_lv = 100;
+				}
+
+				if (group_lv > 0) {
+					if (util::umap_exists(zone->disabled_skills, skill_id)) {
+						zone->disabled_skills[skill_id].first |= type;
+					} else
+						zone->disabled_skills.insert({ skill_id, std::pair<uint16, uint16>(type, group_lv) });
+				} else {
+					zone->disabled_skills[skill_id].first &= ~type;
+
+					if (zone->disabled_skills[skill_id].first == BL_NUL) {
+						if (zone->disabled_skills.erase(skill_id) == 0)
+							this->invalidWarning(it, "Attempting to remove skill %s that is not part of the disabled list.\n", skill_name.c_str());
+					}
+				}
+			}
+		}
+	}
+
+	if (this->nodeExists(node, "DisabledItems")) {
+		const auto &itemNode = node["DisabledItems"];
+
+		for (const auto &it : itemNode) {
+			std::string item_name;
+			c4::from_chars(it.key(), &item_name);
+			std::shared_ptr<item_data> item = item_db.search_aegisname(item_name.c_str());
+
+			if (item == nullptr) {
+				this->invalidWarning(itemNode, "Item %s does not exist.\n", item_name.c_str());
+				continue;
+			}
+
+			uint16 group_lv;
+
+			if (!this->asUInt16(itemNode, item_name, group_lv))
+				continue;
+
+			if (group_lv > 100) {
+				this->invalidWarning(itemNode, "Item %s's Group Level can not be above 100, capping to 100.\n", item_name.c_str());
+				group_lv = 100;
+			}
+
+			if (group_lv == 0) {
+				if (zone->disabled_items.erase(item->nameid) == 0)
+					this->invalidWarning(itemNode, "Attempting to remove item %s that is not part of the disabled list.\n", item_name.c_str());
+			} else
+				zone->disabled_items[item->nameid] = group_lv;
+		}
+	}
+
+	if (this->nodeExists(node, "DisabledStatuses")) {
+		const auto &statusNode = node["DisabledStatuses"];
+
+		for (const auto &it : statusNode) {
+			std::string status_name;
+			c4::from_chars(it.key(), &status_name);
+			std::string status_name_constant = "SC_" + status_name;
+			int64 status;
+
+			if (!script_get_constant(status_name_constant.c_str(), &status)) {
+				this->invalidWarning(statusNode, "Status %s does not exist.\n", status_name.c_str());
+				continue;
+			}
+
+			uint16 group_lv;
+
+			if (!this->asUInt16(statusNode, status_name, group_lv))
+				continue;
+
+			if (group_lv > 100) {
+				this->invalidWarning(statusNode, "Status %s's Group Level can not be above 100, capping to 100.\n", status_name.c_str());
+				group_lv = 100;
+			}
+
+			if (group_lv == 0) {
+				if (zone->disabled_statuses.erase(static_cast<sc_type>(status)) == 0)
+					this->invalidWarning(statusNode, "Attempting to remove status %s that is not part of the disabled list.\n", status_name.c_str());
+			} else
+				zone->disabled_statuses[static_cast<sc_type>(status)] = group_lv;
+		}
+	}
+
+	if (this->nodeExists(node, "RestrictedJobs")) {
+		const auto &jobNode = node["RestrictedJobs"];
+
+		for (const auto &it : jobNode) {
+			std::string job_name;
+			c4::from_chars(it.key(), &job_name);
+			std::string job_name_constant = "JOB_" + job_name;
+			int64 job_id;
+
+			if (!script_get_constant(job_name_constant.c_str(), &job_id)) {
+				this->invalidWarning(jobNode, "Job %s does not exist.\n", job_name.c_str());
+				continue;
+			}
+
+			uint16 group_lv;
+
+			if (!this->asUInt16(jobNode, job_name, group_lv))
+				continue;
+
+			if (group_lv > 100) {
+				this->invalidWarning(jobNode, "Job Group Level can not be above 100, capping to 100.\n");
+				group_lv = 100;
+			}
+
+			if (group_lv == 0) {
+				if (zone->restricted_jobs.erase(static_cast<uint32>(job_id)) == 0)
+					this->invalidWarning(jobNode, "Attempting to remove job %s that is not part of the disabled list.\n", job_name.c_str());
+			} else
+				zone->restricted_jobs[static_cast<uint32>(job_id)] = group_lv;
+		}
+	}
+
+	if (this->nodeExists(node, "Maps")) {
+		const auto &mapNode = node["Maps"];
+
+		for (const auto &it : mapNode) {
+			std::string map_name;
+			c4::from_chars(it.key(), &map_name);
+			int16 map_id = map_mapname2mapid(map_name.c_str());
+
+			if (map_id < 0) {
+				this->invalidWarning(mapNode, "Map %s does not exist.\n", map_name.c_str());
+				continue;
+			}
+
+			bool enabled;
+
+			if (!this->asBool(mapNode, map_name, enabled))
+				continue;
+
+			if (enabled) {
+				if (util::vector_exists(zone->maps, map_id)) {
+					this->invalidWarning(mapNode, "Map %s is already part of this zone.\n", map_name.c_str());
+					continue;
+				}
+
+				zone->maps.push_back(map_id);
+			} else {
+				if (!util::vector_erase_if_exists(zone->maps, map_id)) {
+					this->invalidWarning(mapNode, "Map %s is not part of this zone.\n", map_name.c_str());
+					continue;
+				}
+			}
+		}
+	}
+
+	if (this->nodeExists(node, "Mapflags")) {
+		const auto &mapflagNode = node["Mapflags"];
+
+		for (const auto &it : mapflagNode) {
+			std::string flag_name;
+
+			if (!this->asString(it, "Flag", flag_name))
+				return 0;
+
+			std::string flag_name_constant = "MF_" + flag_name;
+			int64 flag;
+
+			if (!script_get_constant(flag_name_constant.c_str(), &flag)) {
+				this->invalidWarning(mapflagNode, "Mapflag %s does not exist.\n", flag_name.c_str());
+				continue;
+			}
+
+			std::string value;
+
+			if (this->nodeExists(it, "Value")) {
+				if (!this->asString(it, "Value", value))
+					continue;
+			} else
+				value = "1";
+
+			bool clear = false;
+
+			if (this->nodeExists(it, "Clear")) {
+				if (!this->asBool(it, "Clear", clear))
+					continue;
+			}
+
+			if (!clear) {
+				zone->mapflags.insert({ std::pair<int16, std::string>(static_cast<int16>(flag), value) });
+			} else {
+				// Get all mapflag keys that match
+				auto mapflagit = zone->mapflags.equal_range(static_cast<int16>(flag));
+
+				// Iterate over the mapflags to get their values
+				for (auto flag_it = mapflagit.first; flag_it != mapflagit.second; ++flag_it) {
+					// Compare parse value with what's already in memory
+					if (flag_it->second.find(value) == 0) {
+						zone->mapflags.erase(flag_it);
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (!exists)
+		this->put(zone_id, zone);
+
+	return 1;
+}
+
+/**
+ * Initialize Map Zone data
+ */
+void MapZoneDatabase::loadingFinished() {
+	// Intialization and configuration-dependent adjustments of mapflags
+	map_flags_init();
+
+	// Copy Map Zone DB data to the map.
+	// This allows for live modifications to the map without affecting the Map Zone DB.
+	for (const auto &zone : map_zone_db) {
+		for (const auto &map : zone.second->maps) {
+			if (map_zone_db.setZone(map, static_cast<e_map_type>(zone.second->id)))
+				continue;
+		}
+	}
+
+	// Check for maps with no zones
+	for (int i = 0; i < map_num; i++) {
+		if (map[i].zone == nullptr)
+			// TODO: Change to ShowWarning as soon as possible.
+			ShowNotice("MapZoneDatabase::loadingFinished: Map %s has no zone. Assigning a zone is highly encouraged.\n", map[i].name);
+	}
+}
+
+/**
+ * Set the zone to a map.
+ * @param map_id: Map ID
+ * @param zone: Zone to set
+ * @return True on success or false otherwise
+ */
+bool MapZoneDatabase::setZone(int16 map_id, e_map_type zone) {
+	map_data *mapdata = map_getmapdata(map_id);
+
+	if (mapdata == nullptr) {
+		ShowError("MapZoneDatabase::setZone: Unknown map ID %d, skipping.\n", map_id);
+		return false;
+	}
+
+	auto zonedata = this->find(zone);
+
+	if (zonedata == nullptr) {
+		ShowError("MapZoneDatabase::setZone: Unknown zone %d, skipping.\n", zone);
+		return false;
+	}
+
+	mapdata->zone = std::make_shared<c_map_zone_data>();
+	mapdata->zone->id = zonedata->id;
+	mapdata->zone->disabled_commands = zonedata->disabled_commands;
+	mapdata->zone->disabled_items = zonedata->disabled_items;
+	mapdata->zone->disabled_skills = zonedata->disabled_skills;
+	mapdata->zone->disabled_statuses = zonedata->disabled_statuses;
+	mapdata->zone->restricted_jobs = zonedata->restricted_jobs;
+
+	// Apply mapflags from Map Zone DB
+	for (const auto &flag : zonedata->mapflags) {
+		char flag_name[100], *empty = const_cast<char *>("");
+
+		if (map_getmapflag_name(static_cast<e_mapflag>(flag.first), flag_name))
+			npc_parse_mapflag(mapdata->name, empty, flag_name, const_cast<char *>(flag.second.c_str()), empty, empty, "MapZoneDatabase::setZone");
+	}
+
+	return true;
+}
+
+MapZoneDatabase map_zone_db;
+
+/**
+ * Get the zone to a map.
+ * @param map_id: Map ID
+ * @return e_map_type on success or MAPTYPE_UNUSED otherwise
+ */
+e_map_type c_map_zone_data::getMapZone(int16 map_id) {
+	map_data *mapdata = map_getmapdata(map_id);
+
+	if (mapdata == nullptr) {
+		ShowError("MapZoneDatabase::getMapZone: Unknown map ID %d, skipping.\n", map_id);
+		return MAPTYPE_UNUSED;
+	}
+
+	return mapdata->zone->id;
+}
+
+/**
+ * Check if a command is disabled on a map based on group level.
+ * @param name: Command name
+ * @param sd: Player session data
+ * @return True when command is disabled or false otherwise
+ */
+bool c_map_zone_data::isCommandDisabled(std::string name, map_session_data &sd) {
+	if (this->disabled_commands.empty())
+		return false;
+
+	auto cmd_lv = util::umap_find(this->disabled_commands, name);
+
+	if (cmd_lv == nullptr)
+		return false;
+
+	if (sd.group->level < *cmd_lv)
+		return false;
+
+	return true;
+}
+
+/**
+ * Check if a skill is disabled on a map based on group level.
+ * @param skill_id: Skill ID
+ * @param bl: Block list data
+ * @return True when skill is disabled or false otherwise
+ */
+bool c_map_zone_data::isSkillDisabled(uint16 skill_id, block_list &bl) {
+	if (this->disabled_skills.empty())
+		return false;
+
+	auto skill_lv = util::umap_find(this->disabled_skills, skill_id);
+
+	if (skill_lv == nullptr)
+		return false;
+
+	map_session_data *sd = BL_CAST(BL_PC, &bl);
+
+	if (sd == nullptr)
+		return false;
+
+	if (sd->group->level < skill_lv->second)
+		return false;
+
+	return true;
+}
+
+/**
+ * Check if an item is disabled on a map based on group level.
+ * @param nameid: Item ID
+ * @param sd: Player session data
+ * @return True when item is disabled or false otherwise
+ */
+bool c_map_zone_data::isItemDisabled(t_itemid nameid, map_session_data &sd) {
+	if (this->disabled_items.empty())
+		return false;
+
+	auto item_lv = util::umap_find(this->disabled_items, nameid);
+
+	if (item_lv == nullptr)
+		return false;
+
+	if (sd.group->level < *item_lv)
+		return false;
+
+	return true;
+}
+
+/**
+ * Check if a status is disabled on a map based on group level.
+ * @param sc: Status type
+ * @param bl: Block list data
+ * @return True when status is disabled or false otherwise
+ */
+bool c_map_zone_data::isStatusDisabled(sc_type sc, block_list &bl) {
+	if (this->disabled_statuses.empty())
+		return false;
+
+	auto status_lv = util::umap_find(this->disabled_statuses, sc);
+
+	if (status_lv == nullptr)
+		return false;
+
+	map_session_data *sd = BL_CAST(BL_PC, &bl);
+
+	if (sd == nullptr)
+		return false;
+
+	if (sd->group->level < *status_lv)
+		return false;
+
+	return true;
+}
+
+/**
+ * Check if a job is restricted on a map based on group level.
+ * @param job_id: Job ID
+ * @param group_lv: Group level
+ * @return True when job is restricted or false otherwise
+ */
+bool c_map_zone_data::isJobRestricted(int32 job_id, uint16 group_lv) {
+	if (this->restricted_jobs.empty())
+		return false;
+
+	auto job_lv = util::umap_find(this->restricted_jobs, job_id);
+
+	if (job_lv == nullptr)
+		return false;
+
+	if (group_lv < *job_lv)
+		return false;
+
+	return true;
+}
+
+/**
+ * Clear all statuses that are disabled on a map.
+ * @param bl: Block list data
+ */
+void c_map_zone_data::clear_all_disabled_status(block_list &bl) {
+	if (this->disabled_statuses.empty())
+		return;
+
+	map_session_data *sd = BL_CAST(BL_PC, &bl);
+
+	for (const auto &sc : this->disabled_statuses) {
+		if (sd == nullptr || sd->group->level < sc.second)
+			status_change_end(&bl, sc.first);
+	}
+}
+
 /**
 * Get the map data
 * @param mapid: Map ID to lookup
@@ -1979,8 +2509,8 @@ void map_addnickdb(int charid, const char* nick)
 		req = p->requests;
 		p->requests = req->next;
 		sd = map_charid2sd(req->charid);
-		if( sd != nullptr )
-			clif_solved_charname( *sd, charid, p->nick );
+		if( sd )
+			clif_solved_charname(sd->fd, charid, p->nick);
 		aFree(req);
 	}
 }
@@ -2001,8 +2531,8 @@ void map_delnickdb(int charid, const char* name)
 		req = p->requests;
 		p->requests = req->next;
 		sd = map_charid2sd(req->charid);
-		if( sd != nullptr )
-			clif_solved_charname( *sd, charid, name );
+		if( sd )
+			clif_solved_charname(sd->fd, charid, name);
 		aFree(req);
 	}
 	aFree(p);
@@ -2020,16 +2550,16 @@ void map_reqnickdb(map_session_data * sd, int charid)
 	nullpo_retv(sd);

 	tsd = map_charid2sd(charid);
-	if( tsd != nullptr )
+	if( tsd )
 	{
-		clif_solved_charname( *sd, charid, tsd->status.name );
+		clif_solved_charname(sd->fd, charid, tsd->status.name);
 		return;
 	}

 	p = (struct charid2nick*)idb_ensure(nick_db, charid, create_charid2nick);
 	if( *p->nick )
 	{
-		clif_solved_charname( *sd, charid, p->nick );
+		clif_solved_charname(sd->fd, charid, p->nick);
 		return;
 	}
 	// not in cache, request it
@@ -3651,7 +4181,7 @@ void map_flags_init(void){
 		args.flag_val = 100;

 		// additional mapflag data
-		mapdata->zone = 0; // restricted mapflag zone
+		mapdata->zone = nullptr;
 		mapdata->setMapFlag(MF_NOCOMMAND, false); // nocommand mapflag level
 		map_setmapflag_sub(i, MF_BEXP, true, &args); // per map base exp multiplicator
 		map_setmapflag_sub(i, MF_JEXP, true, &args); // per map job exp multiplicator
@@ -3664,10 +4194,6 @@ void map_flags_init(void){

 		if (instance_start && i >= instance_start)
 			continue;
-
-		// adjustments
-		if( battle_config.pk_mode && !mapdata_flag_vs2(mapdata) )
-			mapdata->setMapFlag(MF_PVP, true); // make all maps pvp for pk_mode [Valaris]
 	}
 }

@@ -3889,9 +4415,6 @@ int map_readallmaps (void)
 		mapdata->channel = nullptr;
 	}

-	// intialization and configuration-dependent adjustments of mapflags
-	map_flags_init();
-
 	if( !enable_grf ) {
 		// The cache isn't needed anymore, so free it. [Shinryo]
 		auto it = map_cache_buffer.begin();
@@ -4570,8 +5093,12 @@ int map_getmapflag_sub(int16 m, enum e_mapflag mapflag, union u_mapflag_args *ar
 	}

 	switch(mapflag) {
+		case MF_TOWN:
+			ShowWarning("MF_TOWN is not supported anymore. Please utilize the 'Village' map_zone for this mapflag.\n");
+			return -1;
 		case MF_RESTRICTED:
-			return mapdata->zone;
+			ShowWarning("MF_RESTRICTED is not supported anymore. Please utilize the map_zone database for this mapflag.\n");
+			return -1;
 		case MF_NOLOOT:
 			return mapdata->getMapFlag(MF_NOMOBLOOT) && mapdata->getMapFlag(MF_NOMVPLOOT);
 		case MF_NOPENALTY:
@@ -4620,6 +5147,12 @@ bool map_setmapflag_sub(int16 m, enum e_mapflag mapflag, bool status, union u_ma
 	}

 	switch(mapflag) {
+		case MF_TOWN:
+			ShowWarning("MF_TOWN is not supported anymore. Please utilize the 'Village' map_zone for this mapflag.\n");
+			return false;
+		case MF_RESTRICTED:
+			ShowWarning("MF_RESTRICTED is not supported anymore. Please utilize the map_zone database for this mapflag.\n");
+			return false;
 		case MF_NOSAVE:
 			if (status) {
 				nullpo_retr(false, args);
@@ -4745,25 +5278,6 @@ bool map_setmapflag_sub(int16 m, enum e_mapflag mapflag, bool status, union u_ma
 			}
 			mapdata->setMapFlag(mapflag, status);
 			break;
-		case MF_RESTRICTED:
-			if (!status) {
-				if (args == nullptr) {
-					mapdata->zone = 0;
-				} else {
-					mapdata->zone ^= (1 << (args->flag_val + 1)) << 3;
-				}
-
-				// Don't completely disable the mapflag's status if other zones are active
-				if (mapdata->zone == 0) {
-					mapdata->setMapFlag(mapflag, status);
-				}
-			} else {
-				nullpo_retr(false, args);
-
-				mapdata->zone |= (1 << (args->flag_val + 1)) << 3;
-				mapdata->setMapFlag(mapflag, status);
-			}
-			break;
 		case MF_NOCOMMAND:
 			if (status) {
 				nullpo_retr(false, args);
@@ -4864,6 +5378,37 @@ bool map_setmapflag_sub(int16 m, enum e_mapflag mapflag, bool status, union u_ma
 			}
 			mapdata->setMapFlag(mapflag, status);
 			break;
+		case MF_INVINCIBLE_TIME:
+			if (status) {
+				nullpo_retr(false, args);
+
+				// Default is 5 seconds.
+				mapdata->setMapFlag(mapflag, ((args->flag_val <= 0) ? 5000 : args->flag_val));
+			} else
+				mapdata->setMapFlag(mapflag, false);
+			break;
+		case MF_FLEE_PENALTY:
+			if (status) {
+				nullpo_retr(false, args);
+
+				// Default to 20%.
+				mapdata->setMapFlag(mapflag, ((args->flag_val <= 0) ? 20 : args->flag_val));
+			} else
+				mapdata->setMapFlag(mapflag, false);
+			break;
+		case MF_WEAPON_DAMAGE_RATE:
+		case MF_MAGIC_DAMAGE_RATE:
+		case MF_MISC_DAMAGE_RATE:
+		case MF_LONG_DAMAGE_RATE:
+		case MF_SHORT_DAMAGE_RATE:
+			if (status) {
+				nullpo_retr(false, args);
+
+				// Default to 100%.
+				mapdata->setMapFlag(mapflag, ((args->flag_val <= 0) ? 100 : args->flag_val));
+			} else
+				mapdata->setMapFlag(mapflag, false);
+			break;
 		default:
 			mapdata->setMapFlag(mapflag, status);
 			break;
@@ -5326,6 +5871,7 @@ bool MapServer::initialize( int argc, char *argv[] ){
 	do_init_quest();
 	do_init_achievement();
 	do_init_battleground();
+	map_zone_db.load(); // Initialize before script parsing
 	do_init_npc();
 	do_init_unit();
 	do_init_duel();
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -6,23 +6,27 @@

 #include <algorithm>
 #include <cstdarg>
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>

 #include <common/cbasetypes.hpp>
 #include <common/core.hpp> // CORE_ST_LAST
+#include <common/database.hpp>
 #include <common/db.hpp>
 #include <common/mapindex.hpp>
 #include <common/mmo.hpp>
 #include <common/msg_conf.hpp>
 #include <common/timer.hpp>
+#include <common/utilities.hpp>
 #include <config/core.hpp>

 #include "navi.hpp"
 #include "script.hpp"
 #include "path.hpp"

+using namespace rathena;
 using rathena::server_core::Core;
 using rathena::server_core::e_core_type;

@@ -46,6 +50,8 @@ namespace rathena{
 struct npc_data;
 struct item_data;
 struct Channel;
+enum sc_type : int16;
+enum e_map_type : uint8_t;

 struct map_data *map_getmapdata(int16 m);
 #define msg_config_read(cfgName,isnew) map_msg_config_read(cfgName,isnew)
@@ -608,7 +614,7 @@ enum e_mapflag : int16 {
 	MF_PVP_NOPARTY,
 	MF_PVP_NOGUILD,
 	MF_GVG,
-	MF_GVG_NOPARTY,	//10
+	MF_GVG_NOPARTY,
 	MF_NOTRADE,
 	MF_NOSKILL,
 	MF_NOWARP,
@@ -618,7 +624,7 @@ enum e_mapflag : int16 {
 	MF_FOG,
 	MF_SAKURA,
 	MF_LEAVES,
-	//MF_RAIN,	//20 - No longer available, keeping here just in case it's back someday. [Ind]
+	//MF_RAIN,	// No longer available, keeping here just in case it's back someday. [Ind]
 	// 21 free
 	MF_NOGO = 22,
 	MF_CLOUDS,
@@ -628,27 +634,25 @@ enum e_mapflag : int16 {
 	MF_GVG_DUNGEON,
 	MF_NIGHTENABLED,
 	MF_NOBASEEXP,
-	MF_NOJOBEXP,	//30
+	MF_NOJOBEXP,
 	MF_NOMOBLOOT,
 	MF_NOMVPLOOT,
 	MF_NORETURN,
 	MF_NOWARPTO,
 	MF_PVP_NIGHTMAREDROP,
-	MF_RESTRICTED,
 	MF_NOCOMMAND,
 	MF_NODROP,
 	MF_JEXP,
-	MF_BEXP,	//40
+	MF_BEXP,
 	MF_NOVENDING,
 	MF_LOADEVENT,
 	MF_NOCHAT,
 	MF_NOEXPPENALTY,
 	MF_GUILDLOCK,
-	MF_TOWN,
 	MF_AUTOTRADE,
 	MF_ALLOWKS,
 	MF_MONSTER_NOTELEPORT,
-	MF_PVP_NOCALCRANK,	//50
+	MF_PVP_NOCALCRANK,
 	MF_BATTLEGROUND,
 	MF_RESET,
 	MF_NOMAPCHANNELAUTOJOIN,
@@ -658,7 +662,7 @@ enum e_mapflag : int16 {
 	MF_FORCEMINEFFECT,
 	MF_NOLOCKON,
 	MF_NOTOMB,
-	MF_SKILL_DAMAGE,	//60
+	MF_SKILL_DAMAGE,
 	MF_NOCOSTUME,
 	MF_GVG_TE_CASTLE,
 	MF_GVG_TE,
@@ -676,6 +680,18 @@ enum e_mapflag : int16 {
 	MF_NOBUYINGSTORE,
 	MF_NODYNAMICNPC,
 	MF_NOBANK,
+	MF_INVINCIBLE_TIME,
+	MF_WEAPON_DAMAGE_RATE,
+	MF_MAGIC_DAMAGE_RATE,
+	MF_MISC_DAMAGE_RATE,
+	MF_LONG_DAMAGE_RATE,
+	MF_SHORT_DAMAGE_RATE,
+	MF_NOKNOCKBACK,
+	MF_NOBONUSITEMDROP,
+	MF_HIDEDAMAGE,
+	MF_FLEE_PENALTY,
+	MF_RESTRICTED,
+	MF_TOWN,
 	MF_SPECIALPOPUP,
 	MF_MAX
 };
@@ -798,6 +814,24 @@ struct iwall_data {
 	bool shootable;
 };

+class c_map_zone_data {
+public:
+	e_map_type id;
+	std::unordered_map<std::string, uint16> disabled_commands;
+	std::unordered_map<uint16, std::pair<uint16, uint16>> disabled_skills;
+	std::unordered_map<t_itemid, uint16> disabled_items;
+	std::unordered_map<sc_type, uint16> disabled_statuses;
+	std::unordered_map<int32, uint16> restricted_jobs;
+
+	e_map_type getMapZone(int16 map_id);
+	bool isCommandDisabled(std::string name, map_session_data &sd);
+	bool isSkillDisabled(uint16 skill_id, block_list &bl);
+	bool isItemDisabled(t_itemid nameid, map_session_data &sd);
+	bool isStatusDisabled(sc_type sc, block_list &bl);
+	bool isJobRestricted(int32 job_id, uint16 group_lv);
+	void clear_all_disabled_status(block_list &bl);
+};
+
 struct map_data {
 	char name[MAP_NAME_LENGTH];
 	uint16 index; // The map index used by the mapindex* functions.
@@ -817,11 +851,12 @@ struct map_data {

 	struct point save;
 	std::vector<s_drop_list> drop_list;
-	uint32 zone; // zone number (for item/skill restrictions)
 	struct s_skill_damage damage_adjust; // Used for overall skill damage adjustment
 	std::unordered_map<uint16, s_skill_damage> skill_damage; // Used for single skill damage adjustment
 	std::unordered_map<uint16, int> skill_duration;

+	std::shared_ptr<c_map_zone_data> zone;
+
 	struct npc_data *npc[MAX_NPC_PER_MAP];
 	struct spawn_data *moblist[MAX_MOB_LIST_PER_MAP]; // [Wizputer]
 	int mob_delete_timer;	// Timer ID for map_removemobs_timer [Skotlex]
@@ -855,6 +890,28 @@ private:
 	std::vector<int> flags;
 };

+class c_map_zone : public c_map_zone_data {
+public:
+	std::vector<int16> maps;
+	std::multimap<int16, std::string> mapflags;
+};
+
+class MapZoneDatabase : public TypesafeYamlDatabase<uint16, c_map_zone> {
+public:
+	MapZoneDatabase() : TypesafeYamlDatabase("MAP_ZONES", 1) {
+
+	}
+
+	const std::string getDefaultLocation() override;
+	uint64 parseBodyNode(const ryml::NodeRef &node) override;
+	void loadingFinished() override;
+
+	// Others
+	bool setZone(int16 map_id, e_map_type zone);
+};
+
+extern MapZoneDatabase map_zone_db;
+
 /// Stores information about a remote map (for multi-mapserver setups).
 /// Beginning of data structure matches 'map_data', to allow typecasting.
 struct map_data_other_server {
@@ -974,7 +1031,7 @@ inline bool mapdata_flag_ks(struct map_data *mapdata) {
 	if (mapdata == nullptr)
 		return false;

-	if (mapdata->getMapFlag(MF_TOWN) || mapdata->getMapFlag(MF_PVP) || mapdata->getMapFlag(MF_GVG) || mapdata->getMapFlag(MF_GVG_TE) || mapdata->getMapFlag(MF_BATTLEGROUND))
+	if (mapdata->getMapFlag(MF_PVP) || mapdata->getMapFlag(MF_GVG) || mapdata->getMapFlag(MF_GVG_TE) || mapdata->getMapFlag(MF_BATTLEGROUND))
 		return true;

 	return false;
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -2715,10 +2715,15 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 		}
 	}

+	map_data *mapdata = map_getmapdata(m);
+
+	if (mapdata == nullptr)
+		return 3;
+
 	if(!(type&2) && //No exp
-		(!map_getmapflag(m, MF_PVP) || battle_config.pvp_exp) && //Pvp no exp rule [MouseJstr]
+		(!mapdata->getMapFlag(MF_PVP) || battle_config.pvp_exp) && //Pvp no exp rule [MouseJstr]
 		(!md->master_id || !md->special_state.ai) && //Only player-summoned mobs do not give exp. [Skotlex]
-		(!map_getmapflag(m, MF_NOBASEEXP) || !map_getmapflag(m, MF_NOJOBEXP)) //Gives Exp
+		(!mapdata->getMapFlag(MF_NOBASEEXP) || !mapdata->getMapFlag(MF_NOJOBEXP)) //Gives Exp
 	) { //Experience calculation.
 		int bonus = 100; //Bonus on top of your share (common to all attackers).
 		int pnum = 0;
@@ -2790,16 +2795,16 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 					zeny*=rnd()%250;
 			}

-			if (map_getmapflag(m, MF_NOBASEEXP) || !md->db->base_exp)
+			if (mapdata->getMapFlag(MF_NOBASEEXP) || !md->db->base_exp)
 				base_exp = 0;
 			else {
 				double exp = apply_rate2(md->db->base_exp, per, 1);
 				exp = apply_rate(exp, bonus);
-				exp = apply_rate(exp, map_getmapflag(m, MF_BEXP));
+				exp = apply_rate(exp, mapdata->getMapFlag(MF_BEXP));
 				base_exp = (t_exp)cap_value(exp, 1, MAX_EXP);
 			}

-			if (map_getmapflag(m, MF_NOJOBEXP) || !md->db->job_exp
+			if (mapdata->getMapFlag(MF_NOJOBEXP) || !md->db->job_exp
 #ifndef RENEWAL
 				|| md->dmglog[i].flag == MDLF_HOMUN // Homun earned job-exp is always lost.
 #endif
@@ -2808,7 +2813,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 			else {
 				double exp = apply_rate2(md->db->job_exp, per, 1);
 				exp = apply_rate(exp, bonus);
-				exp = apply_rate(exp, map_getmapflag(m, MF_JEXP));
+				exp = apply_rate(exp, mapdata->getMapFlag(MF_JEXP));
 				job_exp = (t_exp)cap_value(exp, 1, MAX_EXP);
 			}

@@ -2889,7 +2894,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 		}
 	}

-	if( !(type&1) && !map_getmapflag(m, MF_NOMOBLOOT) && !md->state.rebirth && (
+	if( !(type&1) && !mapdata->getMapFlag(MF_NOMOBLOOT) && !md->state.rebirth && (
 		!md->special_state.ai || //Non special mob
 		battle_config.alchemist_summon_reward == 2 || //All summoned give drops
 		(md->special_state.ai==AI_SPHERE && battle_config.alchemist_summon_reward == 1) //Marine Sphere Drops items.
@@ -2924,36 +2929,38 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 			// process script-granted extra drop bonuses
 			t_itemid dropid = 0;

-			for (const auto &it : sd->add_drop) {
-				if (!&it || (!it.nameid && !it.group))
-					continue;
-				if ((it.race < RC_NONE_ && it.race == -md->mob_id) || //Race < RC_NONE_, use mob_id
-					(it.race == RC_ALL || it.race == status->race) || //Matched race
-					(it.class_ == CLASS_ALL || it.class_ == status->class_)) //Matched class
-				{
-					//Check if the bonus item drop rate should be multiplied with mob level/10 [Lupus]
-					if (it.rate < 0) {
-						//It's negative, then it should be multiplied. with mob_level/10
-						//rate = base_rate * (mob_level/10) + 1
-						drop_rate = (-it.rate) * md->level / 10 + 1;
-						drop_rate = cap_value(drop_rate, max(battle_config.item_drop_adddrop_min,1), min(battle_config.item_drop_adddrop_max,10000));
-					}
-					else
-						//it's positive, then it goes as it is
-						drop_rate = it.rate;
+			if (mapdata->getMapFlag(MF_NOBONUSITEMDROP)) {
+        for (const auto &it : sd->add_drop) {
+          if (!&it || (!it.nameid && !it.group))
+            continue;
+          if ((it.race < RC_NONE_ && it.race == -md->mob_id) || //Race < RC_NONE_, use mob_id
+            (it.race == RC_ALL || it.race == status->race) || //Matched race
+            (it.class_ == CLASS_ALL || it.class_ == status->class_)) //Matched class
+          {
+            //Check if the bonus item drop rate should be multiplied with mob level/10 [Lupus]
+            if (it.rate < 0) {
+              //It's negative, then it should be multiplied. with mob_level/10
+              //rate = base_rate * (mob_level/10) + 1
+              drop_rate = (-it.rate) * md->level / 10 + 1;
+              drop_rate = cap_value(drop_rate, max(battle_config.item_drop_adddrop_min,1), min(battle_config.item_drop_adddrop_max,10000));
+            }
+            else
+              //it's positive, then it goes as it is
+              drop_rate = it.rate;

-					if (rnd()%10000 >= drop_rate)
-						continue;
-					dropid = (it.nameid > 0) ? it.nameid : itemdb_group.get_random_item_id(it.group,1);
+            if (rnd()%10000 >= drop_rate)
+              continue;
+            dropid = (it.nameid > 0) ? it.nameid : itemdb_group.get_random_item_id(it.group,1);

-					s_mob_drop mobdrop = {};
+            s_mob_drop mobdrop = {};

-					mobdrop.nameid = dropid;
+            mobdrop.nameid = dropid;

-					std::shared_ptr<s_item_drop> ditem = mob_setdropitem(mobdrop, 1, md->mob_id);
+            std::shared_ptr<s_item_drop> ditem = mob_setdropitem(mobdrop, 1, md->mob_id);

-					mob_item_drop( md, dlist, ditem, 0, drop_rate, homkillonly || merckillonly );
-				}
+            mob_item_drop( md, dlist, ditem, 0, drop_rate, homkillonly || merckillonly );
+          }
+        }
 			}

 			// process script-granted zeny bonus (get_zeny_num) [Skotlex]
@@ -3052,10 +3059,10 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 		t_itemid log_mvp_nameid = 0;
 		t_exp log_mvp_exp = 0;

-		clif_mvp_effect( *mvp_sd );
+		clif_mvp_effect( mvp_sd );

 		//mapflag: noexp check [Lorky]
-		if( md->db->mexp > 0 && !( map_getmapflag( m, MF_NOBASEEXP ) || type&2 ) ){
+		if( md->db->mexp > 0 && !( mapdata->getMapFlag(MF_NOBASEEXP) || type&2 ) ){
 			log_mvp_exp = md->db->mexp;

 #if defined(RENEWAL_EXP)
@@ -3074,11 +3081,11 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)

 			log_mvp_exp = cap_value( log_mvp_exp, 1, MAX_EXP );

-			clif_mvp_exp( *mvp_sd, log_mvp_exp );
+			clif_mvp_exp( mvp_sd, log_mvp_exp );
 			pc_gainexp( mvp_sd, &md->bl, log_mvp_exp, 0, 0 );
 		}

-		if( !(map_getmapflag(m, MF_NOMVPLOOT) || type&1) ) {
+		if( !(mapdata->getMapFlag(MF_NOMVPLOOT) || type&1) ) {
 			//Order might be random depending on item_drop_mvp_mode config setting
 			struct s_mob_drop mdrop[MAX_MVP_DROP_TOTAL];

@@ -3273,7 +3280,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 	}

 	// MvP tomb [GreenBox]
-	if (battle_config.mvp_tomb_enabled && md->spawn->state.boss && map_getmapflag(md->bl.m, MF_NOTOMB) != 1)
+	if (battle_config.mvp_tomb_enabled && md->spawn->state.boss && mapdata->getMapFlag(MF_NOTOMB) != 1)
 		mvptomb_create(md, mvp_sd ? mvp_sd->status.name : nullptr, time(nullptr));

 	if( !rebirth )
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -5387,7 +5387,7 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
 * eg : bat_c01	mapflag	battleground	2
 * also chking if mapflag conflict with another
 *------------------------------------------*/
-static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath)
+const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath)
 {
 	int16 m;
 	char mapname[MAP_NAME_LENGTH_EXT];
@@ -5485,18 +5485,6 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con
 				map_setmapflag(m, MF_NOCOMMAND, false);
 			break;

-		case MF_RESTRICTED:
-			if (state) {
-				union u_mapflag_args args = {};
-
-				if (sscanf(w4, "%11d", &args.flag_val) == 1)
-					map_setmapflag_sub(m, MF_RESTRICTED, true, &args);
-				else // Could not be read, no value defined; don't remove as other restrictions may be set on the map
-					ShowWarning("npc_parse_mapflag: Zone value not set for the restricted mapflag! Skipped flag from %s (file '%s', line '%d').\n", map_mapid2mapname(m), filepath, strline(buffer,start-buffer));
-			} else
-				map_setmapflag(m, MF_RESTRICTED, false);
-			break;
-
 		case MF_JEXP:
 		case MF_BEXP: {
 				union u_mapflag_args args = {};
@@ -5586,6 +5574,22 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con
 			break;
 		}

+		case MF_INVINCIBLE_TIME:
+		case MF_FLEE_PENALTY:
+		case MF_WEAPON_DAMAGE_RATE:
+		case MF_MAGIC_DAMAGE_RATE:
+		case MF_MISC_DAMAGE_RATE:
+		case MF_LONG_DAMAGE_RATE:
+		case MF_SHORT_DAMAGE_RATE: {
+				union u_mapflag_args args = {};
+
+				if (state)
+					sscanf(w4, "%11d", &args.flag_val);
+
+				map_setmapflag_sub(m, mapflag, state, &args);
+			}
+			break;
+
 		// All others do not need special treatment
 		default:
 			map_setmapflag(m, mapflag, state);
--- a/src/map/npc.hpp
+++ b/src/map/npc.hpp
@@ -1528,6 +1528,11 @@ enum e_job_types
 	JT_4_EP21_TAN_S,

 	JT_4_M_VACATION_MARAM = 10595,
+	JT_4_CLB_SS_FC,
+	JT_4_CLB_SS_TZ,
+	JT_4_CLB_SS_AJ,
+	JT_4_CLB_SS_LK,
+	JT_4_SMART_ANDRE,

 	JT_ROZ_MQ_XAVIER = 13000,
 	JT_ROZ_MQ_MOCLORD,
@@ -1547,7 +1552,7 @@ enum e_job_types
 #define MAX_NPC_CLASS2_START NPC_RANGE3_START
 #define MAX_NPC_CLASS2_END NPC_RANGE3_END

-//Checks if a given id is a valid npc id. [Skotlex]
+//Checks if a given id is a valid npc id.
 //Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)
 #define npcdb_checkid(id) ( ( (id) > NPC_RANGE1_START && (id) < NPC_RANGE1_END ) || (id) == JT_HIDDEN_WARP_NPC || ( (id) > NPC_RANGE2_START && (id) < NPC_RANGE2_END ) || (id) == JT_INVISIBLE || ( (id) > NPC_RANGE3_START && (id) < NPC_RANGE3_END ) )

@@ -1607,6 +1612,8 @@ bool npc_isnear(struct block_list * bl);

 int npc_get_new_npc_id(void);

+const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath);
+
 int npc_addsrcfile(const char* name, bool loadscript);
 void npc_delsrcfile(const char* name);
 int npc_parsesrcfile(const char* filepath);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
aleos	857d6e36c5	Add some renewal maps to zones	2024-09-20 13:25:46 -04:00
aleos	a01b87aca9	Adjust map ID lookup to be primary * Resolves a few cases of where a map may be defined in the index/cache but not enabled from the config. * Comment out a few pre-renewal maps that are not enabled.	2024-09-20 10:12:23 -04:00
Aleos	3a0b3cceef	Merge branch 'master' into feature/map_zones	2024-09-20 09:38:17 -04:00
Daegaladh	8c9e447fd5	Fixed Castling not getting the correct target (#8657 ) Follow-up to `ffead570b2`	2024-09-20 10:23:53 +02:00
AoShinHo	fa145ac838	New NPC, Hateffects & Skill Constants (#8656 )	2024-09-18 17:28:21 +02:00
Lemongrass3110	7880596b03	Fixed clif_guild_positioninfolist Fixes #8648 Thanks to @thanna, @laziem, @skstrife and @AoShinRO	2024-09-17 17:10:27 +02:00
Jittapan Pluemsumran	f3f8e63448	Don't allow setting "first pincode" if pincode is already set (#8654 )	2024-09-17 16:29:36 +02:00
Kanin Temsrisuk	29671fa5cd	Fixed Realgar_Shooter_EXE location (#8647 )	2024-09-15 09:41:05 +02:00
AoShinHo	077f714e05	Converted ZC_SKILLINFO_DELETE to struct (#8595 ) Co-authored-by: Atemo <Atemo@users.noreply.github.com> Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>	2024-09-15 02:49:31 +02:00
aleos	69df7536bf	Add back player_invincible_time battle config * Resolves an issue where the invincible time as not getting applied to maps without the MF_INVINCIBLE_TIME flag. * Move the logic checks for MF_INVINCIBLE_TIME, MF_FLEE_PENALTY, MF_WEAPON_DAMAGE_RATE, MF_MAGIC_DAMAGE_RATE, MF_MISC_DAMAGE_RATE, MF_LONG_DAMAGE_RATE, and MF_SHORT_DAMAGE_RATE to map_setmapflag_sub() from npc_parse_mapflag(). * Update the mapflag documentation.	2024-09-09 10:48:34 -04:00
aleos	eacd54bf62	Add missing atcommand reference	2024-09-06 12:25:44 -04:00
Daegaladh	a9d3ebd7b5	Fixed pre-re maps Removed renewal maps from pre-re Improved map descriptions Fixed pre-re bossnia maptype (It's actually 24)	2024-08-19 16:47:56 +02:00
aleos	06c595cfed	Minor message cleanups Thanks to @Daegaladh!	2024-08-16 10:24:55 -04:00
aleos	14aa844574	Adjust pre-re map zones Thanks to @Daegaladh!	2024-08-16 10:21:10 -04:00
aleos	8ac2975816	Resolve a merge error	2024-08-01 12:24:28 -04:00
aleos	142505f398	Merge branch 'master' into feature/map_zones	2024-08-01 12:15:05 -04:00
Daegaladh	e648d02c6d	Fixed alphabetical order and remove some renewal maps from pre-e	2024-06-29 16:10:04 +02:00
aleos	394d502e1b	Adjust getMapZone * Change the lookup method for getMapZone to utilize the value stored in the map_data rather than looking through map_zone memory bringing faster results.	2024-06-26 14:37:47 -04:00
aleos	73ea1ac54d	Resolve map-server-generator post build tasks	2024-06-21 09:13:35 -04:00
Aleos	f0a1847377	Merge branch 'master' into feature/map_zones	2024-06-21 08:59:37 -04:00
aleos	2553658eb9	Merge branch 'master' into feature/map_zones	2024-05-31 12:15:40 -04:00
aleos	c62395fe35	Cleanups and optimizations	2024-05-07 13:34:33 -04:00
aleos	6ffcedcda8	Merge branch 'master' into feature/map_zones # Conflicts: # conf/msg_conf/map_msg.conf	2024-05-07 12:38:19 -04:00
aleos	92b6879b30	Fixes a compile error	2024-05-07 12:30:35 -04:00
aleos	477c845027	Clean ups from review Thanks to @Lemongrass3110!	2024-05-07 12:26:13 -04:00
aleos	074fdfbd5c	Refactor a few functions to use sd lookup	2024-05-03 16:26:42 -04:00
aleos	060629bd17	Adjust structs to classes * Adjust to class to avoid duplication of definitions. * Rename prefix to match "class".	2024-05-03 15:46:59 -04:00
Aleos	849f1ec477	Merge branch 'master' into feature/map_zones	2024-05-03 14:16:05 -04:00
aleos	61b7f3324e	Resolve compile errors and warnings	2024-05-03 13:36:33 -04:00
Aleos	b43cd4ced1	Merge branch 'master' into feature/map_zones	2024-05-03 13:21:50 -04:00
aleos	1e4c6ffaab	Merge branch 'master' into feature/map_zones	2024-04-16 12:48:27 -04:00
Atemo	9973a897b1	Corrected the zone of few maps	2024-02-09 16:53:24 +01:00
Atemo	fc7a5534d5	Maps in order	2024-02-09 16:50:33 +01:00
aleos	f56c45cd50	Revert PvP/GvG atcommands * Revert atcommand pvpon/pvpoff. * Revert atcommand gvgon/gvgoff.	2024-01-23 08:45:21 -05:00
aleos	fc3cc3c1c2	Fixes atcommands for PvP and GvG toggle * Fixes atcommands pvpon, pvpoff, gvgon, and gvgoff to properly toggle the current map with the appropriate zone. * Atcommand pvpon will assign the MAPTYPE_NOPENALTY_FREEPKZONE zone. * Atcommand gvgon will assign the MAPTYPE_EVENT_GUILDWAR zone. * Adds getMapZone() to return a map's zone. * Adds setZone() to set a map's zone. Thanks to @Atemo!	2024-01-18 10:22:07 -05:00
aleos	d3ea299f53	Remove unused battle configs	2024-01-17 17:08:27 -05:00
aleos	cbe0d8fe1f	Adds translation for Portuguese Thanks to @Pokye!	2024-01-17 16:44:49 -05:00
aleos	10e28babc9	Add empty zone notice * Display a notice when a map doesn't have a zone with a suggestion to assign one. * Avoiding a default zone as many maps are added from updates and may not get their proper zones until the requisite data is found.	2024-01-17 16:43:32 -05:00
aleos	4a48b64566	Fixes MF_FLEE_PENALTY parsing	2024-01-17 16:10:40 -05:00
aleos	e34973a5cc	Fixes mapflag parsing * Adds back an accidental removal for mapflag name lookup.	2024-01-17 16:10:14 -05:00
aleos	c178f03a26	Convert s_map_zone_data storage to shared_ptr	2024-01-17 16:09:36 -05:00
aleos	941085e826	Adds ability to clear mapflags * Added the Clear label to allow mapflags to be removed for importing use. * Converts mapflag storage into multimap.	2024-01-17 14:05:29 -05:00
aleos	e9beffea50	Adds object type check to isStatusDisabled * Check by object type rather than passing arbitrary integers to compare against.	2024-01-16 14:19:58 -05:00
aleos	772c6f33ff	Invincible timer clean * Remove a possible timer even if passing an invalid time value.	2024-01-16 13:53:04 -05:00
aleos	34065e4ca6	Map Zone parsing optimizations	2024-01-16 11:10:56 -05:00
aleos	e3eefb6acc	Fixes invincible timer check	2024-01-14 16:11:00 -05:00
aleos	31cc8c5115	Adds a function to assist with PK damage * Re-implement battle_calc_pk_damage to help determine when to adjust damage when PK mode is enabled. * Implement INF2_IGNOREPKREDUCTION skill flag to make skills bypass the damage adjustments.	2024-01-14 16:08:55 -05:00
aleos	08068bf3a4	Remove plurality	2024-01-14 11:33:35 -05:00
aleos	53b2a0c351	Remove deprecated databases from file move	2024-01-14 11:25:58 -05:00
aleos	e405a39733	Fixes incorrect message display	2024-01-14 11:22:12 -05:00
aleos	6568ccff5d	Cleanup atcommand mapinfo * Adjust checks for faster lookup.	2024-01-14 11:20:48 -05:00
aleos	1e4a219832	Implements mapflag MF_FLEE_PENALTY * Deprecate the bg_flee_penalty and gvg_flee_penalty battle configs. * Removes hardcoded restrictions limiting to only BG and GvG maps.	2024-01-14 11:19:33 -05:00
aleos	7717070d14	Translate new messages to Spanish Thanks to @SapitoSucio!	2024-01-13 17:07:50 -05:00
aleos	5c24cc4c6a	Disable mapflags on custom scripts	2024-01-12 17:28:47 -05:00
aleos	c186c0354e	Fix Russian specifier to integer	2024-01-12 17:05:44 -05:00
aleos	997e457890	Update messages for other languages	2024-01-12 17:03:41 -05:00
aleos	82e362edaa	Fixes PK damage calculation * Convert a few more PK damage checks that got missed from a merge conflict.	2024-01-12 17:03:20 -05:00
aleos	004dcf57c0	More battle_config cleanups	2024-01-12 16:18:25 -05:00
aleos	e60e3e8dc2	Fixes CI errors	2024-01-12 16:15:01 -05:00
aleos	39f6e1492b	Initial implementation of Map Zones * Implements Map Zones which allows easier configuration of map settings. * The restricted mapflag has been removed as they will no longer be needed. * General cleanups and optimizations.	2024-01-12 15:43:52 -05:00