Add some renewal maps to zones

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

conf/atcommands.yml

@@ -1032,6 +1032,11 @@ Body:
   - Command: setcard 
     Help: |
       Adds a card or enchant to the specific slot of the equipment.
+  - Command: resetcooltime
+    Aliases:
+      - resetcooldown
+    Help: |
+      Resets the cooldown of all skills of the player and if active also of the homunculus or the mercenary.
 
 Footer:
   Imports:

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
 

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

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
 

conf/battle/player.conf

@@ -295,8 +295,8 @@ trait_points_job_change: 7
 
 // Max trait stats cap.
 // Trait Stats: POW, STA, WIS, SPL, CON, CRT
-// Official is 100.
-max_trait_parameter: 100
+// Official is 110.
+max_trait_parameter: 110
 
 // Max percent of RES/MRES that can be ignored by item bonus/skill.
 // Default: 50

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)
@@ -1823,5 +1827,8 @@
 1534: Usage: @stockall {<type>}
 1535: %d items are transferred (%d skipped)!
 
+1536: Log configuration has been reloaded.
+1537: Found skill '%s', unblocking...
+
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt

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)

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)

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)

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)

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)

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)

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)

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

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.

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

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

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

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

db/pre-re/item_db_usable.yml

@@ -2613,7 +2613,7 @@ Body:
     Flags:
       BuyingStore: true
     Script: |
-      sc_start SC_SlowDown,5000,0;
+      sc_start SC_SLOWDOWN,5000,100;
   - Id: 12018
     AegisName: Fire_Cracker
     Name: Firecracker

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

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.

db/pre-re/skill_db.yml

@@ -3660,17 +3660,27 @@ Body:
         Reproduce: true
     CastCancel: true
     CastTime:
+      - Level: 1
+        Time: 700
+      - Level: 2
+        Time: 1400
+      - Level: 3
+        Time: 2100
+      - Level: 4
+        Time: 2800
+      - Level: 5
+        Time: 3500
+    AfterCastActDelay:
       - Level: 1
         Time: 1000
       - Level: 2
-        Time: 2000
+        Time: 1200
       - Level: 3
-        Time: 3000
+        Time: 1400
       - Level: 4
-        Time: 4000
+        Time: 1600
       - Level: 5
-        Time: 5000
-    AfterCastActDelay: 700
+        Time: 1800
     Requires:
       SpCost:
         - Level: 1
@@ -3722,7 +3732,7 @@ Body:
         Time: 4000
       - Level: 5
         Time: 5000
-    AfterCastActDelay: 700
+    AfterCastActDelay: 1000
     Duration1: 100
     Requires:
       SpCost:
@@ -30812,7 +30822,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Hit: Single
     AfterCastActDelay: 1000
     AfterCastWalkDelay: 1000
     Requires:
@@ -30824,7 +30833,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Hit: Single
     AfterCastActDelay: 30000
     AfterCastWalkDelay: 1000
     Duration1:
@@ -30855,8 +30863,6 @@ Body:
     Name: HAMI_SKIN
     Description: Adamantium Skin
     MaxLevel: 5
-    DamageFlags:
-      NoDamage: true
   - Id: 8008
     Name: HAMI_BLOODLUST
     Description: Bloodlust
@@ -30864,7 +30870,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Hit: Single
     AfterCastActDelay:
       - Level: 1
         Time: 300000

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

db/pre-re/statpoint.yml

@@ -552,3 +552,33 @@ Body:
     Points: 4545
   - Level: 260
     Points: 4545
+  - Level: 261
+    Points: 4545
+  - Level: 262
+    Points: 4545
+  - Level: 263
+    Points: 4545
+  - Level: 264
+    Points: 4545
+  - Level: 265
+    Points: 4545
+  - Level: 266
+    Points: 4545
+  - Level: 267
+    Points: 4545
+  - Level: 268
+    Points: 4545
+  - Level: 269
+    Points: 4545
+  - Level: 270
+    Points: 4545
+  - Level: 271
+    Points: 4545
+  - Level: 272
+    Points: 4545
+  - Level: 273
+    Points: 4545
+  - Level: 274
+    Points: 4545
+  - Level: 275
+    Points: 4545

db/pre-re/status.yml

@@ -2496,6 +2496,9 @@ Body:
     CalcFlags:
       Batk: true
       Watk: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnWarp: true
   - Status: Fleet
     DurationLookup: HFLI_FLEET
     CalcFlags:
@@ -2510,6 +2513,10 @@ Body:
     DurationLookup: HAMI_DEFENCE
     CalcFlags:
       Def: true
+      Vit: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnWarp: true
   - Status: Incaspdrate
     CalcFlags:
       Aspd: true
@@ -3967,7 +3974,7 @@ Body:
       Unlimitedhummingvoice: true
       Sircleofnature: true
   - Status: Deepsleep
-    Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
+    Icon: EFST_DEEP_SLEEP
     DurationLookup: WM_LULLABY_DEEPSLEEP
     States:
       NoCast: true

db/re/enchantgrade.yml

@@ -76,15 +76,15 @@ Body:
               - Refine: 15
                 Chance: 7000
               - Refine: 16
-                Chance: 7000
+                Chance: 8000
               - Refine: 17
-                Chance: 7000
+                Chance: 8000
               - Refine: 18
-                Chance: 7000
+                Chance: 8000
               - Refine: 19
-                Chance: 7000
+                Chance: 8000
               - Refine: 20
-                Chance: 7000
+                Chance: 8000
             Bonus: 10
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -116,15 +116,15 @@ Body:
               - Refine: 15
                 Chance: 6000
               - Refine: 16
-                Chance: 6000
+                Chance: 7000
               - Refine: 17
-                Chance: 6000
+                Chance: 7000
               - Refine: 18
-                Chance: 6000
+                Chance: 7000
               - Refine: 19
-                Chance: 6000
+                Chance: 7000
               - Refine: 20
-                Chance: 6000
+                Chance: 7000
             Bonus: 30
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -154,15 +154,15 @@ Body:
               - Refine: 15
                 Chance: 5000
               - Refine: 16
-                Chance: 5000
+                Chance: 6000
               - Refine: 17
-                Chance: 5000
+                Chance: 6000
               - Refine: 18
-                Chance: 5000
+                Chance: 6000
               - Refine: 19
-                Chance: 5000
+                Chance: 6000
               - Refine: 20
-                Chance: 5000
+                Chance: 6000
             Bonus: 50
             AnnounceFail: true
             Catalyst:
@@ -193,15 +193,15 @@ Body:
               - Refine: 15
                 Chance: 4000
               - Refine: 16
-                Chance: 4000
+                Chance: 5000
               - Refine: 17
-                Chance: 4000
+                Chance: 5000
               - Refine: 18
-                Chance: 4000
+                Chance: 5000
               - Refine: 19
-                Chance: 4000
+                Chance: 5000
               - Refine: 20
-                Chance: 4000
+                Chance: 5000
             Bonus: 100
             AnnounceFail: true
             Catalyst:
@@ -240,15 +240,15 @@ Body:
               - Refine: 15
                 Chance: 7000
               - Refine: 16
-                Chance: 7000
+                Chance: 8000
               - Refine: 17
-                Chance: 7000
+                Chance: 8000
               - Refine: 18
-                Chance: 7000
+                Chance: 8000
               - Refine: 19
-                Chance: 7000
+                Chance: 8000
               - Refine: 20
-                Chance: 7000
+                Chance: 8000
             Bonus: 10
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -280,15 +280,15 @@ Body:
               - Refine: 15
                 Chance: 6000
               - Refine: 16
-                Chance: 6000
+                Chance: 7000
               - Refine: 17
-                Chance: 6000
+                Chance: 7000
               - Refine: 18
-                Chance: 6000
+                Chance: 7000
               - Refine: 19
-                Chance: 6000
+                Chance: 7000
               - Refine: 20
-                Chance: 6000
+                Chance: 7000
             Bonus: 30
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -318,15 +318,15 @@ Body:
               - Refine: 15
                 Chance: 5000
               - Refine: 16
-                Chance: 5000
+                Chance: 6000
               - Refine: 17
-                Chance: 5000
+                Chance: 6000
               - Refine: 18
-                Chance: 5000
+                Chance: 6000
               - Refine: 19
-                Chance: 5000
+                Chance: 6000
               - Refine: 20
-                Chance: 5000
+                Chance: 6000
             Bonus: 50
             AnnounceFail: true
             Catalyst:
@@ -357,15 +357,15 @@ Body:
               - Refine: 15
                 Chance: 4000
               - Refine: 16
-                Chance: 4000
+                Chance: 5000
               - Refine: 17
-                Chance: 4000
+                Chance: 5000
               - Refine: 18
-                Chance: 4000
+                Chance: 5000
               - Refine: 19
-                Chance: 4000
+                Chance: 5000
               - Refine: 20
-                Chance: 4000
+                Chance: 5000
             Bonus: 100
             AnnounceFail: true
             Catalyst:

db/re/instance_db.yml

@@ -501,19 +501,19 @@ Body:
       7@thts: true
       8@thts: true
   - Id: 67
-    Name: The Maze of Oz
+    Name: Oz Labyrinth
     Enter:
       Map: 1@oz
       X: 284
       Y: 167
   - Id: 68
-    Name: Thor Gunsu Base
+    Name: Thor Military Base
     Enter:
       Map: 1@tcamp
       X: 103
       Y: 237
   - Id: 69
-    Name: A Gathering Place of Wolves
+    Name: Wolves Gathering Place
     Enter:
       Map: 1@nyr
       X: 194
@@ -529,7 +529,7 @@ Body:
     AdditionalMaps:
       2@nyr: true
   - Id: 71
-    Name: Villa of High Priest
+    Name: High Priest's Villa
     Enter:
       Map: 1@adv
       X: 123

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
@@ -112246,8 +112246,7 @@ Body:
     Defense: 30
     Slots: 1
     Classes:
-      All_Third: true
-      Fourth: true
+      All: true
     Locations:
       Garment: true
     ArmorLevel: 1
@@ -112276,8 +112275,7 @@ Body:
     Defense: 30
     Slots: 1
     Classes:
-      All_Third: true
-      Fourth: true
+      All: true
     Locations:
       Garment: true
     ArmorLevel: 1
@@ -112306,8 +112304,7 @@ Body:
     Defense: 30
     Slots: 1
     Classes:
-      All_Third: true
-      Fourth: true
+      All: true
     Locations:
       Garment: true
     ArmorLevel: 1
@@ -139535,7 +139532,7 @@ Body:
     AegisName: Ein_BHAXE
     Name: Saw Axe
     Type: Weapon
-    SubType: 1hAxe
+    SubType: 2hAxe
     Weight: 5000
     Attack: 350
     Range: 1
@@ -169200,6 +169197,8 @@ Body:
     Defense: 12
     Slots: 1
     Jobs:
+      Crusader: true
+      Knight: true
       Swordman: true
     Classes:
       All_Upper: true
@@ -169220,6 +169219,8 @@ Body:
     Defense: 12
     Slots: 1
     Jobs:
+      Crusader: true
+      Knight: true
       Swordman: true
     Classes:
       All_Upper: true
@@ -187652,7 +187653,7 @@ Body:
       bonus2 bSkillAtk,"GC_CROSSIMPACT",20*(.@r/3);
       bonus2 bSkillAtk,"GC_ROLLINGCUTTER",20*(.@r/3);
       bonus2 bSkillAtk,"SC_TRIANGLESHOT",20*(.@r/3);
-      bonus2 bSkillAtk,"SC_STARTMARK",20*(.@r/3);
+      bonus2 bSkillAtk,"SC_FATALMENACE",20*(.@r/3);
       if (.@r>=9) {
          bonus bLongAtkRate,10;
          bonus bShortAtkRate,10;

db/re/item_db_etc.yml

@@ -86200,31 +86200,31 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 1001072
-    AegisName: aegis_1001072
+    AegisName: Evil_Black_Bid
     Name: Evil Orb
     Type: Etc
     Buy: 1480
     Weight: 10
   - Id: 1001073
-    AegisName: aegis_1001073
+    AegisName: Ectoplasmic_Stone
     Name: Ectoplasmic Stone
     Type: Etc
     Buy: 1460
     Weight: 10
   - Id: 1001074
-    AegisName: aegis_1001074
+    AegisName: Heavy_Chain
     Name: Heavy Chain
     Type: Etc
     Buy: 1480
     Weight: 10
   - Id: 1001075
-    AegisName: aegis_1001075
+    AegisName: Evil_Minded_Ruby
     Name: Evil Minded Ruby
     Type: Etc
     Buy: 1500
     Weight: 10
   - Id: 1001076
-    AegisName: aegis_1001076
+    AegisName: Small_Sewing_Box
     Name: Small Sewing Kit
     Type: Etc
     Buy: 1640
@@ -86236,37 +86236,37 @@ Body:
     Buy: 1600
     Weight: 10
   - Id: 1001078
-    AegisName: aegis_1001078
+    AegisName: Blue_Moon_Stone
     Name: Fragments of the Blue Moon
     Type: Etc
     Buy: 1720
     Weight: 10
   - Id: 1001079
-    AegisName: aegis_1001079
+    AegisName: Weird_Tentacle
     Name: Monstrous Tentacles
     Type: Etc
     Buy: 1520
     Weight: 10
   - Id: 1001080
-    AegisName: aegis_1001080
+    AegisName: Congealed_Poison
     Name: Congealed Poison
     Type: Etc
     Buy: 1600
     Weight: 10
   - Id: 1001081
-    AegisName: aegis_1001081
+    AegisName: Slicky_Fluid
     Name: Slimy Fluid
     Type: Etc
     Buy: 1560
     Weight: 10
   - Id: 1001082
-    AegisName: aegis_1001082
+    AegisName: Reptile_Stone
     Name: Monster's Stone
     Type: Etc
     Buy: 1720
     Weight: 10
   - Id: 1001083
-    AegisName: aegis_1001083
+    AegisName: Turn_Yellow_Leaf
     Name: Maple Leaves
     Type: Etc
     Buy: 1640
@@ -86278,13 +86278,13 @@ Body:
     Buy: 1480
     Weight: 10
   - Id: 1001085
-    AegisName: aegis_1001085
+    AegisName: Cool_Liquid
     Name: Cool Liquid
     Type: Etc
     Buy: 1460
     Weight: 10
   - Id: 1001086
-    AegisName: aegis_1001086
+    AegisName: Green_Crystal_Fragment
     Name: Blue Crystal Shard
     Type: Etc
     Buy: 1480
@@ -86296,7 +86296,7 @@ Body:
     Buy: 1600
     Weight: 10
   - Id: 1001088
-    AegisName: aegis_1001088
+    AegisName: Fresh_Pear
     Name: Fresh Pear
     Type: Etc
     Buy: 1640
@@ -90384,7 +90384,7 @@ Body:
       Ammo: true
     EquipLevelMin: 1
     Script: |
-      bonus bAtkEle,Ele_Neutral;
+      bonus bAtkEle,Ele_Ghost;
   - Id: 1220003
     AegisName: Kunai_Of_Shadow
     Name: Kunai Of Shadow

db/re/job_exp.yml

@@ -3365,7 +3365,7 @@ Body:
       Night_Watch: true
       Hyper_Novice: true
       Spirit_Handler: true
-    MaxBaseLevel: 260
+    MaxBaseLevel: 275
     BaseExp:
       - Level: 1
         Exp: 658
@@ -3886,6 +3886,36 @@ Body:
       - Level: 259
         Exp: 270217017679
       - Level: 260
+        Exp: 283727868563
+      - Level: 261
+        Exp: 297914261991
+      - Level: 262
+        Exp: 312809975091
+      - Level: 263
+        Exp: 328450473845
+      - Level: 264
+        Exp: 344872997537
+      - Level: 265
+        Exp: 353494822476
+      - Level: 266
+        Exp: 362332193038
+      - Level: 267
+        Exp: 371390497864
+      - Level: 268
+        Exp: 380675260310
+      - Level: 269
+        Exp: 390192141818
+      - Level: 270
+        Exp: 397995984654
+      - Level: 271
+        Exp: 405955904348
+      - Level: 272
+        Exp: 414075022434
+      - Level: 273
+        Exp: 422356522883
+      - Level: 274
+        Exp: 430803653341
+      - Level: 275
         Exp: 999999999999
   - Jobs:
       Dragon_Knight: true
@@ -3912,7 +3942,7 @@ Body:
       Night_Watch: true
       Hyper_Novice: true
       Spirit_Handler: true
-    MaxJobLevel: 55
+    MaxJobLevel: 60
     JobExp:
       - Level: 1
         Exp: 4700000
@@ -4023,4 +4053,14 @@ Body:
       - Level: 54
         Exp: 6559840847
       - Level: 55
-        Exp: 9999999999
+        Exp: 7543816974
+      - Level: 56
+        Exp: 8675389520
+      - Level: 57
+        Exp: 9976697948
+      - Level: 58
+        Exp: 11473202640
+      - Level: 59
+        Exp: 13194183036
+      - Level: 60
+        Exp: 99999999999

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

db/re/job_stats.yml

@@ -8893,6 +8893,10 @@ Body:
         Crt: 1
       - Level: 55
         Sta: 1
+      - Level: 56
+        Sta: 1
+      - Level: 58
+        Con: 1
   - Jobs:
       Meister: true
       Meister2: true
@@ -9035,6 +9039,10 @@ Body:
         Wis: 1
       - Level: 55
         Pow: 1
+      - Level: 57
+        Wis: 1
+      - Level: 59
+        Pow: 1
   - Jobs:
       Shadow_Cross: true
     MaxWeight: 32000
@@ -9176,6 +9184,10 @@ Body:
         Crt: 1
       - Level: 55
         Crt: 1
+      - Level: 57
+        Con: 1
+      - Level: 59
+        Crt: 1
   - Jobs:
       Arch_Mage: true
     MaxWeight: 30000
@@ -9317,6 +9329,10 @@ Body:
         Wis: 1
       - Level: 55
         Spl: 1
+      - Level: 57
+        Wis: 1
+      - Level: 59
+        Spl: 1
   - Jobs:
       Cardinal: true
     MaxWeight: 30000
@@ -9459,6 +9475,10 @@ Body:
         Wis: 1
       - Level: 55
         Crt: 1
+      - Level: 56
+        Con: 1
+      - Level: 59
+        Spl: 1
   - Jobs:
       Windhawk: true
       Windhawk2: true
@@ -9601,6 +9621,10 @@ Body:
         Sta: 1
       - Level: 55
         Pow: 1
+      - Level: 57
+        Crt: 1
+      - Level: 59
+        Pow: 1
   - Jobs:
       Imperial_Guard: true
       Imperial_Guard2: true
@@ -9744,6 +9768,10 @@ Body:
       - Level: 55
         Wis: 1
         Con: 1
+      - Level: 57
+        Pow: 1
+      - Level: 59
+        Spl: 1
   - Jobs:
       Biolo: true
     MaxWeight: 32000
@@ -9885,6 +9913,10 @@ Body:
         Crt: 1
       - Level: 55
         Con: 1
+      - Level: 56
+        Sta: 1
+      - Level: 59
+        Pow: 1
   - Jobs:
       Abyss_Chaser: true
     MaxWeight: 28000
@@ -10026,6 +10058,10 @@ Body:
       - Level: 55
         Sta: 1
         Con: 1
+      - Level: 56
+        Spl: 1
+      - Level: 59
+        Pow: 1
   - Jobs:
       Elemental_Master: true
     MaxWeight: 30000
@@ -10168,6 +10204,10 @@ Body:
         Wis: 1
       - Level: 55
         Spl: 1
+      - Level: 56
+        Wis: 1
+      - Level: 59
+        Con: 1
   - Jobs:
       Inquisitor: true
     MaxWeight: 30000
@@ -10309,6 +10349,10 @@ Body:
       - Level: 55
         Pow: 1
         Wis: 1
+      - Level: 57
+        Wis: 1
+      - Level: 59
+        Con: 1
   - Jobs:
       Troubadour: true
     MaxWeight: 32000
@@ -10450,6 +10494,10 @@ Body:
       - Level: 55
         Pow: 1
         Con: 1
+      - Level: 56
+        Spl: 1
+      - Level: 59
+        Pow: 1
   - Jobs:
       Trouvere: true
     MaxWeight: 32000
@@ -10592,6 +10640,10 @@ Body:
       - Level: 55
         Pow: 1
         Con: 1
+      - Level: 56
+        Spl: 1
+      - Level: 59
+        Pow: 1
   - Jobs:
       Sky_Emperor: true
     MaxWeight: 42000
@@ -10734,6 +10786,10 @@ Body:
       - Level: 55
         Pow: 1
         Con: 1
+      - Level: 57
+        Wis: 1
+      - Level: 59
+        Con: 1
   - Jobs:
       Soul_Ascetic: true
     MaxWeight: 42000
@@ -10867,6 +10923,10 @@ Body:
         Sta: 1
       - Level: 55
         Spl: 1
+      - Level: 56
+        Wis: 1
+      - Level: 59
+        Con: 1
   - Jobs:
       Shinkiro: true
     MaxWeight: 45000
@@ -11010,6 +11070,14 @@ Body:
         Sta: 1
       - Level: 55
         Sta: 1
+      - Level: 56
+        Int: 1
+        Dex: 1
+      - Level: 57
+        Wis: 1
+      - Level: 59
+        Int: 1
+        Spl: 1
   - Jobs:
       Shiranui: true
     MaxWeight: 45000
@@ -11141,6 +11209,14 @@ Body:
       - Level: 55
         Spl: 1
         Con: 1
+      - Level: 56
+        Str: 1
+      - Level: 57
+        Vit: 1
+        Spl: 1
+      - Level: 59
+        Str: 1
+        Pow: 1
   - Jobs:
       Night_Watch: true
     MaxWeight: 48000
@@ -11281,6 +11357,10 @@ Body:
         Wis: 1
       - Level: 55
         Pow: 1
+      - Level: 56
+        Wis: 1
+      - Level: 59
+        Crt: 1
   - Jobs:
       Hyper_Novice: true
     MaxWeight: 40000
@@ -11426,6 +11506,12 @@ Body:
         Sta: 1
       - Level: 55
         Spl: 1
+      - Level: 56
+        Dex: 1
+      - Level: 57
+        Pow: 1
+      - Level: 59
+        Spl: 1
   - Jobs:
       Spirit_Handler: true
     MaxWeight: 42000
@@ -11567,3 +11653,7 @@ Body:
         Wis: 1
       - Level: 55
         Sta: 1
+      - Level: 57
+        Spl: 1
+      - Level: 59
+        Pow: 1

db/re/mob_skill_db.txt

@@ -13606,7 +13606,7 @@
 20811,ILL_KRAKEN@NPC_HELLJUDGEMENT2,chase,768,2,3000,500,5000,no,target,always,0,,,,,,,
 20811,ILL_KRAKEN@NPC_HELLJUDGEMENT2,attack,768,2,3000,500,5000,no,target,always,0,,,,,,,
 20811,ILL_KRAKEN@NPC_CLOUD_KILL,attack,739,5,2000,500,16000,no,target,always,0,,,,,,,
-20811,ILL_KRAKEN@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
+20811,ILL_KRAKEN@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,self,myhpltmaxrate,10,,,,,,,
 20811,ILL_KRAKEN@NPC_PHANTOMTHRUST,chase,741,5,1000,0,5000,no,self,always,0,,,,,,,
 20811,ILL_KRAKEN@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 20843,ILL_ABYSMAL_WITCH@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
@@ -13638,7 +13638,7 @@
 20843,ILL_ABYSMAL_WITCH@NPC_HELLJUDGEMENT2,chase,768,2,2000,500,5000,no,target,always,0,,,,,,,
 20843,ILL_ABYSMAL_WITCH@NPC_HELLJUDGEMENT2,attack,768,2,2000,500,5000,no,target,always,0,,,,,,,
 20843,ILL_ABYSMAL_WITCH@NPC_CLOUD_KILL,attack,739,5,2000,500,16000,no,target,always,0,,,,,,,
-20843,ILL_ABYSMAL_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
+20843,ILL_ABYSMAL_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,self,myhpltmaxrate,10,,,,,,,
 20843,ILL_ABYSMAL_WITCH@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 
 // Episode 17.2 - Sage's Legacy
@@ -14239,7 +14239,7 @@
 20934,R001_BESTIA@NPC_EARTHQUAKE,attack,653,5,10000,500,20000,no,self,myhpltmaxrate,40,,,,,,,
 20934,R001_BESTIA@NPC_PULSESTRIKE,attack,661,5,10000,0,15000,no,self,myhpltmaxrate,60,,,,,,,
 20934,R001_BESTIA@NPC_DRAGONFEAR,attack,659,5,10000,0,10000,no,self,always,0,,,,,,,
-// 20934,R001_BESTIA@NPC_DAMAGE_HEAL,attack,753,1,3000,1500,40000,no,target,myhpltmaxrate,20,,,,,,,
+// 20934,R001_BESTIA@NPC_DAMAGE_HEAL,attack,753,1,3000,1500,40000,no,self,myhpltmaxrate,20,,,,,,,
 
 // nif_dun
 20935,GAN_CEANN@NPC_CRITICALSLASH,attack,170,1,1000,500,5000,no,target,always,0,,,,,,,
@@ -14339,7 +14339,7 @@
 20943,DEATH_WITCH@NPC_HELLJUDGEMENT,chase,662,2,2000,500,5000,no,self,always,0,,,,,,,
 20943,DEATH_WITCH@NPC_HELLJUDGEMENT,attack,662,2,2000,500,5000,no,self,always,0,,,,,,,
 20943,DEATH_WITCH@NPC_CLOUD_KILL,attack,739,5,2000,500,16000,no,target,always,0,,,,,,,
-// 20943,DEATH_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
+// 20943,DEATH_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,self,myhpltmaxrate,10,,,,,,,
 20943,DEATH_WITCH@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 20943,DEATH_WITCH@NPC_CALLSLAVE,attack,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 
@@ -14570,7 +14570,7 @@
 21395,ILL_MAYA@NPC_CRITICALWOUND,attack,673,1,500,0,5000,yes,target,always,0,,,,,,,
 21395,ILL_MAYA@NPC_IMMUNE_PROPERTY,chase,754,4,1500,1500,60000,no,self,casttargeted,0,,,,,,,
 21395,ILL_MAYA@NPC_IMMUNE_PROPERTY,attack,754,1,1500,1500,60000,no,self,longrangeattacked,0,,,,,,,
-21395,ILL_MAYA@NPC_DAMAGE_HEAL,attack,753,1,500,1500,120000,no,target,myhpltmaxrate,50,,,,,,32,
+21395,ILL_MAYA@NPC_DAMAGE_HEAL,attack,753,1,500,1500,120000,no,self,myhpltmaxrate,50,,,,,,32,
 21395,ILL_MAYA@NPC_ALL_STAT_DOWN,attack,751,5,5000,1500,45000,no,target,always,0,,,,,,18,
 
 // Episode 18

db/re/quest_db.yml

@@ -1578,26 +1578,26 @@ Body:
   - Id: 3495
     Title: Conversation with Jeojin
   - Id: 3496
-    Title: Conversation with Squain
+    Title: Conversation with Skuain
   - Id: 3497
     Title: Conversation with Senado
   - Id: 3498
     Title: Conversation with Japer
   - Id: 3499
-    Title: Conversation with Shirouan
+    Title: Conversation with Shiroan
   - Id: 3500
-    Title: Conversation with Ishira
+    Title: Conversation with Isira
   - Id: 3501
-    Title: Conversation with Gina
+    Title: Conversation with Dina
   - Id: 3502
     Title: Conversation with Hari
   - Id: 3503
-    Title: Examine the Sky
+    Title: "[Daily] Opinion Gathering"
   - Id: 3504
-    Title: Look at the Sky - Standby
-  - Id: 3505
-    Title: Report to Junok
+    Title: "[Cooldown] Opinion Gathering"
     TimeLimit: 4h
+  - Id: 3505
+    Title: Completed Opinion Gathering
   - Id: 3507
     Title: Illusion Investigation Team - Sheshin
   - Id: 3508
@@ -3234,26 +3234,28 @@ Body:
     Title: "[Standby] Subjugation-Yanggeochon"
     TimeLimit: 4h
   - Id: 5932
-    Title: The Abused Child
+    Title: Abused Child
   - Id: 5933
-    Title: Business Plan Presentation
+    Title: Business Plan
   - Id: 5934
-    Title: Gathering Training (1)
+    Title: Foraging Practice (1)
   - Id: 5935
-    Title: Gathering Training (2)
+    Title: Foraging Practice (2)
   - Id: 5936
-    Title: Gathering Training (3)
+    Title: Foraging Practice (3)
   - Id: 5937
-    Title: "[Standby] Flower Room's work"
+    Title: "[Cooldown] Half Flower Gathering"
     TimeLimit: 4h
   - Id: 5938
-    Title: Gathering Half Flower
+    Title: "[Daily] Half Flower Gathering"
   - Id: 5939
-    Title: Gathering Half Flower
+    Title: "[Daily] Half Flower Gathering"
   - Id: 5940
-    Title: Gathering Half Flower
+    Title: "[Daily] Half Flower Gathering"
   - Id: 5941
-    Title: Gathering Half Flower
+    Title: "[Daily] Half Flower Gathering"
+  - Id: 5942
+    Title: Flower Room Opening Ceremony
   - Id: 6000
     Title: Job Change to Taekwon
   - Id: 6001
@@ -6316,55 +6318,55 @@ Body:
           DROSERA: true
           MUSCIPULAR: true
   - Id: 8681
-    Title: To Rachel (1)
+    Title: Towards Rachel (1)
   - Id: 8682
-    Title: To Rachel (2)
+    Title: Towards Rachel (2)
   - Id: 8683
-    Title: Please stop fighting
+    Title: Heated Argument
   - Id: 8684
-    Title: It's over
+    Title: State of Conflict
   - Id: 8685
-    Title: A suspicious movement detected in the temple
+    Title: Suspicious Movement
   - Id: 8686
-    Title: The Intruder of the Temple
+    Title: Intruder of the Temple
   - Id: 8687
-    Title: Did you break it?
+    Title: Staged Plot
   - Id: 8688
-    Title: Thanks for today's daily food
+    Title: Today's Daily Bread
   - Id: 8689
-    Title: Today's Daily food - Standby
+    Title: "[Cooldown] Today's Daily Bread"
     TimeLimit: 4h
   - Id: 8690
-    Title: Thanks for today's daily food
+    Title: "[Daily] Today's Daily Bread"
   - Id: 8691
-    Title: Sacred Relics for Essence (1)
+    Title: Water Purification (1)
   - Id: 8692
-    Title: Sacred Relics for Essence (2)
+    Title: Water Purification (2)
   - Id: 8693
-    Title: Sacred Relics for Essence (3)
+    Title: Water Purification (3)
   - Id: 8694
-    Title: Clean Water Procurement - Standby
+    Title: "[Cooldown] Water Purification"
     TimeLimit: 4h
   - Id: 8695
-    Title: Procurement of clean water (1)
+    Title: "[Daily] Water Purification (1)"
   - Id: 8696
-    Title: Procurement of clean water (2)
+    Title: "[Daily] Water Purification (2)"
   - Id: 8697
-    Title: Procurement of clean water (3)
+    Title: "[Daily] Water Purification (3)"
   - Id: 8698
-    Title: Late migration
+    Title: Horim's Bizarre Adventure (1)
   - Id: 8699
-    Title: First Step Out of the City
+    Title: Horim's Bizarre Adventure (2)
   - Id: 8700
-    Title: I couldn't even come halfway
+    Title: Horim's Bizarre Adventure (3)
   - Id: 8701
-    Title: Scenery I've Seen for the First Time
+    Title: Horim's Bizarre Adventure (4)
   - Id: 8702
-    Title: Smell of Volcanic Ash
+    Title: Horim's Bizarre Adventure (5)
   - Id: 8703
-    Title: The easy way to go
+    Title: Horim's Bizarre Adventure (6)
   - Id: 8718
-    Title: My friend's regards
+    Title: Greetings from a Friend
   - Id: 8719
     Title: A new area somewhere in the anthill
   - Id: 8720
@@ -8196,104 +8198,104 @@ Body:
     Title: Squirrels are rats, too? Standby
     TimeLimit: 4h
   - Id: 11696
-    Title: Niren's Request
+    Title: Niren's Request (1)
   - Id: 11697
-    Title: Niren's Request
+    Title: Niren's Request (2)
   - Id: 11698
-    Title: Niren's Request
+    Title: Niren's Request (3)
   - Id: 11699
-    Title: Niren's Request
+    Title: Niren's Request (4)
   - Id: 11700
-    Title: Niren's Request
+    Title: Niren's Request (5)
   - Id: 11701
-    Title: Niren's Request
+    Title: Niren's Request (6)
   - Id: 11702
-    Title: Niren's Request
+    Title: Niren's Request (7)
   - Id: 11703
-    Title: Niren's Request
+    Title: Niren's Request (8)
   - Id: 11704
-    Title: Niren's Request
+    Title: Gray Children (1)
   - Id: 11705
-    Title: Children of Grey
+    Title: Gray Children (2)
   - Id: 11706
-    Title: Children of Grey
+    Title: Gray Children (3)
   - Id: 11707
-    Title: Children of Grey
+    Title: Gray Children (4)
   - Id: 11708
-    Title: Children of Grey
+    Title: Gray Children (5)
   - Id: 11709
-    Title: Children of Grey
+    Title: Gray Children (6)
   - Id: 11710
-    Title: Children of Grey
+    Title: Gray Children (7)
   - Id: 11711
-    Title: Children of Grey
+    Title: Gray Children (8)
   - Id: 11712
-    Title: Children of Grey
+    Title: Gray Children (9)
   - Id: 11713
-    Title: Children of Grey
+    Title: Gray Children (10)
   - Id: 11714
-    Title: Children of Grey
+    Title: Gray Children (11)
   - Id: 11715
-    Title: Children of Grey
+    Title: Gray Children (12)
   - Id: 11716
-    Title: Children of Grey
+    Title: Gray Children (13)
   - Id: 11717
-    Title: Children of Grey
+    Title: Gray Children (14)
   - Id: 11718
-    Title: Children of Grey
+    Title: Gray Children (15)
   - Id: 11719
-    Title: Children of Grey
+    Title: Gray Children (16)
   - Id: 11720
-    Title: Children of Grey
+    Title: Gray Children (17)
   - Id: 11721
-    Title: Children of Grey
+    Title: Gray Children (18)
   - Id: 11722
-    Title: Children of Grey
+    Title: Gray Children (19)
   - Id: 11723
-    Title: Children of Grey
+    Title: Gray Children (20)
   - Id: 11724
-    Title: Children of Grey
+    Title: Gray Children (21)
   - Id: 11725
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (1)
   - Id: 11726
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (2)
   - Id: 11727
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (3)
   - Id: 11728
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (4)
   - Id: 11729
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (5)
   - Id: 11730
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (6)
     Targets:
       - Id: 1
         Location: oz_dun01
         Count: 10
   - Id: 11731
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (7)
   - Id: 11732
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (8)
   - Id: 11733
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (9)
   - Id: 11734
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (10)
   - Id: 11735
-    Title: Investigation of Oz Labyrinth
+    Title: The Labyrinth and the Merchant (11)
   - Id: 11736
-    Title: Maze of Oz 1st Floor (170lv)
+    Title: Oz Labyrinth 1F (170lv)
     Targets:
       - Mob: EP18_ASH_TOAD
         Count: 20
   - Id: 11737
-    Title: Maze of Oz Level 1 - Standby
+    Title: "[Cooldown] Oz Labyrinth 1F"
     TimeLimit: 4h
   - Id: 11738
-    Title: Maze of Oz Level 2 (200lv)
+    Title: Oz Labyrinth 2F (200lv)
     Targets:
       - Mob: EP18_HOT_MOLAR
         Count: 20
   - Id: 11739
-    Title: Maze of Oz Level 2 (200lv)
+    Title: "[Cooldown] Oz Labyrinth 2F"
     TimeLimit: 4h
   - Id: 12000
     Title: An old friend
@@ -9335,30 +9337,30 @@ Body:
     Title: Let's try again to seal the crack
     TimeLimit: 4h
   - Id: 12520
-    Title: Villa of Deception
+    Title: "[Normal] Villa of Deception"
   - Id: 12521
-    Title: Villa of Deception Hard
+    Title: "[Hard] Villa of Deception"
   - Id: 12522
-    Title: Cooldown: Villa of Deception
+    Title: "[Cooldown] Villa of Deception"
     TimeLimit: 4h
   - Id: 12531
-    Title: Future General Candidate
+    Title: Transporting Goods
   - Id: 12532
-    Title: Trouble at the Top
+    Title: Broken Wagon
   - Id: 12533
-    Title: The Hidden Helper
+    Title: Hidden Helper
   - Id: 12534
-    Title: The Missing Camille
+    Title: Missing Camille
   - Id: 12535
-    Title: The Governor's Decision
+    Title: Chief Decision
   - Id: 12536
-    Title: The Scattered Luggage (North)
+    Title: Scattered Goods (North)
   - Id: 12537
-    Title: Scattered Luggage (West)
+    Title: Scattered Goods (West)
   - Id: 12538
-    Title: The Scattered Luggage (East)
+    Title: Scattered Goods (East)
   - Id: 12539
-    Title: Scattered Luggage (South)
+    Title: Scattered Goods (South)
   - Id: 13000
     Title: RWC2011Card Gathering
   - Id: 13001
@@ -11512,84 +11514,84 @@ Body:
       - Mob: EP18_FIREWIND_KITE
         Count: 30
   - Id: 16549
-    Title: I can't sleep
+    Title: "[Daily] I can't sleep"
     Targets:
       - Mob: EP18_FIREWIND_KITE
         Count: 30
   - Id: 16550
-    Title: I Can't Sleep - Wait
+    Title: "[Cooldown] I can't sleep"
     TimeLimit: 4h
   - Id: 16551
-    Title: The Story of Dinar
+    Title: Collecting Folklore (1)
   - Id: 16552
-    Title: Amira's Story
+    Title: Collecting Folklore (2)
   - Id: 16553
-    Title: Shanina's Grandma's Story
+    Title: Collecting Folklore (3)
   - Id: 16554
-    Title: Please collect the stories
+    Title: Collecting Folklore (4)
   - Id: 16555
-    Title: The Story of Dinar
+    Title: "[Daily] Dinar's Story"
   - Id: 16556
-    Title: Amira's Story
+    Title: "[Daily] Amira's Story"
   - Id: 16557
-    Title: Shanina's Grandma's Story
+    Title: "[Daily] Shanina's Story"
   - Id: 16558
-    Title: Please collect the stories
+    Title: "[Daily] Collecting Folklore"
   - Id: 16559
-    Title: Please collect the stories - Standby
+    Title: "[Cooldown] Collecting Folklore"
     TimeLimit: 4h
   - Id: 16560
-    Title: This is not the place
+    Title: Ahab's Gossip (1)
   - Id: 16561
-    Title: This is not the place
+    Title: Ahab's Gossip (2)
   - Id: 16562
-    Title: This is not the place
+    Title: Ahab's Gossip (3)
   - Id: 16563
-    Title: This is not the place
+    Title: Ahab's Gossip (4)
   - Id: 16564
-    Title: This is not the place
+    Title: Ahab's Gossip (5)
   - Id: 16565
-    Title: This is not the place
+    Title: Ahab's Gossip (6)
   - Id: 16566
-    Title: This is not the place
+    Title: Ahab's Gossip (7)
   - Id: 16567
-    Title: The Contest of the Grey Wolf Forest
+    Title: Gray Wolf Forest Tournament (1)
   - Id: 16568
-    Title: Everyone's Opinion
+    Title: People's Opinion (1)
   - Id: 16569
-    Title: Everyone's Opinion
+    Title: People's Opinion (2)
   - Id: 16570
-    Title: Everyone's Opinion
+    Title: People's Opinion (3)
   - Id: 16571
-    Title: Everyone's Opinion
+    Title: People's Opinion (4)
   - Id: 16572
-    Title: The Contest of the Grey Wolf Forest
+    Title: Gray Wolf Forest Tournament (2)
   - Id: 16573
-    Title: Source of Weapon
+    Title: Source of Weapons (1)
   - Id: 16574
-    Title: Source of Weapon
+    Title: Source of Weapons (2)
   - Id: 16575
-    Title: Source of Weapon
+    Title: Source of Weapons (3)
   - Id: 16576
-    Title: Source of Weapon
+    Title: Source of Weapons (4)
   - Id: 16577
-    Title: Source of Weapon
+    Title: Source of Weapons (5)
   - Id: 16578
-    Title: Source of Weapon
+    Title: Source of Weapons (6)
   - Id: 16579
-    Title: Source of Weapon
+    Title: Source of Weapons (7)
   - Id: 16580
-    Title: Source of Weapon
+    Title: Source of Weapons (8)
   - Id: 16581
-    Title: Children Know It
+    Title: Even children know (1)
   - Id: 16582
-    Title: Children Know It
+    Title: Even children know (2)
   - Id: 16583
-    Title: Children Know It
+    Title: Even children know (3)
   - Id: 16584
-    Title: The Price of Labor
+    Title: The Price of Labor (1)
   - Id: 16585
-    Title: The Price of Labor
+    Title: The Price of Labor (2)
   - Id: 17000
     Title: Meet with Father Bamph
   - Id: 17001
@@ -11852,62 +11854,62 @@ Body:
     Title: (Standby) Thanatos Tower, 12th floor
     TimeLimit: 4h
   - Id: 17504
-    Title: Where's My Home
+    Title: Where is My Home (1)
   - Id: 17505
-    Title: Where's My Home
+    Title: Where is My Home (2)
   - Id: 17506
-    Title: Where's My Home
+    Title: Where is My Home (3)
   - Id: 17507
-    Title: Where's My Home
+    Title: Where is My Home (4)
   - Id: 17508
-    Title: Lack of Supplies
+    Title: "[Daily] Shortage of Supplies"
     Drops:
       - Mob: EP18_GREY_WOLF
         Item: Ep18_Very_Ddan_Crystal
         Rate: 5000
   - Id: 17509
-    Title: (Standby) Lack of supplies
+    Title: "[Cooldown] Shortage of Supplies"
     TimeLimit: 4h
   - Id: 17510
-    Title: There are no bad beasts in the world
+    Title: There are no evil beasts in this world (1)
   - Id: 17511
-    Title: There are no bad beasts in the world
+    Title: There are no evil beasts in this world (2)
   - Id: 17512
-    Title: There are no bad beasts in the world
+    Title: There are no evil beasts in this world (3)
   - Id: 17513
-    Title: The Unexpected Shepherd
+    Title: An Unexpected Shepherd (1)
   - Id: 17514
-    Title: The Unexpected Shepherd
+    Title: An Unexpected Shepherd (2)
     Targets:
       - Mob: EP18_ASHRING
         Count: 20
   - Id: 17515
-    Title: The Unexpected Shepherd
+    Title: An Unexpected Shepherd (3)
   - Id: 17516
-    Title: (Standby) Unexpected shepherd
+    Title: "[Cooldown] An Unexpected Shepherd"
     TimeLimit: 4h
   - Id: 17517
-    Title: The Rebels
+    Title: Rebellion (1)
   - Id: 17518
-    Title: The Rebels
+    Title: Rebellion (2)
   - Id: 17519
-    Title: The Rebels
+    Title: Rebellion (3)
   - Id: 17520
-    Title: Wolf in the Sheep
+    Title: Wolf Among Sheep (1)
   - Id: 17521
-    Title: When you need a conversation
+    Title: Wolf Among Sheep (2)
   - Id: 17522
-    Title: Cleaning the Traitors
+    Title: Wolf Among Sheep (3)
   - Id: 17523
-    Title: Purification of the Sanctuary
+    Title: Sanctuary Purification
   - Id: 17524
-    Title: Cleaning the Traitors
+    Title: "[Completed] Renegade Cleaning"
   - Id: 17525
-    Title: When you need a conversation
+    Title: Aftermath
   - Id: 17526
-    Title: Purification of the Sanctuary
+    Title: "[Completed] Sanctuary Purification"
   - Id: 17527
-    Title: (Standby) Cleaning strategy
+    Title: "[Cooldown] Sanctuary Purification"
     TimeLimit: 4h
   - Id: 17566
     Title: (Standby) Code name! Is it a star button?
@@ -12035,21 +12037,21 @@ Body:
     Title: Goseong dungeon 1st floor attack
     TimeLimit: 4h
   - Id: 18082
-    Title: Eligibility to Participate in the Competition
+    Title: Eligibility to attend the competition
   - Id: 18083
-    Title: Investigation of Daishinkan's Villa
+    Title: High Priest's Villa
   - Id: 18084
-    Title: Fact Investigation
+    Title: Fact Finding
   - Id: 18085
-    Title: The Direction of Prayer
+    Title: Direction of Prayer
   - Id: 18086
-    Title: Make the Grey Wolf Forest Safer
+    Title: "[Daily] Gray Wolf Forest Hunting"
     Targets:
       - Id: 1
         Location: gw_fild01
         Count: 30
   - Id: 18087
-    Title: Safer in the Gray Wolf Forest - Standby
+    Title: "[Cooldown] Gray Wolf Forest Hunting"
     TimeLimit: 4h
   - Id: 18100
     Title: Legends from Moscovia

db/re/skill_db.yml

@@ -43106,7 +43106,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Hit: Single
     AfterCastWalkDelay: 1000
     Cooldown: 1000
     Requires:
@@ -43118,7 +43117,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Hit: Single
     AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
@@ -43149,8 +43147,6 @@ Body:
     Name: HAMI_SKIN
     Description: Adamantium Skin
     MaxLevel: 5
-    DamageFlags:
-      NoDamage: true
   - Id: 8008
     Name: HAMI_BLOODLUST
     Description: Bloodlust
@@ -43158,7 +43154,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Hit: Single
     AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1

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

db/re/statpoint.yml

@@ -612,3 +612,48 @@ Body:
   - Level: 260
     Points: 4099
     TraitPoints: 228
+  - Level: 261
+    Points: 4099
+    TraitPoints: 231
+  - Level: 262
+    Points: 4099
+    TraitPoints: 234
+  - Level: 263
+    Points: 4099
+    TraitPoints: 237
+  - Level: 264
+    Points: 4099
+    TraitPoints: 240
+  - Level: 265
+    Points: 4099
+    TraitPoints: 247
+  - Level: 266
+    Points: 4099
+    TraitPoints: 250
+  - Level: 267
+    Points: 4099
+    TraitPoints: 253
+  - Level: 268
+    Points: 4099
+    TraitPoints: 256
+  - Level: 269
+    Points: 4099
+    TraitPoints: 259
+  - Level: 270
+    Points: 4099
+    TraitPoints: 266
+  - Level: 271
+    Points: 4099
+    TraitPoints: 269
+  - Level: 272
+    Points: 4099
+    TraitPoints: 272
+  - Level: 273
+    Points: 4099
+    TraitPoints: 275
+  - Level: 274
+    Points: 4099
+    TraitPoints: 278
+  - Level: 275
+    Points: 4099
+    TraitPoints: 285

db/re/status.yml

@@ -86,7 +86,7 @@ Body:
     Opt1: StoneWait
     Flags:
       SendOption: true
-      BossResist: true      
+      BossResist: true
       StopAttacking: true
     Fail:
       Whiteimprison: true
@@ -1822,6 +1822,7 @@ Body:
     Icon: EFST_ETERNALCHAOS
     DurationLookup: BD_ETERNALCHAOS
     CalcFlags:
+      Def: true
       Def2: true
     Flags:
       NoDispell: true
@@ -2618,6 +2619,9 @@ Body:
     CalcFlags:
       Batk: true
       Watk: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
   - Status: Fleet
     DurationLookup: HFLI_FLEET
     CalcFlags:
@@ -2631,7 +2635,11 @@ Body:
   - Status: Defence
     DurationLookup: HAMI_DEFENCE
     CalcFlags:
+      Def: true
       Vit: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
   - Status: Incaspdrate
     CalcFlags:
       Aspd: true
@@ -4130,7 +4138,7 @@ Body:
       Unlimitedhummingvoice: true
       Sircleofnature: true
   - Status: Deepsleep
-    Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
+    Icon: EFST_DEEP_SLEEP
     DurationLookup: WM_LULLABY_DEEPSLEEP
     States:
       NoCast: true
@@ -7014,7 +7022,9 @@ Body:
     CalcFlags:
       Regen: true
   - Status: Earthshaker
+    Icon: EFST_EARTHSHAKER
     Flags:
+      BlEffect: true
       NoWarning: true
   - Status: Weaponblock_On
     Icon: EFST_WEAPONBLOCK_ON
@@ -7029,6 +7039,7 @@ Body:
     Icon: EFST_SPORE_EXPLOSION_DEBUFF
     DurationLookup: GN_SPORE_EXPLOSION
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -7450,7 +7461,7 @@ Body:
       NoClearance: true
       NoClearbuff: true
   - Status: Madogear
-    Icon: EFST_MADOGEAR
+    Icon: EFST_MADOGEAR_TYPE
     CalcFlags:
       Speed: true
     Flags:
@@ -7964,6 +7975,8 @@ Body:
     DurationLookup: EM_SPELL_ENCHANTING
     CalcFlags:
       Smatk: true
+    Flags:
+      DisplayPc: true
   - Status: Summon_Elemental_Ardor
     Icon: EFST_SUMMON_ELEMENTAL_ARDOR
     DurationLookup: EM_SUMMON_ELEMENTAL_ARDOR
@@ -8015,17 +8028,23 @@ Body:
     DurationLookup: TR_MUSICAL_INTERLUDE
     CalcFlags:
       Res: true
+    Flags:
+      DisplayPc: true
   - Status: Jawaii_Serenade
     Icon: EFST_JAWAII_SERENADE
     DurationLookup: TR_JAWAII_SERENADE
     CalcFlags:
       Smatk: true
       Speed: true
+    Flags:
+      DisplayPc: true
   - Status: Pron_March
     Icon: EFST_PRON_MARCH
     DurationLookup: TR_PRON_MARCH
     CalcFlags:
       Patk: true
+    Flags:
+      DisplayPc: true
   - Status: Roseblossom
     Icon: EFST_ROSEBLOSSOM
     DurationLookup: TR_ROSEBLOSSOM
@@ -8039,6 +8058,8 @@ Body:
       Powerful_Faith: true
       Firm_Faith: true
       Sincere_Faith: true
+    Flags:
+      DisplayPc: true
   - Status: Sincere_Faith
     Icon: EFST_SINCERE_FAITH
     DurationLookup: IQ_SINCERE_FAITH

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

doc/atcommands.txt

@@ -1250,6 +1250,11 @@ Adds a card or enchant to the specific slot of the equipment.
 
 ---------------------------------------
 
+@resetcooltime
+/resetcooltime
+
+Resets the cooldown of all skills of the player and if active also of the homunculus or the mercenary.
+
 ==============================
 | 5. Administrative Commands |
 ==============================

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

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).
@@ -474,3 +523,9 @@ Hides monster's HP bar on a map.
 Ignores config value of 'monster_hp_bars_info'.
 
 ---------------------------------------
+
+*specialpopup	<popup ID>
+
+Displays a special popup when a player enters the map. See script command "specialpopup" for details on different popup types.
+
+---------------------------------------

doc/script_commands.txt

@@ -6124,11 +6124,12 @@ will always return 0.
 
 ---------------------------------------
 
-*skilleffect <skill id>,<number>;
-*skilleffect "<skill name>",<number>;
+*skilleffect <skill id>,<number>{,<game ID>};
+*skilleffect "<skill name>",<number>{,<game ID>};
 
 This command displays visual and aural effects of given skill on currently
-attached character. The number parameter is for skill whose visual effect
+attached character or, when defined, on any unit with the given ID.
+The number parameter is for skill whose visual effect
 involves displaying of a number (healing or damaging). Note, that this command
 will not actually use the skill, it is intended for scripts, which simulate
 skill usage by the NPC, such as buffs, by setting appropriate status and
@@ -8508,6 +8509,15 @@ Opens the tip box UI for the attached player or the given character ID.
 
 This command requires packet version 2017-11-22 or newer.
 
+---------------------------------------
+
+*specialpopup(<popup ID>);
+
+Open popup and/or show text by ID from list defined in the client spopup.lub file.
+Popup and text is only visible if the player warped from one map to another map.
+
+This command requires packet version 2022-10-05 or newer.
+
 ---------------------------------------
 \\
 6,1.- Unit-related commands
@@ -10681,6 +10691,7 @@ current invoking character.
 *addhomintimacy <amount>{,<char_id>};
 
 Increase or decrease a homunculus' intimacy value by the given <amount>. 100000 is full loyalty.
+Fails silently when no players are attached or if the player has no homunculus.
 
 ---------------------------------------
 

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.

doc/status_change.txt

@@ -1012,9 +1012,12 @@ SC_CHANGE	(EFST_HLIF_CHANGE)
 	val2: VIT increase (20 * val1)
 	val3: INT increase (30 * val1)
 
-SC_BLOODLUST	()
-	desc:
-	val1:
+SC_BLOODLUST	(EFST_HAMI_BLOODLUST)
+	desc: Increase the homunculus ATK and has a chance to leech HP from the target
+	val1: Skill Level
+	val2: ATK increase (20 + (10 * val1))
+	val3: Chance to leech HP (9 * val1)%
+	val4: Leeched HP percentage 20%
 
 SC_FLEET	()
 	desc:
@@ -1024,10 +1027,10 @@ SC_SPEED	()
 	desc:
 	val1:
 
-SC_DEFENCE	()
-	desc: Increase Defense, HAMI_DEFENCE effect
-	val1: (none)
-	val2: + Def(Pre-renewal) or VIT (Renewal)
+SC_DEFENCE	(EFST_HAMI_DEFENCE)
+	desc: Increase VIT and as result VIT-based DEF of the Player and plain VIT of the Homunculus
+	val1: Skill Level
+	val2: VIT increase for players, DEF increase for homunculus (5 + (5 * val1)) [Renewal], (2 * val1) [Pre-Renewal]
 
 SC_INCASPDRATE	()
 	desc: Increase ASPD

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

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

npc/jobs/2-1/assassin.txt

@@ -1,15 +1,9 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Assassin Job Quest
-//===== By: ================================================== 
-//= kobra_k88
-//===== Current Version: ===================================== 
-//= 3.7
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Job Change quest for Assassin class.
-//===== Additional Comments: ================================= 
+//===== Changelog: ===========================================
 //= 1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
 //=     Also converted the booby traps from the aegis script.[kobra_k88]
 //= 1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
@@ -28,7 +22,7 @@
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
 //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]
-//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I 
+//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I
 //=     was still able to bypass it) [Toms]
 //= 2.4 Fixed skipping of Nameless NPC [Lupus]
 //= 2.5 Fixed a Rogue exploit [Lupus]
@@ -50,8 +44,8 @@
 //= 3.5 Fixed the waitingroom where player can enter the Test Area without passing the written exam. Now player will not be warp inside the Test Area when did not passed the written exam instead the player will be warp back to the written exam entrance [JayPee]
 //= 3.6 Fixed broken event calls. [Euphy]
 //= 3.7 Fixed issue that the player can't progress in the quest if timed out at weapon reward step. This issue is fixed on iRO but not on kRO. [https://forums.warpportal.com/index.php?/topic/130060-didnt-receive-necklace-of-oblivion-when-changing-assassin/#entry1496042] [MrAntares]
-//= 3.8 Another 'unofficial fix'. Player can't change job if time out after the necklace is deleted.
-//============================================================ 
+//= 3.8 Another 'unofficial fix'. Player can't change job if time out after the necklace is deleted. [Atemo]
+//============================================================
 
 in_moc_16,19,33,1	script	Guildsman#asn	55,{
 	if (Upper == 1) {
@@ -86,7 +80,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 			mes "Well then,";
 			mes "go for it!";
 			close2;
-			set ASSIN_Q,0;
+			ASSIN_Q = 0;
 			warp "in_moc_16",19,76;
 			end;
 		}
@@ -96,9 +90,10 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 		mes "[Ferocious-looking guy]";
 		mes "You'll have to walk if you want to get back to town. Oh, and don't forget to save your spawn point, alright?";
 		close2;
-		set ASSIN_Q,0;
-		set ASSIN_Q2,0;
-		set ASSIN_Q3,0;
+		ASSIN_Q = 0;
+		ASSIN_Q2 = 0;
+		if (ASSIN_Q3 < 3)
+			ASSIN_Q3 = 0;
 		savepoint "in_moc_16",18,14,1,1;
 		warp "in_moc_16",18,14;
 		end;
@@ -257,7 +252,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 					mes "It's been a while since I've received a guest. I'm sending";
 					mes "you to the office.";
 					close2;
-					set ASSIN_Q,0;
+					ASSIN_Q = 0;
 					if (checkquest(8000) != -1) {
 						changequest 8000,8001;
 					} else {
@@ -553,8 +548,9 @@ OnTouch_:
 				mes "Alright then,";
 				mes "best of luck to you!";
 				close2;
-				set ASSIN_Q3,1;
-				set ASSIN_Q,1;
+				if (ASSIN_Q3 < 3)
+					ASSIN_Q3 = 1;
+				ASSIN_Q = 1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@@ -576,8 +572,9 @@ OnTouch_:
 				mes "to the Test Hall.";
 				mes "Best of luck~";
 				close2;
-				set ASSIN_Q3,2;
-				set ASSIN_Q,1;
+				if (ASSIN_Q3 < 3)
+					ASSIN_Q3 = 2;
+				ASSIN_Q = 1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@@ -602,9 +599,8 @@ OnTouch_:
 				mes "Eh, get outta here.";
 				mes "Stop wastin' my time...";
 				close2;
-				set ASSIN_Q,0;
-				set ASSIN_Q3,0;
-				set ASSIN_Q2,0;
+				ASSIN_Q = 0;
+				ASSIN_Q2 = 0;
 				erasequest 8001;
 				warp "moc_fild16",206,229;
 				end;
@@ -630,8 +626,9 @@ OnTouch_:
 				mes "[Assassin 'Khai']";
 				mes "Are you done filling out the form? Alright, give it to me so I can send you to the Test Hall. Good luck~";
 				next;
-				set ASSIN_Q3,1;
-				set ASSIN_Q,1;
+				if (ASSIN_Q3 < 3)
+					ASSIN_Q3 = 1;
+				ASSIN_Q = 1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@@ -644,8 +641,9 @@ OnTouch_:
 				mes "Then give me the form so that I can send you to the Test Hall, alright?";
 				mes "Good luck...";
 				next;
-				set ASSIN_Q3,2;
-				set ASSIN_Q,1;
+				if (ASSIN_Q3 < 3)
+					ASSIN_Q3 = 2;
+				ASSIN_Q = 1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@@ -711,7 +709,7 @@ OnTouch_:
 			mes "Although I am heartless,";
 			mes "I am not necessarily cruel. Before we proceed, is there anything you wish to know?";
 			next;
-			set ASSIN_Q2,0;
+			ASSIN_Q2 = 0;
 			while(ASSIN_Q2 < 3) {
 				switch(select("...Skills?:...Stats?:Hmpf, I know it all.")) {
 				case 1:
@@ -774,7 +772,7 @@ OnTouch_:
 					mes "Now...";
 					mes "That's all I have to tell you";
 					mes "about Assassin skills.";
-					set ASSIN_Q2,1;
+					ASSIN_Q2 = 1;
 					next;
 					break;
 				case 2:
@@ -787,7 +785,7 @@ OnTouch_:
 					next;
 					mes "[The Anonymous One]";
 					mes "I cannot give you better advice than that in regards to Stats. You should research and see which stats suit you, and decide what kind of Assassin you want to be.";
-					set ASSIN_Q2,2;
+					ASSIN_Q2 = 2;
 					next;
 					break;
 				case 3:
@@ -797,7 +795,7 @@ OnTouch_:
 						mes "I'll be the judge of that!";
 						next;
 					}
-					set ASSIN_Q2,3;
+					ASSIN_Q2 = 3;
 					break;
 				}
 			}
@@ -847,53 +845,53 @@ OnTouch_:
 			mes "1. Choose skill that is not required to learn Grimtooth.";
 			next;
 			if (select("Cloaking level 2:Sonic Blow level 5:Katar Mastery level 4:Right hand Mastery level 2") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "2. What property does Enchant Poison possess?";
 			next;
 			if (select("Poison:Earth:Fire:Wind") == 1)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "3. How does Level 4 Right Hand Mastery work?";
 			next;
 			if (select("Recover 80% of damage decrease:Recover 90% of damage decrease:Increase 90% of damage:Increase 108% of damage") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "4. What is the item required for using Venom Dust?";
 			next;
 			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "5. Which skill can you learn when you reach Level 5 Enchant Poison?";
 			next;
 			if (select("Envenom:Sonic Blow:Venom Splasher:Venom Dust") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "6. Among the following skills, which allows you to walk while invisible?";
 			next;
 			if (select("Hiding:Back Slide:Cloaking:Sand Attack") == 3)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "7. Choose the condition that is unrelated to Venom Splasher.";
 			next;
 			if (select("Poisoned target.:Red Gemstone.:Remaing HP of Target.") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "8. Which monster is weak to a weapon with Vadon card (adds 20% damage on Fire property monster)?";
 			next;
 			if (select("Steel Chonchon:Deviruchi:Elder Willow:Baphomet") == 3)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "9. How much SP does";
 			mes "Double Attack need?";
 			next;
 			if (select("15:It's a passive skill, so SP use is 0.:It's passive skill, so SP use is 10.:54") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "10. What is the best elemental Main Gauche weapon for hunting in Izlude dungeon?";
 			next;
 			if (select("Wind Main Gauche:Ice Main Gauche:Earth Main Gauche:Fire Main Gauche") == 1)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			break;
 		case 2:
 			mes "[The Anonymous One]";
@@ -901,104 +899,104 @@ OnTouch_:
 			mes "drops a slotted Katar?";
 			next;
 			if (select("Thief Bug:Peco Peco:Desert Wolf:Hammer Cobolt") == 3)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "2. Which monster";
 			mes "drops a slotted Jur?";
 			next;
 			if (select("Martin:Desert Wolf:Marionette:Myst") == 1)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "3. Which class is allowed to craft elemental weapons?";
 			next;
 			if (select("Merchant:Blacksmith:Thief:Priest") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "4. Choose the weapon which is not in the Katar class.";
 			next;
 			if (select("Jamadhar:Jur:Katar:Gladius") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "5. What property do Izlude dungeon monsters posses?";
 			next;
 			if (select("Water:Fire:Wind:Earth") == 1)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "6. Which monster";
 			mes "cannot be a Cute Pet?";
 			next;
 			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "7. Choose a monster that Fire property Daggers work the best on.";
 			next;
 			if (select("Dagger Goblin:Mace Goblin:Morning Star Goblin:Hammer Goblin") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "8. Choose the non-elemental Katar from the following:";
 			next;
 			if (select("Katar of Raging Blaze:Katar of Dusty Thornbush:Sharpened Legbone of Ghoul:Infiltrator") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "9. Which is the uncommon monster?";
 			next;
 			if (select("Poring:Mastering:Ghostring:Spore") == 3)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "10. Choose the monster";
 			mes "that is not Undead.";
 			next;
 			if (select("Drake:Megalodon:Spore:Khalitzburg") == 3)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			break;
 		case 3:
 			mes "[The Anonymous One]";
 			mes "1. Choose the correct amount of the maximum dodge rate increase from the 'Increase Dodge' skill when at level 10.";
 			next;
 			if (select("30:40:160:20") == 1)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "2. Choose a monster which detects hiding/cloaking Thieves and Assassins.";
 			next;
 			if (select("Worm Tail:Andre:Mummy:Soldier Skeleton") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "3. Choose a group of weapons that cannot be used by an Assassin at once.";
 			next;
 			if (select("Main Gaughe + Gladius:Stiletto + Main Gauche:Katar + Maingauche:Hammer + Stiletto") == 3)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "4. Choose the town where Thieves can change their jobs.";
 			next;
 			if (select("Prontera:Lutie:Alberta:Morocc") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "5. Choose a card that does not affect the AGI stat.";
 			next;
 			if (select("Baphomet Jr. card:Whisper Card:Female Thiefbug card:Male Thiefbug card") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "6. Choose the correct specialty of the Assassin class.";
 			next;
 			if (select("Excellent singing talent:Excellent reading talent:Excellent dancing talent:Excellent dodge ability") == 4)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "7. Choose the maximum AGI bonus an Assassin can get at job level 50.";
 			next;
-			if (select("7:8:9:10") == 4) 
-				set .@assassin_t,.@assassin_t+10;
+			if (select("7:8:9:10") == 4)
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "8. Choose the item that an Assassin cannot equip.";
 			next;
-			if (select("Dagger:Helm:Boots:Brooch") == 2) 
-				set .@assassin_t,.@assassin_t+10;
+			if (select("Dagger:Helm:Boots:Brooch") == 2)
+				.@assassin_t += 10;
 			mes "[The Anonymous One]";
 			mes "9. Choose the job change item for Thief.";
 			next;
 			switch(select("Orange Gooey Mushroom:Red Gooey Mushroom:Orange Net Mushroom:Orange Hair Mushroom")) {
 			case 1:
 			case 3:
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 				break;
 			default:
 				break;
@@ -1007,7 +1005,7 @@ OnTouch_:
 			mes "10. Choose a card that would typically benefit an Assassin the least.";
 			next;
 			if (select("Whisper card:Elder Willow card:Soldier Skeleton card:Cobold card") == 2)
-				set .@assassin_t,.@assassin_t+10;
+				.@assassin_t += 10;
 			break;
 		}
 		if (ASSIN_Q2 == 3) {
@@ -1023,7 +1021,7 @@ OnTouch_:
 			mes "You scored";
 			mes "" + .@assassin_t + " percent...";
 			if (.@assassin_t > 80) {
-				set ASSIN_Q2,5;
+				ASSIN_Q2 = 5;
 				changequest 8002,8003;
 				mes "Well done.";
 				mes "You pass.";
@@ -1033,7 +1031,7 @@ OnTouch_:
 				close;
 			}
 			else {
-				set ASSIN_Q2,4;
+				ASSIN_Q2 = 4;
 				mes "That means you fail!";
 				next;
 				mes "[The Anonymous One]";
@@ -1060,7 +1058,7 @@ OnTouch_:
 			mes "You scored";
 			mes "" + .@assassin_t + " points...";
 			if (.@assassin_t > 80) {
-				set ASSIN_Q2,5;
+				ASSIN_Q2 = 5;
 				changequest 8002,8003;
 				next;
 				mes "[The Anonymous One]";
@@ -1068,7 +1066,7 @@ OnTouch_:
 				close;
 			}
 			else {
-				set ASSIN_Q2,4;
+				ASSIN_Q2 = 4;
 				mes "You failed!";
 				next;
 				mes "[The Anonymous One]";
@@ -1194,9 +1192,8 @@ OnTouch_:
 		mes "I guess you";
 		mes "could use a break...";
 		close2;
-		set ASSIN_Q,0;
-		set ASSIN_Q3,0;
-		set ASSIN_Q2,0;
+		ASSIN_Q = 0;
+		ASSIN_Q2 = 0;
 		changequest 8003,8000;
 		warp "in_moc_16",19,13;
 		end;
@@ -1207,7 +1204,7 @@ in_moc_16,1,1,0	script	Beholder#ASNTEST	-1,{
 	end;
 
 OnEnable:
-	set .MyMobs,6;
+	.MyMobs = 6;
 	// Target mobs
 	monster "in_moc_16",62,161,"Job change target",1002,1,"Beholder#ASNTEST::OnMyMobDead";
 	monster "in_moc_16",85,169,"Job change target",1063,1,"Beholder#ASNTEST::OnMyMobDead";
@@ -1267,15 +1264,15 @@ OnResetmob:
 	end;
 
 OnMyMobDead:
-	set .MyMobs,.MyMobs-1;
+	.MyMobs--;
 	if (.MyMobs < 1) {
 		mapannounce "in_moc_16","You seem to be doing quite well. Keep it up!",bc_map;
-		set ASSIN_Q,3;
+		ASSIN_Q = 3;
 		changequest 8003,8004;
 		donpcevent "timestopper#1::OnEnable";
 		donpcevent "Keeper of the Door#ASN::OnEnable";
 		donpcevent "Beholder#ASNTEST::OnResetmob";
-		set .DisableTraps,1;
+		.DisableTraps = 1;
 		stopnpctimer;
 	}
 	else {
@@ -1285,7 +1282,7 @@ OnMyMobDead:
 
 OnMyMobDead2:
 	mapannounce "in_moc_16",strcharinfo(0) + "! You made a mistake! I'm bringing you back!",bc_map;
-	set ASSIN_Q,2;
+	ASSIN_Q = 2;
 	warp "in_moc_16",19,161;
 	donpcevent "Beholder#ASNTEST::OnReset";
 	end;
@@ -1341,7 +1338,7 @@ OnTimer184000:
 OnTimer185000:
 	mapannounce "in_moc_16","Time's up!",bc_map;
 	mapannounce "in_moc_16","Well, good job... If you wanted to waste your time. You'll have to try again!",bc_map;
-	//set ASSIN_Q,2;
+	//ASSIN_Q = 2;
 	end;
 
 OnTimer186000:
@@ -1357,7 +1354,7 @@ in_moc_16,68,158,0	script	01_1::SinTrap	-1,0,0,{
 OnTouch_:
 	if (getvariableofnpc(.DisableTraps,"Beholder#ASNTEST")  < 1) {
 		mapannounce "in_moc_16",strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map;
-		set ASSIN_Q,2;
+		ASSIN_Q = 2;
 		warp "in_moc_16",19,161;
 		donpcevent "Beholder#ASNTEST::OnResetmob";
 		donpcevent "Standby Room#ASNTEST::OnStart";
@@ -1457,9 +1454,9 @@ OnInit:
 OnTouch_:
 	donpcevent "Thomas#ASNTEST::OnDisable";
 	if (ASSIN_Q == 3)
-		set ASSIN_Q,3;
+		ASSIN_Q = 3;
 	else
-		set ASSIN_Q,4;
+		ASSIN_Q = 4;
 	warp "in_moc_16",87,102;
 	savepoint "in_moc_16",16,13,1,1;
 	end;
@@ -1487,13 +1484,13 @@ OnTimer187000:
 OnDisable:
 	stopnpctimer;
 	end;
-	
+
 OnMyMobDead:
 	mapannounce "in_moc_16","Hey, what the hell was that?! I told you: No killing monsters!",bc_map;
 	mapannounce "in_moc_16","I'm bringing you back... *Sigh...*",bc_map;
-	set ASSIN_Q,3;
+	ASSIN_Q = 3;
 	warp "in_moc_16",87,102;
-	killmonsterall "in_moc_16";
+	killmonster "in_moc_16","timestopper#1::OnMyMobDead";
 	end;
 }
 
@@ -1525,9 +1522,8 @@ OnTouch_:
 			mes "Oh hey, don't forget to save your respawn point in town.";
 			close2;
 			mapannounce "in_moc_16",strcharinfo(0) + " got scared and quit the test...Who's Next?!",bc_map;
-			set ASSIN_Q,0;
-			set ASSIN_Q2,0;
-			set ASSIN_Q3,0;
+			ASSIN_Q = 0;
+			ASSIN_Q2 = 0;
 			changequest 8004,8000;
 			savepoint "in_moc_16",18,14,1,1;
 			warp "in_moc_16",18,14;
@@ -1548,7 +1544,7 @@ OnTouch_:
 	mes "[Thomas]";
 	mes "If you run away, get a nose bleed and pass out or something like that, I'll fail ya'. Enough talk. Let's see what you got.";
 	close2;
-	set ASSIN_Q,4;
+	ASSIN_Q = 4;
 
 	monster "in_moc_16",81,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
 	monster "in_moc_16",82,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
@@ -1583,7 +1579,7 @@ OnTouch_:
 
 OnDisable:
 	donpcevent "Standby Room#ASNTEST::OnStart";
-	killmonsterall "in_moc_16";
+	killmonster "in_moc_16","timestopper#1::OnMyMobDead";
 	end;
 }
 
@@ -1596,7 +1592,7 @@ OnTouch_:
 	mes "Oh! Congratulations!";
 	mes "You may now proceed to our Guildmaster's room. Good luck!!";
 	close2;
-	set ASSIN_Q,5;
+	ASSIN_Q = 5;
 	changequest 8004,8005;
 	warp "in_moc_16",181,183;
 	end;
@@ -1606,7 +1602,7 @@ in_moc_16,182,169,0	script	Maze Assistant	45,1,1,{
 OnTouch_:
 	if (ASSIN_Q == 5 || ASSIN_Q == 6) {
 		warp "in_moc_16",181,183;
-		set ASSIN_Q,ASSIN_Q+1;
+		ASSIN_Q++;
 		if (!isbegin_quest(8006))
 			changequest 8005,8006;
 	}
@@ -1648,7 +1644,7 @@ OnTouch_:
 	else
 		savepoint "moc_ruins",79,99,1,1;
 	if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
-		set ASSIN_Q,8;
+		ASSIN_Q = 8;
 		mes "[Guildmaster]";
 		mes "Welcome.";
 		mes "I apologize for";
@@ -1682,7 +1678,6 @@ OnTouch_:
 			next;
 			switch(select("Revenge...!:Money~:I want to travel.")) {
 			case 1:
-				set ASSIN_Q,8;
 				mes "[Guildmaster]";
 				mes "Revenge...?";
 				mes "Yes, I understand. All of us hold grudges against someone else eventually.";
@@ -1696,7 +1691,7 @@ OnTouch_:
 				next;
 				break;
 			case 2:
-				set ASSIN_Q,9;
+				ASSIN_Q = 9;
 				mes "[Guildmaster]";
 				mes "Financial reasons...? I won't deny that we all need money to live. But being Assassin means living for a higher purpose.";
 				next;
@@ -1707,7 +1702,7 @@ OnTouch_:
 				next;
 				break;
 			case 3:
-				set ASSIN_Q,10;
+				ASSIN_Q = 10;
 				mes "[Guildmaster]";
 				mes "Good idea. Traveling around the world will allow you to broaden your experiences.";
 				next;
@@ -1736,7 +1731,7 @@ OnTouch_:
 			next;
 			switch(select("I like the solitude.:Making money being an Assassin.:They just look interesting.")) {
 			case 1:
-				set ASSIN_Q,11;
+				ASSIN_Q = 11;
 				mes "[Guildmaster]";
 				mes "You got the point...";
 				mes "We are lonely. We will always be alone, even amongst each other...";
@@ -1751,13 +1746,13 @@ OnTouch_:
 				next;
 				break;
 			case 2:
-				set ASSIN_Q,12;
+				ASSIN_Q = 12;
 				mes "[Guildmaster]";
 				mes "Well, I can't deny it, we do need money to make a living. But don't you think we should pursue something even more important than money?";
 				next;
 				break;
 			case 3:
-				set ASSIN_Q,13;
+				ASSIN_Q = 13;
 				mes "[Guildmaster]";
 				mes "Style and appearance is only superficial. It is sad that many people think this way...";
 				next;
@@ -1782,7 +1777,7 @@ OnTouch_:
 			next;
 			switch(select("To broaden my skills.:It's a goal of mine.:For spiritual improvement.")) {
 			case 1:
-				set ASSIN_Q,14;
+				ASSIN_Q = 14;
 				mes "[Guildmaster]";
 				mes "Learning skills comes naturally with the Assassin job. But don't think of skills as the best value of your training.";
 				next;
@@ -1791,7 +1786,7 @@ OnTouch_:
 				next;
 				break;
 			case 2:
-				set ASSIN_Q,15;
+				ASSIN_Q = 15;
 				mes "[Guildmaster]";
 				mes "It's a goal of yours, eh? Well, I guess you've got to have goals...";
 				next;
@@ -1805,7 +1800,7 @@ OnTouch_:
 				next;
 				break;
 			case 3:
-				set ASSIN_Q,16;
+				ASSIN_Q = 16;
 				mes "[Guildmaster]";
 				mes "Good idea...";
 				mes "That is a good way to improve yourself. I've seen many people who know how to be strong physically but not in their mental state.";
@@ -1837,14 +1832,14 @@ OnTouch_:
 			next;
 			switch(select("I would level up fast.:I want to explore my Assassin skills.:I will go where I couldn't go as a Thief.")) {
 			case 1:
-				set .@assassin_sangdam,.@assassin_sangdam+10;
+				.@assassin_sangdam += 10;
 				mes "[Guildmaster]";
 				mes "Don't act recklessly...";
 				mes "Being an Assassin never makes you a different person. And don't rely on chance.";
 				next;
 				break;
 			case 2:
-				set .@assassin_sangdam,.@assassin_sangdam+5;
+				.@assassin_sangdam += 5;
 				mes "[Guildmaster]";
 				mes "It is good for one to examine oneself. I can understand that you will be excited by the great change in your ability.";
 				next;
@@ -1871,14 +1866,14 @@ OnTouch_:
 			next;
 			switch(select("My friends.:My Guildsmen.:My lover.")) {
 			case 1:
-				set .@assassin_sangdam,.@assassin_sangdam+5;
+				.@assassin_sangdam += 5;
 				mes "[Guildmaster]";
 				mes "I see...";
 				mes "Appreciate them for caring about you, even when you're alone.";
 				next;
 				break;
 			case 2:
-				set .@assassin_sangdam,.@assassin_sangdam+5;
+				.@assassin_sangdam += 5;
 				mes "[Guildmaster]";
 				mes "Great...";
 				mes "Comrades for whom you would die for...";
@@ -1909,7 +1904,7 @@ OnTouch_:
 			next;
 			switch(select("Places where Assassins can level up...:Main goals as an Assassin.:Financial consulting.")) {
 			case 1:
-				set .@assassin_sangdam,.@assassin_sangdam+5;
+				.@assassin_sangdam += 5;
 				mes "[Guildmaster]";
 				mes "It all depends on your mind. Any place could be the best to level up according to your mind state.";
 				next;
@@ -1927,7 +1922,7 @@ OnTouch_:
 				next;
 				break;
 			case 3:
-				set .@assassin_sangdam,.@assassin_sangdam+10;
+				.@assassin_sangdam += 10;
 				mes "[Guildmaster]";
 				mes "Oh my lord...";
 				mes "Are you planning to become an Assassin in order to make money?";
@@ -1979,7 +1974,7 @@ OnTouch_:
 		mes "supports you. How";
 		mes "about you, Huey?";
 		next;
-		if (ASSIN_Q3 == 1) {
+		if (ASSIN_Q3 == 1) { // player Job Level was above 48
 			mes "[Huey]";
 			mes "A rarity.";
 			mes "You can tell";
@@ -1989,7 +1984,7 @@ OnTouch_:
 			mes "I agree with";
 			mes "the Anonymous One.";
 		}
-		else {
+		else { // player Job Level was below 48
 			mes "[Huey]";
 			mes "Although "+ strcharinfo(0) +" looks too mellow and gentle, kind of like a pussycat, "+ strcharinfo(0) +" has the stuff.";
 			next;
@@ -2064,7 +2059,8 @@ OnTouch_:
 			mes "I believe you stand out amongst them...";
 			next;
 		}
-		if (ASSIN_Q3 == 1 && BaseJob == Job_Thief && ASSIN_Q > 6 && ASSIN_Q < 17) {
+		switch(ASSIN_Q3) {
+		case 1: // player Job Level was above 48
 			mes "[Guildmaster]";
 			mes "Well, I've said too much. Please choose a weapon as a present.";
 			next;
@@ -2098,10 +2094,10 @@ OnTouch_:
 				mes "It used to rule over the Assassin weapon market. Please take care of my gladius.";
 				getitem 1220,1; //Gladius_
 			}
-			ASSIN_Q3 = 2;
+			ASSIN_Q3 = 3;
 			next;
-		}
-		else if (ASSIN_Q3 != 2) {
+			break;
+		case 2: // player Job Level was below 48
 			mes "[Guildmaster]";
 			mes "Well, I talked too much.";
 			mes "Please take this first.";
@@ -2122,7 +2118,7 @@ OnTouch_:
 			case 5:
 				getitem 1252,1; //Katar
 			}
-			ASSIN_Q3 = 2;
+			ASSIN_Q3 = 3;
 		}
 		mes "[Guildmaster]";
 		mes "Well, I am giving you a token. Please return to the Assassin expert, the Ferocious-Looking Huey, at the entrance.";
@@ -2165,7 +2161,7 @@ OnTouch_:
 		end;
 	}
 	else if (ASSIN_Q > 7 && ASSIN_Q < 17) {
-		set ASSIN_Q,7;
+		ASSIN_Q = 7;
 		mes "[Guildmaster]";
 		mes "What the hell? You pressed 'Cancel' during the process. Do you want to change your job or what?";
 		next;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

npc/pre-re/merchants/hair_dyer.txt

@@ -136,7 +136,7 @@ prt_in,243,168,4	script	Jovovich	91,{
 			mes "* Fees and Information *";
 			mes "- 1 Dyestuffs item of the color of hair you want.";
 			mes "- 1000 zeny fee.";
-			break;
+			close;
 
 		case 3:
 			mes "[Hairdresser Jovovich]";

npc/re/instances/MazeofOz.txt

@@ -2,34 +2,35 @@
 //= Instance: The Maze of Oz.
 //===== Description: =========================================
 //- [Walkthrough conversion]
-//- Part of the episode 18.1 main quest.
+//- Part of the Episode 18 main quest.
 //===== Changelogs: ==========================================
 //= 1.0 First version. [Capuche]
 //============================================================
 
 // Main Quest: Step 28.
-ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{ 
-	.@md_name$ = "The Maze of Oz";
+ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{
+	.@md_name$ = "Oz Labyrinth";
 
-	if (ep18_1_main == 29) {
-		mes "[Miriam in disguise]";
-		mes "From now on <FONT SIZE = 14><B>^e5555e" + .@md_name$ + "^000000</FONT></B>";
-		mes "^e5555ePrepare yourself and talk to me again^000000";
+	if (ep18_main == 29) {
+		mes "[Disguised Miriam]";
+		mes "We are now entering the <FONT SIZE = 14><B>^e5555eMaze of Oz^000000</FONT></B>.";
+		mes "^e5555ePlease finish your preparations^000000 and come back to me.";
 		cutin "ep18_merchant.png",2;
-		changequest 11717,11719;
-		ep18_1_main = 30;
+		erasequest 11717;
+		setquest 11719;
+		ep18_main = 30;
 		close3;
 	}
-	if (ep18_1_main == 30) {
-		mes "[Miriam in disguise]";
-		mes "Then I'll start the ^e5555e" + .@md_name$ + "^000000";
+	if (ep18_main == 30) {
+		mes "[Disguised Miriam]";
+		mes "Then let's head to ^e5555e" + .@md_name$ + "^000000";
 		next;
 		if (getcharid(1) == 0 || is_party_leader() == false) {
-			mes "[Miriam in disguise]";
-			mes "I think it would be a good idea to form a ^ff0000party before enter ^000000..";
+			mes "[Disguised Miriam]";
+			mes "I think it would be a good idea to form a ^ff0000party before enter^000000..";
 			close;
 		}
-		switch( select( "Open the door", "Enter", "Stop" ) ) {
+		switch( select( "Open the door.", "Enter.", "Quit." ) ) {
 		case 1:
 			if (instance_create(.@md_name$) < 0) {
 				mes "Party: " + getpartyname(getcharid(1)) + "";
@@ -37,21 +38,21 @@ ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{
 				mes "^0000ff" + .@md_name$ + " ^000000- Unknown error";
 				close;
 			}
-			mes "[Miriam in disguise]";
-			mes "You'd better wait a little before you go in.";
+			mes "[Disguised Miriam]";
+			mes "It's better to wait a bit before entering.";
 			close;
 		case 2:
 			switch( instance_enter(.@md_name$) ) {
 			case IE_OTHER:
-				mes "[Miriam in disguise]";
+				mes "[Disguised Miriam]";
 				mes "^ff0000An unknown error occurred.^000000";
 				close;
 			case IE_NOINSTANCE:
-				mes "[Miriam in disguise]";
-				mes "^ff0000Your party leader has not yet created the dungeon.^000000";
+				mes "[Disguised Miriam]";
+				mes "Let's wait a bit and try again.";
 				close;
 			case IE_NOMEMBER:
-				mes "[Miriam in disguise]";
+				mes "[Disguised Miriam]";
 				mes "^ff0000Only a member of the party can enter the Memorial Dungeon.^000000";
 				close;
 			case IE_OK:
@@ -62,24 +63,25 @@ ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{
 			end;
 		}
 	}
+	mes "[Merchant]";
+	mes "It seems like someone was nearby but disappeared quickly.";
+	mes "Where did they go?";
 	cutin "ep18_merchant.png",2;
-	mes "[Vendor]";
-	mes "Someone must have been around here, but they just disappeared. Where did they go?";
-	close3; 
+	close3;
 
 OnInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11717) == 1" );
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
+	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(11717) == 1" );
+	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
 	end;
 }
 
 // Step 1
 1@oz,284,164,3	script	Rope#outoz	4_ROPEPILE,{
-	mes "I think I can climb up with a rope.";
+	mes "I think we can use the rope to climb up.";
 	next;
-	if (select( "Use a rope to climb", "Do not use" ) == 2)
+	if (select( "Use the rope to climb up.", "Do not use." ) == 2)
 		end;
-	warp "ra_fild10",180,174;
+	warp "ra_fild10",173,176;
 	end;
 }
 
@@ -88,64 +90,64 @@ OnInit:
 		end;
 	'event_oz = 1;
 	.@miriam1$ = instance_npcname("Miriam#ozmd1");
-	.@maggi1$ = instance_npcname("Magi#ozmd1");
+	.@maggi1$ = instance_npcname("Maggi#ozmd1");
 	.@mark1$ = instance_npcname("Mark#ozmd1");
 	.@tamarin1$ = instance_npcname("Tamarin#ozmd1");
 	.@miriam2$ = instance_npcname("Miriam#ozmd2");
 
 	setpcblock PCBLOCK_NPC, true;
-	npctalk "Miriam: This is the entrance to the labyrinth of Oz.", .@miriam1$;
+	npctalk "Miriam: This is the entrance to the Labyrinth of Oz.", .@miriam1$;
 	cutin "ep18_miriam_03.png",2;
 	sleep2 2000;
 	npctalk "Miriam: Everyone, please move carefully.", .@miriam1$;
 	sleep2 2000;
 	npctalk "Magi: Something hot and dusty...", .@maggi1$;
 	cutin "4job_maggi_02.PNG",2;
-	enablenpc .@maggi1$;
-	enablenpc .@mark1$;
-	enablenpc .@tamarin1$;
+	cloakoffnpcself( .@maggi1$ );
+	cloakoffnpcself( .@mark1$ );
+	cloakoffnpcself( .@tamarin1$ );
 	sleep2 2000;
 	npctalk "Mark: Are you okay?", .@mark1$;
 	cutin "ep18_mark_01.png",2;
 	sleep2 2000;
-	npctalk "Miriam: There is lava flowing right below it, always scattering ashes.", .@miriam1$;
+	npctalk "Miriam: Lava is flowing right below, so ash is always flying.", .@miriam1$;
 	cutin "ep18_miriam_03.png",2;
 	sleep2 2000;
-	npctalk "Miriam: Beware there may be embers in the lava ash.", .@miriam1$;
+	npctalk "Miriam: There may be embers left in the lava ash, so please be careful.", .@miriam1$;
 	sleep2 2000;
-	npctalk "Miriam: If you inhale incorrectly, you will burn your lungs.", .@miriam1$;
+	npctalk "Miriam: If you inhale it incorrectly, it will burn your lungs.", .@miriam1$;
 	sleep2 2000;
-	npctalk "Miriam: There don't seem to be any monsters around here, so it's better to move slowly and check the situation again.", .@miriam1$;
+	npctalk "Miriam: There don't seem to be any monsters around here, so it would be better to move slowly and check the situation again.", .@miriam1$;
 	sleep2 2000;
-	npctalk "Miriam: Please follow the road to the north first.", .@miriam1$;
+	npctalk "Miriam: First, please follow the road to the north.", .@miriam1$;
 	sleep2 2000;
 	cutin "",255;
 	setpcblock PCBLOCK_NPC, false;
 
-	disablenpc .@maggi1$;
-	disablenpc .@mark1$;
-	disablenpc .@tamarin1$;
+	cloakonnpcself( .@maggi1$ );
+	cloakonnpcself( .@mark1$ );
+	cloakonnpcself( .@tamarin1$ );
 	disablenpc .@miriam1$;
 	enablenpc .@miriam2$;
 	end;
 }
 
-1@oz,279,175,5	duplicate(dummy_npc)	Magi#ozmd1	4_4JOB_MAGGI
-1@oz,280,175,3	duplicate(dummy_npc)	Mark#ozmd1	4_EP18_MARK
-1@oz,279,177,3	duplicate(dummy_npc)	Tamarin#ozmd1	4_EP18_TAMARIN
+1@oz,279,175,5	duplicate(dummy_cloaked_npc)	Maggi#ozmd1	4_4JOB_MAGGI
+1@oz,280,175,3	duplicate(dummy_cloaked_npc)	Mark#ozmd1	4_EP18_MARK
+1@oz,279,177,3	duplicate(dummy_cloaked_npc)	Tamarin#ozmd1	4_EP18_TAMARIN
 
 
 // Step 2
-1@oz,271,272,3	script	Miriam#ozmd2	4_EP18_MIRIAM,{
+1@oz,271,272,3	script(DISABLED)	Miriam#ozmd2	4_EP18_MIRIAM,{
 	if ('event_oz != 1)
 		end;
 	'event_oz = 2;
 	.@miriam2$ = instance_npcname("Miriam#ozmd2");
 	'miriam3$ = instance_npcname("Miriam#ozmd3");
 	setpcblock PCBLOCK_NPC, true;
-	npctalk "Miriam: If you cross the bridge in front of you, it's a real maze.", .@miriam2$;
+	npctalk "Miriam: If you cross the bridge in front of you, it's the real Maze of Oz.", .@miriam2$;
 	sleep2 2000;
-	npctalk "Miriam: We must be very careful crossing the bridge, let's talk again after.", .@miriam2$;
+	npctalk "Miriam: You have to be very careful when crossing the bridge, so let's talk again at the bridge.", .@miriam2$;
 	sleep2 2000;
 	setpcblock PCBLOCK_NPC, false;
 	disablenpc .@miriam2$;
@@ -153,69 +155,43 @@ OnInit:
 	end;
 
 OnInstanceInit:
-	'miriam3_id = 0;
 	'event_oz = 0;
 
 	'map_name$ = instance_mapname("1@oz");
-	disablenpc instance_npcname("Miriam#ozmd2");
-	disablenpc instance_npcname("Miriam#ozmd3");
-	disablenpc instance_npcname("Miriam#ozmd4");
-	disablenpc instance_npcname("Maram#ozmd5");
-	disablenpc instance_npcname("Miriam#ozmd5");
-	disablenpc instance_npcname("Maram#ozmd7");
-	disablenpc instance_npcname("#oz_way");
-	disablenpc instance_npcname("Maram#ozmd6");
-	disablenpc instance_npcname("Magi#ozmd1");
-	disablenpc instance_npcname("Mark#ozmd1");
-	disablenpc instance_npcname("Tamarin#ozmd1");
-	disablenpc instance_npcname("Magi#ozmd3");
-	disablenpc instance_npcname("Mark#ozmd3");
-	disablenpc instance_npcname("Tamarin#ozmd3");
-	disablenpc instance_npcname("Maram#ozmd4");
-	disablenpc instance_npcname("Magi#ozmd5");
-	disablenpc instance_npcname("Mark#ozmd5");
-	disablenpc instance_npcname("Tamarin#ozmd5");
-	disablenpc instance_npcname("Maram#ozmd8");
-	disablenpc instance_npcname("Magi#ozmd6");
-	disablenpc instance_npcname("Mark#ozmd6");
-	disablenpc instance_npcname("Tamarin#ozmd6");
-	disablenpc instance_npcname("Miriam#ozmd7");
-	disablenpc instance_npcname("Imril#ozmd7");
 	end;
 }
 
 
 // Step 3
-1@oz,241,272,3	script	Miriam#ozmd3	EP18_NPC_MIRIAM,{
+1@oz,241,272,3	script(DISABLED)	Miriam#ozmd3	EP18_NPC_MIRIAM,{
 	if ('event_oz != 2)
 		end;
 	'event_oz = 3;
-	'miriam3$ = instance_npcname("Miriam#ozmd3");
-	.@maggi3$ = instance_npcname("Magi#ozmd3");
+	.@maggi3$ = instance_npcname("Maggi#ozmd3");
 	.@mark3$ = instance_npcname("Mark#ozmd3");
 	.@tamarin3$ = instance_npcname("Tamarin#ozmd3");
 
 	setpcblock PCBLOCK_NPC, true;
-	npctalk "Miriam: This bridge is dangerous, so it's best to split your luggage and cross in turn.", 'miriam3$;
+	npctalk "Miriam: This bridge is dangerous, so it would be better to share the luggage and cross it one at a time.", 'miriam3$;
 	sleep2 2000;
-	npctalk "Miriam: Then I will cross first, so please follow slowly. It will help not to look under your feet.", 'miriam3$;
+	npctalk "Miriam: Then, I will cross first, so please follow me slowly. It will be helpful not to look under your feet.", 'miriam3$;
 	sleep2 2000;
-	npctalk "Tamarin: Wow I can't see the bottom.", .@tamarin3$;
-	enablenpc .@maggi3$;
-	enablenpc .@mark3$;
-	enablenpc .@tamarin3$;
+	npctalk "Tamarin: Wow... I can't see the bottom.", .@tamarin3$;
+	cloakoffnpcself( .@maggi3$ );
+	cloakoffnpcself( .@mark3$ );
+	cloakoffnpcself( .@tamarin3$ );
 	sleep2 2000;
-	npctalk "Magi: Your legs look very old...", .@maggi3$;
+	npctalk "Magi: My legs look really worn out...", .@maggi3$;
 	sleep2 2000;
-	npctalk "Mark: Everyone be careful", .@mark3$;
+	npctalk "Mark: Everyone be careful.", .@mark3$;
 	sleep2 2000;
 	setpcblock PCBLOCK_NPC, false;
-	disablenpc .@maggi3$;
-	disablenpc .@mark3$;
-	disablenpc .@tamarin3$;
+	cloakonnpcself( .@maggi3$ );
+	cloakonnpcself( .@mark3$ );
+	cloakonnpcself( .@tamarin3$ );
 	'miriam3_id = getnpcid(0);
 
-	unitwalk 'miriam3_id,231,272, 'miriam3$ + "::OnEvent1"; // several events are required to palliate to our too short value of MAX_WALKPATH (32) used to calculate the pathing
+	unitwalk 'miriam3_id,231,272, 'miriam3$ + "::OnEvent1";
 	end;
 OnEvent1:
 	unitwalk 'miriam3_id,211,272, 'miriam3$ + "::OnEvent2";
@@ -236,13 +212,13 @@ OnEvent5:
 	end;
 }
 
-1@oz,245,272,3	duplicate(dummy_npc)	Magi#ozmd3	4_4JOB_MAGGI
-1@oz,244,273,3	duplicate(dummy_npc)	Mark#ozmd3	4_EP18_MARK
-1@oz,244,270,3	duplicate(dummy_npc)	Tamarin#ozmd3	4_EP18_TAMARIN
+1@oz,245,272,3	duplicate(dummy_cloaked_npc)	Maggi#ozmd3	4_4JOB_MAGGI
+1@oz,244,273,3	duplicate(dummy_cloaked_npc)	Mark#ozmd3	4_EP18_MARK
+1@oz,244,270,3	duplicate(dummy_cloaked_npc)	Tamarin#ozmd3	4_EP18_TAMARIN
 
 
 // Step 4 + 5
-1@oz,157,272,3	script	Miriam#ozmd4	4_EP18_MIRIAM,{
+1@oz,157,272,3	script(DISABLED)	Miriam#ozmd4	4_EP18_MIRIAM,{
 	if ('event_oz != 3)
 		end;
 	'event_oz = 4;
@@ -250,25 +226,25 @@ OnEvent5:
 	.@miriam4$ = instance_npcname("Miriam#ozmd4");
 	.@tamarin4$ = instance_npcname("Tamarin#ozmd4");
 	.@ashtoad2$ = instance_npcname("Ash Toad#ozmd2");
-	.@maggi4$ = instance_npcname("Magi#ozmd4");
+	.@maggi4$ = instance_npcname("Maggi#ozmd4");
 	.@mark4$ = instance_npcname("Mark#ozmd4");
 	.@ashtoad3$ = instance_npcname("Ash Toad#ozmd3");
 
 	setpcblock PCBLOCK_NPC, true;
-	mapannounce 'map_name$, "Miriam: Ah!! A monster!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Miriam: Ah!! A monster!!!", bc_map, 0xB7EE,FW_NORMAL,16;
 	sleep2 1500;
-	mapannounce 'map_name$, "Miriam: I'll take this rude bastard.", bc_map, 0x00B7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Miriam: I will take care of this rude guy.", bc_map, 0xB7EE,FW_NORMAL,16;
 	sleep2 1500;
-	mapannounce 'map_name$, "Tamarin: Appeared in the back!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Tamarin: It also appeared in the back!!!", bc_map, 0xB7EE,FW_NORMAL,16;
 	sleep2 2000;
 	enablenpc .@tamarin4$;
 	sleep2 500;
 	enablenpc .@ashtoad2$;
-	mapannounce 'map_name$, "Magi: Crazy!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Magi: Aaaah!!!", bc_map, 0xB7EE,FW_NORMAL,16;
 	sleep2 500;
 	enablenpc .@maggi4$;
 	enablenpc .@mark4$;
-	mapannounce 'map_name$, "Mark: Please support me in the front!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Mark: Please support the front!!!", bc_map, 0xB7EE,FW_NORMAL,16;
 	sleep2 1000;
 	'mob_count_oz = 0;
 	monster 'map_name$,145,274,"Ash Toad",21295,1, .@miriam4$ + "::OnMobDead"; // EP18_ASH_TOAD
@@ -289,7 +265,7 @@ OnMobDead:
 
 	.@tamarin4$ = instance_npcname("Tamarin#ozmd4");
 	.@ashtoad2$ = instance_npcname("Ash Toad#ozmd2");
-	.@maggi4$ = instance_npcname("Magi#ozmd4");
+	.@maggi4$ = instance_npcname("Maggi#ozmd4");
 	.@mark4$ = instance_npcname("Mark#ozmd4");
 	.@ashtoad3$ = instance_npcname("Ash Toad#ozmd3");
 	.@maram4$ = instance_npcname("Maram#ozmd4");
@@ -301,60 +277,59 @@ OnMobDead:
 	npctalk "Tamarin: I did it!!!", .@tamarin4$;
 	disablenpc .@ashtoad2$;
 	sleep2 2000;
-	npctalk "Magi: Me too!!", .@maggi4$;
+	npctalk "Magi: This way too!!", .@maggi4$;
 	disablenpc .@ashtoad3$;
 	sleep2 2000;
-	npctalk "Miriam: Huh It wasn't a great monster, but it would have been dangerous if they were ordinary merchants.", .@miriam4$;
+	npctalk "Miriam: Huh... It wasn't a great monster, but it would have been dangerous for ordinary merchants.", .@miriam4$;
 	disablenpc .@ashtoad1$;
 	sleep2 2000;
-	npctalk "Maram : " + strcharinfo(0) + " Are you okay?", .@maram4$;
-	enablenpc .@maram4$;
+	cloakoffnpcself( .@maram4$ );
+	npctalk "Maram : " + strcharinfo(0) + ", are you okay?", .@maram4$;
 	sleep2 2000;
 	npctalk "Miriam: You're late! Maram!!!", .@miriam4$;
 	sleep2 2000;
-	npctalk "Maram: I met a monster on the way, so I'm a little late.", .@maram4$;
+	npctalk "Maram: I was a little late because I met a monster on the way.", .@maram4$;
 	sleep2 2000;
 	npctalk "Miriam: There were no monsters on the road we passed earlier.", .@miriam4$;
 	sleep2 2000;
-	npctalk "Maram: Yeah? Where the hell do monsters spring up like this...", .@maram4$;
+	npctalk "Maram: Really? Where on earth do monsters like this come from?", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: It's a big deal because it's getting harder and harder to move goods because of these monsters.", .@maram4$;
+	npctalk "Maram: It's a big problem because it's getting harder to move supplies because of these monsters.", .@maram4$;
 	sleep2 2000;
-	npctalk "Tamarin: If you go to the ground?", .@tamarin4$;
+	npctalk "Tamarin: What if you travel by land?", .@tamarin4$;
 	sleep2 2000;
-	npctalk "Tamarin: I heard there used to be a bridge to cross a canyon?", .@tamarin4$;
+	npctalk "Tamarin: I heard there used to be a bridge across the canyon?", .@tamarin4$;
 	sleep2 2000;
-	npctalk "Tamarin: Because there are still remains...", .@tamarin4$;
+	npctalk "Tamarin: There are still remains left...", .@tamarin4$;
 	sleep2 2000;
-	npctalk "Maram: It is said that the bridge above was destroyed when they saw the natives crossing to escape the hardliners' attacks.", .@maram4$;
+	npctalk "Maram: It is said that the bridge above was destroyed after seeing natives crossing it while fleeing an attack by hardliners.", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: The land across the bridge has become uninhabitable due to volcanic ash, so it must have been the intention to dry it to death.", .@maram4$;
+	npctalk "Maram: The area across the bridge has become uninhabitable due to volcanic ash, so they must have been trying to kill him.", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: It's not difficult to make a bridge again...", .@maram4$;
+	npctalk "Maram: It's not difficult to build a bridge again...", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: You can't advertise that you're hiding here by making a bridge because you're in hiding.", .@maram4$;
+	npctalk "Maram: Since we are in a hiding position, we can't build a bridge or something and advertise that we are hiding here.", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: It's dangerous and inconvenient right now, but I have no choice but to use the maze of Oz.", .@maram4$;
+	npctalk "Maram: Although it is dangerous and inconvenient now, we have no choice but to use the Maze of Oz.", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: In this state, it may not have been noticed until now.", .@maram4$;
+	npctalk "Maram: Because it's in this condition, it may be that it hasn't been discovered until now.", .@maram4$;
 	sleep2 2000;
-	npctalk "Miriam: Without the Maze of Oz...", .@miriam4$;
+	npctalk "Miriam: If the Maze of Oz didn't exist...", .@miriam4$;
 	sleep2 2000;
-	npctalk "Miriam: It must have been a lot harder than it is now.", .@miriam4$;
+	npctalk "Miriam: It must have been much harder than it is now.", .@miriam4$;
 	sleep2 2000;
-	npctalk "Maram: That's right", .@maram4$;
+	npctalk "Maram: That's right.", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: Now, shall we walk the lovely maze of Oz again?", .@maram4$;
+	npctalk "Maram: Now then, shall we walk down the lovely maze of Oz again?", .@maram4$;
 	sleep2 2000;
-	npctalk "Miriam: What do you mean", .@miriam4$;
+	npctalk "Miriam: What do you mean...", .@miriam4$;
 	sleep2 2000;
-	npctalk "Miriam : " + strcharinfo(0) + " From now on, go all the way down until you come to a fork.", .@miriam4$;
+	npctalk "Miriam : " + strcharinfo(0) + " , from now on, just keep going down until you reach a fork in the road.", .@miriam4$;
 	sleep2 2000;
-	npctalk "Miriam: It would be nice if the monsters didn't appear...", .@miriam4$;
+	npctalk "Miriam: It would be nice if monsters didn't appear, but...", .@miriam4$;
 	sleep2 1000;
-	disablenpc .@maram4$;
+	cloakonnpcself( .@maram4$ );
 	setpcblock PCBLOCK_NPC, false;
-
 	disablenpc .@maggi4$;
 	disablenpc .@mark4$;
 	disablenpc .@tamarin4$;
@@ -366,43 +341,43 @@ OnMobDead:
 1@oz,156,272,5	duplicate(dummy_disabled_npc)	Ash Toad#ozmd1	EP18_ASH_TOAD
 1@oz,164,272,3	duplicate(dummy_disabled_npc)	Ash Toad#ozmd2	EP18_ASH_TOAD
 1@oz,153,275,5	duplicate(dummy_disabled_npc)	Ash Toad#ozmd3	EP18_ASH_TOAD
-1@oz,155,275,3	duplicate(dummy_disabled_npc)	Magi#ozmd4	4_4JOB_MAGGI
+1@oz,155,275,3	duplicate(dummy_disabled_npc)	Maggi#ozmd4	4_4JOB_MAGGI
 1@oz,156,274,3	duplicate(dummy_disabled_npc)	Mark#ozmd4	4_EP18_MARK
 1@oz,161,272,5	duplicate(dummy_disabled_npc)	Tamarin#ozmd4	4_EP18_TAMARIN
 
-1@oz,162,275,3	duplicate(dummy_npc)	Maram#ozmd4	4_EP18_MARAM
+1@oz,162,275,3	duplicate(dummy_cloaked_npc)	Maram#ozmd4	4_EP18_MARAM
 
 
 // Step 6
-1@oz,98,172,3	script	Maram#ozmd5	EP18_NPC_MARAM,{
+1@oz,98,172,3	script(DISABLED)	Maram#ozmd5	EP18_NPC_MARAM,{
 	if ('event_oz != 5)
 		end;
 	'event_oz = 6;
 	.@miriam$ = instance_npcname("Miriam#ozmd5");
 	.@maram$ = instance_npcname("Maram#ozmd5");
 
+	npctalk "Maram: It wasn't like this before, but as the ground below begins to melt, perhaps due to the effects of Mount Tor, more monsters are appearing.", .@maram$;
+	cloakoffnpcself( "Maggi#ozmd5" );
+	cloakoffnpcself( "Mark#ozmd5" );
+	cloakoffnpcself( "Tamarin#ozmd5" );
 	enablenpc .@miriam$;
-	enablenpc instance_npcname("Magi#ozmd5");
-	enablenpc instance_npcname("Mark#ozmd5");
-	enablenpc instance_npcname("Tamarin#ozmd5");
-	npctalk "Maram: It wasn't like this before, but maybe it's the effect of Tor Volcano, as the ground below starts to melt, so more monsters are appearing.";
 	setpcblock PCBLOCK_NPC, true;
 	sleep2 2000;
-	npctalk "Maram: Especially in areas with a lot of molten ground, when trying to avoid monsters, the lava Because there are many people who are seriously injured or never come back...  ";
+	npctalk "Maram: Especially in areas where the ground has melted a lot, there are many people who try to avoid monsters and end up seriously injured or unable to return due to the lava...", .@maram$;
 	sleep2 2000;
-	npctalk "Maram: How long will the maze of Oz last...";
+	npctalk "Maram: How long will the maze of Oz endure...", .@maram$;
 	sleep2 3000;
-	mapannounce 'map_name$, "??? : ugh!!!!!!!!!!!!!!!!!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "??? : Ugh!!!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
 	sleep2 2000;
-	npctalk "Maram: This voice?!?!?!?!?";
+	npctalk "Maram: What is this voice?!?!?!?!?", .@maram$;
 	sleep2 2000;
 	npctalk "Miriam: Imril!!!!", .@miriam$;
 	sleep2 2000;
 	setpcblock PCBLOCK_NPC, false;
-	npctalk "Maram: I think your friend is in trouble! I'll go first, so please follow me carefully!";
-	disablenpc instance_npcname("Magi#ozmd5");
-	disablenpc instance_npcname("Mark#ozmd5");
-	disablenpc instance_npcname("Tamarin#ozmd5");
+	npctalk "Maram: I think my friend is in trouble! I'll go first, so be careful and follow me!", .@maram$;
+	cloakonnpcself( "Maggi#ozmd5" );
+	cloakonnpcself( "Mark#ozmd5" );
+	cloakonnpcself( "Tamarin#ozmd5" );
 	unitwalk getnpcid(0),68,165, .@maram$ + "::OnMove";
 	donpcevent .@miriam$ + "::OnMove";
 	end;
@@ -413,33 +388,33 @@ OnMove:
 	end;
 }
 
-1@oz,97,167,3	script	Miriam#ozmd5	EP18_NPC_MIRIAM,{
+1@oz,97,167,3	script(DISABLED)	Miriam#ozmd5	EP18_NPC_MIRIAM,{
 	end;
 OnMove:
 	npcwalkto 67,164;
 	end;
 }
 
-1@oz,92,170,3	duplicate(dummy_npc)	Magi#ozmd5	4_4JOB_MAGGI
-1@oz,91,169,3	duplicate(dummy_npc)	Mark#ozmd5	4_EP18_MARK
-1@oz,89,170,5	duplicate(dummy_npc)	Tamarin#ozmd5	4_EP18_TAMARIN
+1@oz,92,170,3	duplicate(dummy_cloaked_npc)	Maggi#ozmd5	4_4JOB_MAGGI
+1@oz,91,169,3	duplicate(dummy_cloaked_npc)	Mark#ozmd5	4_EP18_MARK
+1@oz,89,170,5	duplicate(dummy_cloaked_npc)	Tamarin#ozmd5	4_EP18_TAMARIN
 
 
 
 // Step 7
-1@oz,68,165,3	script	Maram#ozmd7	4_EP18_MARAM,{
+1@oz,68,165,3	script(DISABLED)	Maram#ozmd7	4_EP18_MARAM,{
 	if ('event_oz != 6)
 		end;
 	'event_oz = 7;
-	npctalk "Maram: Are you okay, Imril?";
+	npctalk "Maram: Imril are you okay?";
 	donpcevent instance_npcname("Imril#ozmd6") + "::OnStart";
-	disablenpc instance_npcname("Maram#ozmd7");
+	disablenpc();
 	end;
 }
 
 
 // Step 8
-1@oz,61,163,5	script	Imril#ozmd6	4_EP18_IMRIL,{
+1@oz,61,163,5	script(DISABLED)	Imril#ozmd6	4_EP18_IMRIL,{
 	end;
 
 OnStart:
@@ -460,56 +435,57 @@ OnMobDead:
 	.@maram8$ = instance_npcname("Maram#ozmd8");
 	.@imril6$ = instance_npcname("Imril#ozmd6");
 	.@miriam5$ = instance_npcname("Miriam#ozmd5");
-	.@maggi6$ = instance_npcname("Magi#ozmd6");
+	.@maggi6$ = instance_npcname("Maggi#ozmd6");
 	.@mark6$ = instance_npcname("Mark#ozmd6");
 	.@tamarin6$ = instance_npcname("Tamarin#ozmd6");
 
 	setpcblock PCBLOCK_NPC, true;
-	enablenpc .@maram8$;
-	npctalk "Imril: Thanks! We almost died!", .@imril6$;
+
+	cloakoffnpcself( .@maram8$ );
+	npctalk "Imril: Thank you! I almost died!", .@imril6$;
 	sleep2 2000;
-	npctalk "Imril: Don't go downstairs because the atmosphere isn't too bad.", .@imril6$;
+	npctalk "Imril: The atmosphere is unusual, so don't go downstairs.", .@imril6$;
 	sleep2 2000;
-	npctalk "Miriam: You seem to see monsters more often than last time.", .@miriam5$;
+	npctalk "Miriam: It seems like I see monsters more often than last time.", .@miriam5$;
 	sleep2 2000;
-	npctalk "Imril: But what about those people?", .@imril6$;
-	enablenpc .@maggi6$;
-	enablenpc .@mark6$;
-	enablenpc .@tamarin6$;
+	npctalk "Imril: And what about those people?", .@imril6$;
+	cloakoffnpcself( .@maggi6$ );
+	cloakoffnpcself( .@mark6$ );
+	cloakoffnpcself( .@tamarin6$ );
 	sleep2 2000;
-	npctalk "Maram: They are adventurers who sometimes help with mother's work.", .@maram8$;
+	npctalk "Maram: They are adventurers who sometimes help my mother with her work.", .@maram8$;
 	sleep2 2000;
-	npctalk "Maram: Trustworthy people, don't be so wary.", .@maram8$;
+	npctalk "Maram: These are trustworthy people, so don't be so wary.", .@maram8$;
 	sleep2 2000;
-	npctalk "Imril: Because you trust people too easily.", .@imril6$;
+	npctalk "Imril: I heard you trust people too easily.", .@imril6$;
 	sleep2 2000;
 	npctalk "Miriam: Yes.", .@miriam5$;
 	sleep2 2000;
-	npctalk "Maram: Anyway, let's escape before more monsters come out.", .@maram8$;
+	npctalk "Maram: Anyway, let's escape quickly before more monsters appear.", .@maram8$;
 	sleep2 2000;
-	npctalk "Maram: Not long left.", .@maram8$;
+	npctalk "Maram: Not much left.", .@maram8$;
 	sleep2 2000;
-	npctalk "Maram: It's hard to see, but just follow the road up here!", .@maram8$;
+	npctalk "Maram: It's hard to see, but you can follow the road up here and keep moving!", .@maram8$;
 	sleep2 2000;
 	npctalk "Tamarin: I think this is the way!", .@tamarin6$;
-	disablenpc .@maggi6$;
-	disablenpc .@mark6$;
-	disablenpc .@tamarin6$;
-	disablenpc .@maram8$;
+	cloakonnpcself( .@maggi6$ );
+	cloakonnpcself( .@mark6$ );
+	cloakonnpcself( .@tamarin6$ );
+	cloakonnpcself( .@maram8$ );
 	enablenpc instance_npcname("#oz_way");
 	setpcblock PCBLOCK_NPC, false;
 	end;
 }
 
-1@oz,68,165,3	duplicate(dummy_npc)	Maram#ozmd8	4_EP18_MARAM
-1@oz,61,168,3	duplicate(dummy_npc)	Magi#ozmd6	4_4JOB_MAGGI
-1@oz,65,167,3	duplicate(dummy_npc)	Mark#ozmd6	4_EP18_MARK
-1@oz,59,171,3	duplicate(dummy_npc)	Tamarin#ozmd6	4_EP18_TAMARIN
+1@oz,68,165,3	duplicate(dummy_cloaked_npc)	Maram#ozmd8	4_EP18_MARAM
+1@oz,61,168,3	duplicate(dummy_cloaked_npc)	Maggi#ozmd6	4_4JOB_MAGGI
+1@oz,65,167,3	duplicate(dummy_cloaked_npc)	Mark#ozmd6	4_EP18_MARK
+1@oz,59,171,3	duplicate(dummy_cloaked_npc)	Tamarin#ozmd6	4_EP18_TAMARIN
 
 
 
 // Step 9
-1@oz,58,256,5	script	#oz_way	1_SHADOW_NPC,3,3,{
+1@oz,58,256,5	script(DISABLED)	#oz_way	1_SHADOW_NPC,3,3,{
 	end;
 OnTouch:
 	if ('event_oz != 8)
@@ -520,11 +496,11 @@ OnTouch:
 }
 
 // Step 10 (maybe not required ?)
-1@oz,44,255,5	script	Maram#ozmd6	4_EP18_MARAM,{
+1@oz,44,255,5	script(DISABLED)	Maram#ozmd6	4_EP18_MARAM,{
 	if ('event_oz != 9)
 		end;
 	'event_oz = 10;
-	npctalk "Maram: This way!!!";
+	npctalk "Maram: Go down this road.";
 	initnpctimer;
 	end;
 OnTimer2000:
@@ -536,7 +512,7 @@ OnTimer2000:
 
 // Step 11
 // (Step 29 on the main quest).
-1@oz,21,189,5	script	Maram#ozmd9	4_EP18_MARAM,{
+1@oz,21,189,5	script(DISABLED)	Maram#ozmd9	4_EP18_MARAM,{
 	if ('event_oz != 10)
 		end;
 	'event_oz = 11;
@@ -546,50 +522,47 @@ OnTimer2000:
 	.@imril7$ = instance_npcname("Imril#ozmd7");
 
 	setpcblock PCBLOCK_NPC, true;
-	npctalk "Maram: Climb up the rope in front of this to get out.", .@maram9$;
-	enablenpc .@miriam7$;
-	enablenpc .@imril7$;
+	npctalk "Maram: If you climb up the rope in front of here, you can go outside.", .@maram9$;
+	cloakoffnpcself( .@miriam7$ );
+	cloakoffnpcself( .@imril7$ );
 	sleep2 2000;
-	npctalk "Imril: I'll go get some hidden stuff here, so go up first.", .@imril7$;
+	npctalk "Imril: I'll take some hidden items here, so go up first.", .@imril7$;
 	sleep2 2000;
-	npctalk "Miriam: Everyone is very tired. Let's go upstairs.", .@miriam7$;
-	if (ep18_1_main == 30) {
-		changequest 11719,11720;
-		ep18_1_main = 31;
+	npctalk "Miriam: Everyone is very tired. Let's go up quickly.", .@miriam7$;
+	if (ep18_main == 30) {
+		erasequest 11719;
+		setquest 11720;
+		ep18_main = 31;
 	}
-	disablenpc .@miriam7$;
-	disablenpc .@imril7$;
+	cloakonnpcself( .@miriam7$ );
+	cloakonnpcself( .@imril7$ );
 	setpcblock PCBLOCK_NPC, false;
 	end;
 
 OnInstanceInit:
-	disablenpc instance_npcname("Maram#ozmd9");
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
+	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
 	end;
 }
 
-1@oz,22,187,5	duplicate(dummy_npc)	Miriam#ozmd7	4_EP18_MIRIAM
-1@oz,16,185,3	duplicate(dummy_npc)	Imril#ozmd7	4_EP18_IMRIL
+1@oz,22,187,5	duplicate(dummy_cloaked_npc)	Miriam#ozmd7	4_EP18_MIRIAM
+1@oz,16,185,3	duplicate(dummy_cloaked_npc)	Imril#ozmd7	4_EP18_IMRIL
 
 
 // Step 12
 1@oz,28,190,3	script(DISABLED)	Rope#outoz2	4_ROPEPILE,{
-	if ('event_oz < 11)
-		end;
-	mes "I think I can climb up with a rope.";
-	next;
-	switch( select( "Use a rope to climb", "Do not use" ) ) {
-	case 1:
-		close2;
-		warp "gw_fild01",275,337;
-		end;
-	case 2:
-		end;
+	if ('event_oz != 11) {
+		mes "It can't be used yet. Let's talk to Maram first.";
+		close;
 	}
+	mes "I think I can climb up using the rope.";
+	next;
+	if (select( "Use the rope to climb up.", "Do not use." ) == 2)
+		end;
+	warp "gw_fild01",275,337;
 	end;
 
 OnInstanceInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11720) == 1" );
+	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(11720) == 1" );
 	end;
 }
 
@@ -601,7 +574,7 @@ OnTouch_:
 	getmapxy .@map$,.@x,.@y, BL_NPC;
 	monster 'map_name$,.@x-1,.@y,"Ash Toad",21295,1;	// EP18_ASH_TOAD
 	monster 'map_name$,.@x+1,.@y,"Rake Hand",21296,1;	// EP18_RAKEHAND
-	disablenpc instance_npcname( strnpcinfo(0) );
+	cloakonnpcself();
 	end;
 }
 
@@ -612,4 +585,3 @@ OnTouch_:
 1@oz,79,203,5	duplicate(#oz01)	#oz06	1_SHADOW_NPC,4,4
 1@oz,124,261,5	duplicate(#oz01)	#oz07	1_SHADOW_NPC,4,4
 1@oz,139,279,5	duplicate(#oz01)	#oz08	1_SHADOW_NPC,4,4
-

npc/re/instances/ThorGunsuBase.txt

@@ -2,54 +2,56 @@
 //= Instance: Thor Gunsu Base.
 //===== Description: =========================================
 //- [Walkthrough conversion]
-//- Part of the episode 18.1 main quest.
+//- Part of the Episode 18 main quest.
 //===== Changelogs: ==========================================
 //= 1.0 First version. [Capuche]
 //============================================================
 
 // Main Quest: Step 47.
 que_thr,133,53,5	script	Maram#Armybase1	4_EP18_MARAM,{
-	if (ep18_1_main != 45 && ep18_1_main != 46)
+	if (ep18_main < 45 || ep18_main > 46)
 		end;
-	if (ep18_1_main == 45) {
+	if (ep18_main == 45) {
 		cutin "ep18_maram_01.png",2;
 		mes "[Maram]";
-		mes "You have arrived, adventurer!";
-		mes "You did a great job getting here.";
+		mes "You've arrived, adventurer!";
+		mes "Thank you for coming all the way here.";
 		next;
 		cutin "ep18_maram_03.png",2;
 		mes "[Maram]";
-		mes "After all, it looks like this next one is real. The guards are different from before...";
-		mes "Let's look inside, being careful not to be caught by the guards.";
+		mes "It seems like this is the real deal after all. The security here is different from what it has been so far....";
+		mes "Let's be careful not to be caught by the guards and explore the inside.";
 		next;
 		cutin "ep18_maram_01.png",2;
 		mes "[Maram]";
-		mes "Make sure to move out of sight of the guards as much as possible.";
-		mes "If you make a mistake, you will be attacked, so if you don't break through, we'll meet again here.";
-		changequest 16577,16578;
-		ep18_1_main = 46;
+		mes "Try to move away from the security guard's line of sight as much as possible.";
+		mes "If you get caught, you might be attacked, so if you can't break through, we'll meet again here.";
+		erasequest 16577;
+		setquest 16578;
+		ep18_main = 46;
 		next;
 	}
-	else if (ep18_1_main == 46) {
+	else if (ep18_main == 46) {
+		cutin "ep18_maram_01.png",2;
 		mes "[Maram]";
-		mes "Let's try to get in as far as possible from the guard tower.";
+		mes "Let's try to go in while avoiding the guard tower as much as possible.";
 		next;
 	}
 
-	.@md_name$ = "Thor Gunsu Base";
+	.@md_name$ = "Thor Military Base";
 	cutin "",255;
-	mes "^FF0000 Any arbitrary processing such as taming monsters in the dungeon is not considered normal. Please note.^000000";
+	mes "^FF0000Caution : If you perform arbitrary processing within the dungeon, such as monster taming, it will not be considered normal progress.^000000";
 	next;
 	// player has party
-	if (is_party_leader()) {
+	if (is_party_leader())
 		// player is leader of the party
-		.@create$ = "Open " + .@md_name$;
-	}
-	switch( select( .@create$, .@md_name$ + " entry" ) ) {
+		.@create$ = "Apply for entry to " + .@md_name$ + "";
+
+	switch( select( .@create$, "Enter " + .@md_name$ + "" ) ) {
 	case 1:
 		cutin "ep18_maram_01.png",2;
 		mes "[Maram]";
-		mes "When the application is complete, talk to me again and select ^0000CD Thor military base entry^000000";
+		mes "When the application is complete, talk to me again and select ^0000CD" + .@md_name$ + " entry^000000";
 		if (instance_create(.@md_name$) < 0) {
 			mes "Party: " + getpartyname(getcharid(1)) + "";
 			mes "Leader: " + strcharinfo(0) + "";
@@ -67,14 +69,14 @@ que_thr,133,53,5	script	Maram#Armybase1	4_EP18_MARAM,{
 		case IE_NOINSTANCE:
 			cutin "ep18_maram_01.png",2;
 			mes "[Maram]";
-			mes "I don't think the dungeon has been created yet? Please check later.";
+			mes "It seems like you haven't created the dungeon yet. Please check again in a moment.";
 			close3;
 		case IE_NOMEMBER:
 			mes "[Maram]";
 			mes "^ff0000Only a member of the party can enter the Memorial Dungeon.^000000";
 			close;
 		case IE_OK:
-			mapannounce "que_thr", "" + strcharinfo(0) + " of the party, " + getpartyname( getcharid(1) ) + ", is entering " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12;
+			mapannounce "que_thr", "" + strcharinfo(0) + " of the party, " + getpartyname( getcharid(1) ) + ", is entering " + .@md_name$ + ".", bc_map, 0xFF99;
 			// warp 1@tcamp,103,237;
 			end;
 		}
@@ -82,34 +84,24 @@ que_thr,133,53,5	script	Maram#Armybase1	4_EP18_MARAM,{
 	end;
 
 OnInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(16577) == 1" );
+	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(16577) == 1" );
 	end;
 }
 
-1@tcamp,106,237,3	script	Maram#base1	4_EP18_MARAM,{
-	cutin "ep18_maram_01.png",2;
+1@tcamp,106,237,3	script	Maram#Base1	4_EP18_MARAM,{
 	mes "[Maram]";
-	mes "Be careful and explore the inside.";
-	mes "I heard from Mr. Dandelion earlier, there aren't many people, but there are Watch Towers here and there that monitor a fairly wide area.";
+	mes "Be careful and explore inside.";
+	mes "From what I heard from Dandelion earlier, there aren't many people, but there are watchtowers here and there that monitor a fairly wide area.";
 	next;
 	mes "[Maram]";
-	mes "If you get caught by the Watch Tower, soldiers will appear, so be careful not to get caught.";
-	mes "Well, if you find something, please contact me!";
-	close3;
+	mes "If you get caught by the watchtower, soldiers will appear, so be careful not to get caught.";
+	mes "Well, if you find anything, please contact me!";
+	close;
 
 OnInstanceInit:
+	'step = 0;
 	'map_tcamp$ = instance_mapname("1@tcamp");
 
-	disablenpc instance_npcname("Document Pile#Site1");
-	disablenpc instance_npcname("Document Pile#Site2");
-	disablenpc instance_npcname("Document Pile#Site3");
-	disablenpc instance_npcname("Document Pile#Site4");
-	disablenpc instance_npcname("Document Pile#Site5");
-	disablenpc instance_npcname("Maram#Lock1");
-	disablenpc instance_npcname("Maram#Lock2");
-	disablenpc instance_npcname("Maram#Lock3");
-	disablenpc instance_npcname("Maram#Lock4");
-
 	setcell 'map_tcamp$,137,216,142,216,cell_walkable,0;
 	setcell 'map_tcamp$,135,145,144,145,cell_walkable,0;
 	setcell 'map_tcamp$,223,105,223,110,cell_walkable,0;
@@ -128,11 +120,11 @@ OnInstanceInit:
 //-------------------------------------------------------------------
 // Traps
 //-------------------------------------------------------------------
-1@tcamp,120,228,3	script	Watch Tower#Watch1	4_SYSTEM_BOX,7,7,{
+1@tcamp,120,228,3	script	Watchtower#Watch1	4_SYSTEM_BOX,7,7,{
 	end;
 OnTouch:	// note: hidden player trigger the event
-	npctalk "Detect intruders. Exclude them.";
-	mapannounce 'map_tcamp$, "Intruder detected, intruder detected. We rule out immediately.", bc_map, 0xFF0000;
+	npctalk "Intruder detected !!";
+	mapannounce 'map_tcamp$, "Intruder found, intruder found. Ruled out immediately.", bc_map, 0xFF0000;
 	getmapxy .@map$,.@x,.@y, BL_NPC;
 
 	areamonster 'map_tcamp$,.@x-2,.@y-2,.@x+2,.@y+2,"Base Soldier",21309,3;	// EP18_MD_THOR_GUARD
@@ -147,316 +139,338 @@ OnInstanceInit:
 	end;
 }
 
-1@tcamp,135,228,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch2	4_SYSTEM_BOX,7,7
-1@tcamp,152,133,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch3	4_SYSTEM_BOX,7,7
-1@tcamp,167,133,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch4	4_SYSTEM_BOX,7,7
-1@tcamp,182,133,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch5	4_SYSTEM_BOX,7,7
-1@tcamp,161,96,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch6	4_SYSTEM_BOX,7,7
-1@tcamp,146,96,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch7	4_SYSTEM_BOX,7,7
-1@tcamp,116,102,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch8	4_SYSTEM_BOX,7,7
-1@tcamp,88,92,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch9	4_SYSTEM_BOX,7,7
-1@tcamp,240,148,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch10	4_SYSTEM_BOX,7,7
-1@tcamp,156,71,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch11	4_SYSTEM_BOX,7,7
-1@tcamp,176,194,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch12	4_SYSTEM_BOX,7,7
-1@tcamp,192,194,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch13	4_SYSTEM_BOX,7,7
-1@tcamp,142,153,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch14	4_SYSTEM_BOX,7,7
-1@tcamp,142,168,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch15	4_SYSTEM_BOX,7,7
-1@tcamp,192,179,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch16	4_SYSTEM_BOX,7,7
-1@tcamp,237,90,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch17	4_SYSTEM_BOX,7,7
+1@tcamp,135,228,3	duplicate(Watchtower#Watch1)	Watchtower#Watch2	4_SYSTEM_BOX,7,7
+1@tcamp,152,133,3	duplicate(Watchtower#Watch1)	Watchtower#Watch3	4_SYSTEM_BOX,7,7
+1@tcamp,167,133,3	duplicate(Watchtower#Watch1)	Watchtower#Watch4	4_SYSTEM_BOX,7,7
+1@tcamp,182,133,3	duplicate(Watchtower#Watch1)	Watchtower#Watch5	4_SYSTEM_BOX,7,7
+1@tcamp,161,96,3	duplicate(Watchtower#Watch1)	Watchtower#Watch6	4_SYSTEM_BOX,7,7
+1@tcamp,146,96,3	duplicate(Watchtower#Watch1)	Watchtower#Watch7	4_SYSTEM_BOX,7,7
+1@tcamp,116,102,3	duplicate(Watchtower#Watch1)	Watchtower#Watch8	4_SYSTEM_BOX,7,7
+1@tcamp,88,92,3	duplicate(Watchtower#Watch1)	Watchtower#Watch9	4_SYSTEM_BOX,7,7
+1@tcamp,240,148,3	duplicate(Watchtower#Watch1)	Watchtower#Watch10	4_SYSTEM_BOX,7,7
+1@tcamp,156,71,3	duplicate(Watchtower#Watch1)	Watchtower#Watch11	4_SYSTEM_BOX,7,7
+1@tcamp,176,194,3	duplicate(Watchtower#Watch1)	Watchtower#Watch12	4_SYSTEM_BOX,7,7
+1@tcamp,192,194,3	duplicate(Watchtower#Watch1)	Watchtower#Watch13	4_SYSTEM_BOX,7,7
+1@tcamp,142,153,3	duplicate(Watchtower#Watch1)	Watchtower#Watch14	4_SYSTEM_BOX,7,7
+1@tcamp,142,168,3	duplicate(Watchtower#Watch1)	Watchtower#Watch15	4_SYSTEM_BOX,7,7
+1@tcamp,192,179,3	duplicate(Watchtower#Watch1)	Watchtower#Watch16	4_SYSTEM_BOX,7,7
+1@tcamp,237,90,3	duplicate(Watchtower#Watch1)	Watchtower#Watch17	4_SYSTEM_BOX,7,7
 
 
 //-------------------------------------------------------------------
 // Walls
 //-------------------------------------------------------------------
-1@tcamp,138,216,3	script	Lock#1-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock1");
+1@tcamp,138,216,3	script	Lock Device#1-1	4_ROPEPILE,{
+	.@maram$ = instance_npcname("Maram#Lock Device1");
 	enablenpc .@maram$;
-	npctalk "Maram: Wait a minute. I know how to open it.", .@maram$;
+	npctalk "Maram: Please wait a moment. I know how to open it.", .@maram$;
 	progressbar_npc "3131FF",10;
-	npctalk "Maram: Now we can pass!", .@maram$;
-	disablenpc instance_npcname("Lock#1-1");
-	disablenpc instance_npcname("Lock#1-2");
+	npctalk "Maram: Well, we can pass now!", .@maram$;
+	disablenpc instance_npcname("Lock Device#1-1");
+	disablenpc instance_npcname("Lock Device#1-2");
 	disablenpc .@maram$;
 	setcell 'map_tcamp$,137,216,142,216,cell_walkable,1;
 	end;
 }
-1@tcamp,141,216,3	duplicate(Lock#1-1)	Lock#1-2	4_ROPEPILE
-1@tcamp,140,218,3	duplicate(dummy_npc)	Maram#Lock1	4_EP18_MARAM
+1@tcamp,141,216,3	duplicate(Lock Device#1-1)	Lock Device#1-2	4_ROPEPILE
+1@tcamp,140,218,3	duplicate(dummy_disabled_npc)	Maram#Lock Device1	4_EP18_MARAM
 
-1@tcamp,136,145,3	script	Lock#2-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock2");
+1@tcamp,136,145,3	script	Lock Device#2-1	4_ROPEPILE,{
+	.@maram$ = instance_npcname("Maram#Lock Device2");
 	enablenpc .@maram$;
 	progressbar_npc "3131FF",10;
 	npctalk "It would be better to proceed with caution.", .@maram$;
-	disablenpc instance_npcname("Lock#2-1");
-	disablenpc instance_npcname("Lock#2-2");
-	disablenpc instance_npcname("Lock#2-3");
-	disablenpc instance_npcname("Lock#2-4");
+	disablenpc instance_npcname("Lock Device#2-1");
+	disablenpc instance_npcname("Lock Device#2-2");
+	disablenpc instance_npcname("Lock Device#2-3");
+	disablenpc instance_npcname("Lock Device#2-4");
 	disablenpc .@maram$;
 	setcell 'map_tcamp$,135,145,144,145,cell_walkable,1;
 	end;
 }
-1@tcamp,138,145,3	duplicate(Lock#2-1)	Lock#2-2	4_ROPEPILE
-1@tcamp,141,145,3	duplicate(Lock#2-1)	Lock#2-3	4_ROPEPILE
-1@tcamp,143,145,3	duplicate(Lock#2-1)	Lock#2-4	4_ROPEPILE
-1@tcamp,142,147,3	duplicate(dummy_npc)	Maram#Lock2	4_EP18_MARAM
+1@tcamp,138,145,3	duplicate(Lock Device#2-1)	Lock Device#2-2	4_ROPEPILE
+1@tcamp,141,145,3	duplicate(Lock Device#2-1)	Lock Device#2-3	4_ROPEPILE
+1@tcamp,143,145,3	duplicate(Lock Device#2-1)	Lock Device#2-4	4_ROPEPILE
+1@tcamp,142,147,3	duplicate(dummy_disabled_npc)	Maram#Lock Device2	4_EP18_MARAM
 
-1@tcamp,223,109,3	script	Lock#3-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock3");
+1@tcamp,223,109,3	script	Lock Device#3-1	4_ROPEPILE,{
+	.@maram$ = instance_npcname("Maram#Lock Device3");
 	enablenpc .@maram$;
-	npctalk "Maram: This building looks pretty suspicious, right? There must be a surveillance system in it as well.", .@maram$;
+	npctalk "Maram: This building looks quite suspicious, right? There must be a surveillance system in here too.", .@maram$;
 	progressbar_npc "3131FF",10;
-	npctalk "Maram: Let's explore carefully, being careful not to get caught this time.", .@maram$;
-	disablenpc instance_npcname("Lock#3-1");
-	disablenpc instance_npcname("Lock#3-2");
+	npctalk "Maram: Let's explore carefully this time, being careful not to get caught.", .@maram$;
+	disablenpc instance_npcname("Lock Device#3-1");
+	disablenpc instance_npcname("Lock Device#3-2");
 	disablenpc .@maram$;
 	setcell 'map_tcamp$,223,105,223,110,cell_walkable,1;
 	end;
 }
-1@tcamp,223,106,3	duplicate(Lock#3-1)	Lock#3-2	4_ROPEPILE
-1@tcamp,226,114,3	duplicate(dummy_npc)	Maram#Lock3	4_EP18_MARAM
+1@tcamp,223,106,3	duplicate(Lock Device#3-1)	Lock Device#3-2	4_ROPEPILE
+1@tcamp,226,114,3	duplicate(dummy_disabled_npc)	Maram#Lock Device3	4_EP18_MARAM
 
-1@tcamp,80,99,3	script	Lock#4-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock4");
+1@tcamp,80,99,3	script	Lock Device#4-1	4_ROPEPILE,{
+	.@maram$ = instance_npcname("Maram#Lock Device4");
 	enablenpc .@maram$;
-	npctalk "Maram: I think you've gotten pretty deep. You should be able to find what you need safely.", .@maram$;
+	npctalk "Maram: Looks like we're in pretty deep. We should be able to safely find what we need.", .@maram$;
 	progressbar_npc "3131FF",10;
-	npctalk "Maram: Shall we wish you luck?", .@maram$;
-	disablenpc instance_npcname("Lock#4-1");
-	disablenpc instance_npcname("Lock#4-2");
-	disablenpc instance_npcname("Lock#4-3");
+	npctalk "Maram: Shall we wish you good luck?", .@maram$;
+	disablenpc instance_npcname("Lock Device#4-1");
+	disablenpc instance_npcname("Lock Device#4-2");
+	disablenpc instance_npcname("Lock Device#4-3");
 	disablenpc .@maram$;
 	setcell 'map_tcamp$,80,94,80,100,cell_walkable,1;
 
-	enablenpc instance_npcname("Document Pile#Site1");
-	enablenpc instance_npcname("Document Pile#Site2");
-	enablenpc instance_npcname("Document Pile#Site3");
-	enablenpc instance_npcname("Document Pile#Site4");
-	enablenpc instance_npcname("Document Pile#Site5");
-	enablenpc instance_npcname("Miriam#base1");
-	enablenpc instance_npcname("Maram#base5");
+	enablenpc instance_npcname("Pile of documents#Base1");
+	enablenpc instance_npcname("Pile of documents#Base2");
+	enablenpc instance_npcname("Pile of documents#Base3");
+	enablenpc instance_npcname("Pile of documents#Base4");
+	enablenpc instance_npcname("Pile of documents#Base5");
+	enablenpc instance_npcname("Miriam#Base1");
+	enablenpc instance_npcname("Maram#Base5");
+	if ('step == 0)
+		'step = 1;
 	end;
 }
-1@tcamp,80,97,3	duplicate(Lock#4-1)	Lock#4-2	4_ROPEPILE
-1@tcamp,80,95,3	duplicate(Lock#4-1)	Lock#4-3	4_ROPEPILE
-1@tcamp,82,100,3	duplicate(dummy_npc)	Maram#Lock4	4_EP18_MARAM
+1@tcamp,80,97,3	duplicate(Lock Device#4-1)	Lock Device#4-2	4_ROPEPILE
+1@tcamp,80,95,3	duplicate(Lock Device#4-1)	Lock Device#4-3	4_ROPEPILE
+1@tcamp,82,100,3	duplicate(dummy_disabled_npc)	Maram#Lock Device4	4_EP18_MARAM
 
 
 //-------------------------------------------------------------------
 // Final
 //-------------------------------------------------------------------
-1@tcamp,32,100,3	script	Document Pile#Site1	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "I took out a few sheets from the middle These are the expiry date of the weapon and the sales statement.";
+1@tcamp,32,100,3	script(DISABLED)	Pile of documents#Base1	4_EP18_PAPERS,{
+	if ('step != 1)
+		end;
+	mes "[Pile of documents]";
+	mes "All kinds of documents are all mixed up.";
+	mes "I took out a few pages from the middle and found that they were weapons expiration dates and sales records.";
 	next;
-	mes "[Pile of Papers]";
-	mes "Even the date is very recent. There is a record of handing over a large number of weapons to Mr. Dandelion.";
-	mes "I think I found what I was looking for. I put the documents in my pocket.";
+	mes "[Pile of documents]";
+	mes "Even the date is very recent. There is also a record of handing over a large amount of weapons to Mr. Dandelion.";
+	mes "It looks like I found what I was looking for. I put the documents in my arms.";
 	close2;
 	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site1") );
+	cloakonnpcself();
 	end;
 }
 
-1@tcamp,49,123,3	script	Document Pile#Site2	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "At the top of the page the final menu for luncheon dinner?";
+1@tcamp,49,123,3	script(DISABLED)	Pile of documents#Base2	4_EP18_PAPERS,{
+	if ('step != 1)
+		end;
+	mes "[Pile of documents]";
+	mes "All kinds of documents are all mixed up.";
+	mes "On the top page... is it a battle to decide the menu for lunch?";
 	next;
-	mes "[Pile of Papers]";
-	mes "It seems that the menu is fried fish with sauce.";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
+	mes "[Pile of documents]";
+	mes "It looks like the menu has been set on fried fish covered in sauce....";
+	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
 	close2;
 	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site2") );
+	cloakonnpcself();
 	end;
 }
 
-1@tcamp,29,86,3	script	Document Pile#Site3	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "I took one out of the middle The layout of the military base guards?";
+1@tcamp,29,86,3	script(DISABLED)	Pile of documents#Base3	4_EP18_PAPERS,{
+	if ('step != 1)
+		end;
+	mes "[Pile of documents]";
+	mes "All kinds of documents are all mixed up.";
+	mes "I took one out from the middle and saw... a map of the security guards at the military base?";
 	next;
-	mes "[Pile of Papers]";
-	mes "Looking at the date, it was a long time ago.";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
+	mes "[Pile of documents]";
+	mes "Looking at the date, it's a long time ago document.";
+	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
 	close2;
 	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site3") );
+	cloakonnpcself();
 	end;
 }
 
-1@tcamp,60,122,3	script	Document Pile#Site4	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "The top one... 'If you feed the magmaring potatoes and hunt them after a while, will they drop the baked potatoes?'";
+1@tcamp,60,122,3	script(DISABLED)	Pile of documents#Base4	4_EP18_PAPERS,{
+	if ('step != 1)
+		end;
+	mes "[Pile of documents]";
+	mes "All kinds of documents are all mixed up.";
+	mes "The top chapter is... ¡®If you feed a magmaring a potato and then hunt it after a while, should it drop a baked potato?'";
 	next;
-	mes "[Pile of Papers]";
-	mes "why is this here. But I'm curious about the result!";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
+	mes "[Pile of documents]";
+	mes "...Why is this here? But I'm curious about the results!";
+	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
 	close2;
 	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site4") );
+	cloakonnpcself();
 	end;
 }
 
-1@tcamp,31,84,3	script	Document Pile#Site5	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "Picking one out of the middle I found an illustration of the Pope drawn by icing the Pope's cookie icing with a pen.";
+1@tcamp,31,84,3	script(DISABLED)	Pile of documents#Base5	4_EP18_PAPERS,{
+	if ('step != 1)
+		end;
+	mes "[Pile of documents]";
+	mes "All kinds of documents are all mixed up.";
+	mes "When I pulled one out from the middle... I found an illustration of the Pope drawn with Pope cookie icing using a pen.";
 	next;
-	mes "[Pile of Papers]";
-	mes "What kind of picture is it? Besides, you drew it very well.";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
+	mes "[Pile of documents]";
+	mes "What kind of picture is this? And it's really well drawn....";
+	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
 	close2;
 	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site5") );
+	cloakonnpcself();
 	end;
 }
 
 
-1@tcamp,34,100,3	script	Miriam#base1	4_EP18_MIRIAM,3,3,{
-	disable_items;
-	if (countitem(1000409) < 5) {	// Ep18_Docu_File
+1@tcamp,34,100,3	script(DISABLED)	Miriam#Base1	4_EP18_MIRIAM,3,3,{
+	if ('step == 1) {
+		if (countitem(1000409) < 5) {	// Ep18_Docu_File
+			cutin "ep18_miriam_02.png",2;
+			mes "[Miriam]";
+			mes "As expected, you are talented, adventurer. I used all my connections to find out the location.";
+			mes "It looks like you found the adventurer and Maram right away.";
+			next;
+			mes "[Miriam]";
+			mes "Please read these documents. They contain what we are looking for.";
+			mes "Rather than having me explain everything to you, I think it would be better for you to see it for yourself.";
+			close3;
+		}
+		if (getequipid(EQI_HEAD_TOP) != 400127) {	// Ep18_Mini_Elly
+			mes "[Mini Elly]";
+			mes "Get it out of the bag. Put it on your head.";
+			close;
+		}
+		mes "[Miriam]";
+		mes ".......";
+		next;
+		cutin "ep18_maram_01.png",2;
+		mes "[Maram]";
+		mes "No, Miriam! How are you here?";
+		mes "They said they would conduct a separate investigation!";
+		next;
+		cutin "ep18_miriam_01.png",2;
+		mes "[Miriam]";
+		mes "How did you and the adventurer dig this far?";
+		mes "As expected, your skills are good. I used all my connections to find out the location, but you found it right away.";
+		next;
+		cutin "ep18_maram_02.png",2;
+		mes "[Maram]";
+		mes "Let's do something about it, right, adventurer?";
+		mes "Anyway, what information did you get?";
+		next;
 		cutin "ep18_miriam_02.png",2;
 		mes "[Miriam]";
-		mes "As expected, you are talented, adventurer. I used all sorts of connections to find the position.";
-		mes "It seems that Adventurer and Maram found it at once.";
+		mes "Look at this document here.";
+		next;
+		cutin "",255;
+		mes "[Mini Elly]";
+		mes "This document is a weapon sales record. Please show it to me.";
+		mes "All of the weapons and firearms that these people disposed of have less than a year left before their expiration date.";
+		next;
+		cutin "ep18_miriam_03.png",2;
+		mes "[Miriam]";
+		mes "You sell weapons like this so recklessly.";
+		mes "If a weapon is not properly maintained, it may not function properly.";
+		next;
+		cutin "ep18_maram_03.png",2;
+		mes "[Maram]";
+		mes "The quality of all weapons coming out of the back hole is the same.";
+		mes "...But I guess it's at this point in time.";
+		next;
+		mes "[Maram]";
+		mes "One year is not a long expiration date, but it is not too tight.";
+		mes "Why did it pour out at this moment when we were preparing for the protest?";
+		next;
+		mes "[Maram]";
+		mes "There wouldn't have been a need to dispose of it right away.";
+		next;
+		cutin "ep18_miriam_02.png",2;
+		mes "[Miriam]";
+		mes "This is one of the military bases managed by my adoptive father.";
+		mes "I was wondering if it would really pop out at a time like this.";
+		next;
+		cutin "",255;
+		select( "If it's your adoptive father, is it Priest Amal?", "That adoptive father who is a hardliner and pro-war?" );
+		cutin "ep18_miriam_02.png",2;
+		mes "[Miriam]";
+		mes "That's right, adventurer. When I looked at the ledger, it doesn't seem like my adoptive father was involved.";
+		mes "I think it's an isolated corruption at the lowest level, the weapons leak incident.";
 		next;
 		mes "[Miriam]";
-		mes "Read some of the documents here. We have what we were looking for.";
-		mes "I think it would be better to come and see it firsthand than to explain everything.";
-		close3;
+		mes "I'll have to dig a little deeper, but that's my guess for now.";
+		mes "Oh, please give me the documents. I'll take them as evidence.";
+		delitem 1000409,5;	// Ep18_Docu_File
+		if ('step == 1)
+			'step = 2;
+		if (isbegin_quest(16578) == 1) {
+			erasequest 16578;
+			setquest 16579;
+		}
+		close2;
+		cutin "",255;
+		npctalk "Maram: Ha, this is really fun.", instance_npcname("Maram#Base5");
+		end;
 	}
-	if (getequipid(EQI_HEAD_TOP) != 400127) {	// Ep18_Mini_Elly
-		mes "[Mini Elly]";
-		mes "Get it out of the bag. Put it on your head.";
+	if ('step == 2) {
+		cutin "ep18_miriam_02.png",2;
+		mes "[Miriam]";
+		mes "...Just a moment, I'm reading the document.";
 		close;
 	}
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes ".";
-	next;
-	cutin "ep18_maram_01.png",2;
-	mes "[Maram]";
-	mes "No, Miriam! How are you here?";
-	mes "They said they would investigate separately!";
-	next;
-	cutin "ep18_miriam_01.png",2;
-	mes "[Miriam]";
-	mes "How did you and the adventurer dig this far?";
-	mes "You have good skills, too. It was a location that I found using all kinds of connections, but you found it at once.";
-	next;
-	cutin "ep18_maram_02.png",2;
-	mes "[Maram]";
-	mes "Let's do some, right, adventurer?";
-	mes "Anyway, what information did you get?";
-	next;
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "Look at this document here.";
-	next;
-	cutin "",255;
-	mes "[Mini Elly]";
-	mes "This is a sales statement for arms. Show it to me as well.";
-	mes "The weapons and firearms these men have disposed of are all less than a year old.";
-	next;
-	cutin "ep18_miriam_03.png",2;
-	mes "[Miriam]";
-	mes "How dare you sell such weapons.";
-	mes "A weapon that is not properly maintained may not function properly.";
-	next;
-	cutin "ep18_maram_03.png",2;
-	mes "[Maram]";
-	mes "The weapons that come out of the back hole are all the same.";
-	mes "but, at least it's at this point.";
-	next;
-	mes "[Maram]";
-	mes "A year is not a long term, but it is not tight.";
-	mes "Why did we pour out at this moment in preparation for the protest?";
-	next;
-	mes "[Maram]";
-	mes "You wouldn't have to dispose of it right away.";
-	next;
-	npctalk "Maram: haha, this is so funny", instance_npcname("Maram#base5");
-	sleep2 300;
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "This is one of the military bases managed by my stepfather.";
-	mes "Just by chance, it really came out at a time like this.";
-	next;
-	cutin "",255;
-	select( "If your stepfather is a priest, Youth Amal?", "The hard-line and pro-war stepfather?" );
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "That's right, adventurer. Looking at the ledger, it doesn't seem like the stepfather was involved.";
-	mes "I think it was a single corruption at the end, the weapon leak case.";
-	next;
-	mes "[Miriam]";
-	mes "I'll have to dig a little deeper, but that's my guess for now.";
-	mes "Oh, give me the documents. I'll take it as evidence.";
-	delitem 1000409,5;	// Ep18_Docu_File
-	if (isbegin_quest(16578) == 1) {
-		erasequest 16578;
-		setquest 16579;
-	}
-	close2;
-	cutin "",255;
-	npctalk "Maram: haha, this is so funny", instance_npcname("Maram#base5");
 	end;
 
 OnTouch:
-	npctalk "Miriam: Oh, adventurer? Maram you too!?";
+	if (countitem(1000409) < 5)
+		npctalk "Miriam: Oh, adventurer? Maram, you too!?";
 	end;
 
 OnInstanceInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(16578) == 1 && countitem(1000409) > 4" );	// Ep18_Docu_File
-	disablenpc instance_npcname("Miriam#base1");
+	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(16578) == 1 && countitem(1000409) > 4" );	// Ep18_Docu_File
 	end;
 }
 
-1@tcamp,32,102,3	script	Maram#base5	4_EP18_MARAM,{
-	if (isbegin_quest(16579) == 0) {
+1@tcamp,32,102,3	script(DISABLED)	Maram#Base5	4_EP18_MARAM,{
+	if ('step == 1) {
 		cutin "ep18_maram_01.png",2;
 		mes "[Maram]";
-		mes "I didn't know Miriam was here, right, adventurer?";
+		mes "I didn't know Miriam would be here. Right, adventurer?";
 		close3;
 	}
-	cutin "ep18_maram_02.png",2;
-	mes "[Maram]";
-	mes "We moved separately, but in the end we are in the same position.";
-	mes "Still, what I got in the process was different, so I guess it has its own meaning.";
-	next;
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "Then I must be away for a while.";
-	mes "I'm going to pass on my findings to my stepfather.";
-	next;
-	mes "[Miriam]";
-	mes "Because there is a possibility that the adoptive father may not know yet if it is a single corruption.";
-	next;
-	cutin "ep18_maram_03.png",2;
-	mes "[Maram]";
-	mes "Is it really an independent corruption? That's probably what bothers me.";
-	mes "I have something to give to Rachel, Miriam, let's go together.";
-	next;
-	cutin "ep18_maram_01.png",2;
-	mes "[Maram]";
-	mes "I'll give you a shortcut, so can you please tell Suad what you found out here?";
-	mes "We will follow soon, so please go ahead and tell me.";
-	if (ep18_1_main == 46) {
-		ep18_1_main = 47;
-		erasequest 16579;
-		setquest 16580;
-		getitem "Ep18_Amethyst_Fragment",50;
+	if ('step == 2) {
+		mes "[Maram]";
+		mes "They moved separately, but ended up in the same place.";
+		mes "Still, what I gained from the process was different, so I guess it has some meaning.";
+		next;
+		cutin "ep18_miriam_02.png",2;
+		mes "[Miriam]";
+		mes "Then I guess I'll have to leave for a while.";
+		mes "I'll have to relay what I found out to my adoptive father.";
+		next;
+		mes "[Miriam]";
+		mes "If it's an isolated corruption, there's a chance that even my adoptive father doesn't know about it yet.";
+		next;
+		cutin "ep18_maram_03.png",2;
+		mes "[Maram]";
+		mes "Is this really an isolated case of corruption? That is something that bothers me.";
+		mes "I also have something to deliver to Rachel, so Miriam, let's go together.";
+		next;
+		cutin "ep18_maram_01.png",2;
+		mes "[Maram]";
+		mes "I will tell you a shortcut to get out, so would you, adventurer, tell Suad what you found out here?";
+		mes "We will follow shortly, so please go and tell us first.";
+		if (ep18_main == 46) {
+			ep18_main = 47;
+			erasequest 16579;
+			setquest 16580;
+			getitem 1000405,50;	// Ep18_Amethyst_Fragment
+		}
+		close2;
+		warp "wolfvill",162,154;
+		end;
 	}
-	close2;
+	// debug
 	warp "wolfvill",162,154;
 	end;
 
 OnInstanceInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(16579) == 1" );
-	disablenpc instance_npcname("Maram#base5");
+	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(16579) == 1" );
 	end;
 }

npc/re/instances/VillaofDeception.txt

@@ -2,7 +2,7 @@
 //= Instance Villa of Deception.
 //===== Description: =========================================
 //- [Walkthrough conversion]
-//- Require to complete the episode 18.1 main quest.
+//- Require to complete the Episode 18 main quest.
 //- The function to drop an item with random option is defined in re/other/glocal_npc2.txt
 // Notes:
 //   Some of the setting can be modified in 'Optional settings'.
@@ -16,14 +16,14 @@
 wolfvill,79,260,0	script	#con_wp11	HIDDEN_WARP_NPC,4,4,{
 	end;
 OnTouch:
-	if (ep18_1_main < 57)
+	if (ep18_main < 57)
 		end;
 	cloakoffnpcself( "Aira#con" );
 	end;
 }
 
 wolfvill,79,260,4	script(CLOAKED)	Aira#con	4_M_BRZ_JACI,{
-	if (ep18_1_main < 57)
+	if (ep18_main < 57)
 		end;
 	switch( checkquest(12522,PLAYTIME) ) {
 	case -1:

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

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

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

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

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

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

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

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

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

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

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

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