Add some renewal maps to zones

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

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

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

-// Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_short_attack_damage_rate: 80
-
-// Ranged damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_long_attack_damage_rate: 80
-
-// Weapon skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_weapon_attack_damage_rate: 60
-
-// Magic skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_magic_attack_damage_rate: 60
-
-// Misc skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_misc_attack_damage_rate: 60
-
-// Flee penalty on gvg grounds. Official value is 20 (Note 2)
-// NOTE: It's %, not absolute, so 20 is -20% of your total flee
-gvg_flee_penalty: 20
-
 // Can the 'Glory of Guild' skill be learnt in the Guild window,
 // and does changing emblems require it? (Note 1)
 // P.S: This skill is not implemented on official servers
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -17,10 +17,18 @@
 // 0x10: They display luk/3+1 instead of their actual critical in the
 //       stat window (by default they don't crit)
 // 0x20: Their Min-Matk is always the same as their max
-// 0x40: Skill re-use delay is reset when they are vaporized.
-// 0x80: Skill re-use delay is reset when they are warped (by skill or item) with player.
 hom_setting: 0x3D

+// Should the cooldown or aftercast delay of homunculi skills be reset when
+// the homunculus is vaporized?
+// Default on official servers: yes for Pre-renewal, no for Renewal
+//hom_delay_reset_vaporize: no
+
+// Should the cooldown or aftercast delay of homunculi skills be reset when
+// warping or changing maps?
+// Default on official servers: yes for Pre-renewal, no for Renewal
+//hom_delay_reset_warp: no
+
 // The rate a homunculus will get friendly by feeding it. (Note 2)
 homunculus_friendly_rate: 100

--- a/conf/battle/instance.conf
+++ b/conf/battle/instance.conf
@@ -0,0 +1,27 @@
+//--------------------------------------------------------------
+// rAthena Battle Configuration File
+// Originally Translated by Peter Kieser <pfak@telus.net>
+// Made in to plainer English by Ancyker
+//--------------------------------------------------------------
+// Note 1: Value is a config switch (on/off, yes/no or 1/0)
+// Note 2: Value is in percents (100 means 100%)
+// Note 3: Value is a bit field. If no description is given,
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//--------------------------------------------------------------
+
+// Block leaving for parties, guilds or clans if they have an active instance?
+// Default: yes (Official)
+instance_block_leave: yes
+
+// Block leader changes for parties or guilds if they have an active instance?
+// Default: yes (Official)
+instance_block_leaderchange: yes
+
+// Block inviting for parties or guilds if they have an active instance?
+// This also blocks joining parties, guilds or clans that have a running instance.
+// Default: yes (Official)
+instance_block_invite: yes
+
+// Block expulsion for parties or guilds if they have an active instance?
+// Default: yes (Official)
+instance_block_expulsion: yes
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -12,8 +12,10 @@
 // The highest value at which an item can be sold via the merchant vend skill. (in zeny)
 vending_max_value: 1000000000

-// Whether to allow buying from vending chars that are at their max. zeny limit.
-// If set to yes, the rest of the zeny above the char's capacity will disappear.
+// Whether to allow placing items on a vending store when the player's zeny plus the total price
+// of the items exceeds the maximum zeny allowed. (Note 1)
+// If set to "yes", the items will be placed in the store but other players will not be able to buy them.
+// Official behavior is "yes", but on some official servers the client doesn't allow this.
 vending_over_max: yes

 // Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
@@ -93,7 +95,7 @@ allow_equip_restricted_item: yes
 // Default on official servers: yes for Pre-renewal, no for Renewal
 //item_enabled_npc: yes

-// Allow map_flooritem to check if item is droppable? (Note 1)
+// Allow map_addflooritem to check if item is droppable? (Note 1)
 // If yes, undroppable items will be destroyed instead of appearing on the map when a player's inventory is full.
 // Default: yes
 item_flooritem_check: yes
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -39,14 +39,6 @@ pk_min_level: 55
 // players to let them attack each other. 0 disables said limit.
 pk_level_range: 0

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

--- a/conf/battle/pet.conf
+++ b/conf/battle/pet.conf
@@ -41,6 +41,10 @@ pet_hungry_delay_rate: 100
 // These bonuses are unofficial and found in the import/pet_db.yml
 pet_equip_required: yes

+// Should the pet equipment be destroyed if the owner doesn't have enough space in their inventory? (Note 1)
+// Official behavior is "yes", setting this to "no" will leave the item equipped. 
+pet_unequip_destroy: yes
+
 // When the master attacks a monster, whether or not the pet will also attack. (Note 1)
 pet_attack_support: no

--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -295,15 +295,12 @@ 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 amount of RES/MRES to take into the resistance damage reduction formula.
-// A setting of 625 means the max reduction of damage allowed is 50.0%.
-// Formula is 100 - 100 * (5000 + RES) / (5000 + 10 * RES)
-// Note: Best to leave this setting alone unless you know what your doing.
-// Default: 625
-max_res_mres_reduction: 625
+// Max percent of RES/MRES that can be ignored by item bonus/skill.
+// Default: 50
+max_res_mres_ignored: 50

 // Maximum AP
 // Default: 1000
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -270,8 +270,10 @@ allow_skill_without_day: no
 // Allow use of ES-type magic on players?
 allow_es_magic_player: no

-// Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
-sg_miracle_skill_ratio: 2
+// Miracle of the Sun, Moon and Stars skill ratio
+// Valid values range from 1 (0.005% per hit) to 20000 (100% per hit)
+// This chance is further reduced if AGI is above 46 (92 = halved chance)
+sg_miracle_skill_ratio: 1

 // Miracle of the Sun, Moon and Stars skill duration in milliseconds
 sg_miracle_skill_duration: 3600000
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -8,6 +8,9 @@
 //General battle-related settings.
 import: conf/battle/battle.conf

+//Battleground settings
+import: conf/battle/battleground.conf
+
 //Settings specific to the client.
 import: conf/battle/client.conf

@@ -17,14 +20,20 @@ import: conf/battle/drops.conf
 //Experience rates, exp penalties, stats and max level settings.
 import: conf/battle/exp.conf

+//Feature control (on/off) settings
+import: conf/battle/feature.conf
+
 //GM levels, atcommands and hack-related configs.
 import: conf/battle/gm.conf

 //Guild and WoE settings
 import: conf/battle/guild.conf

-//Battleground settings
-import: conf/battle/battleground.conf
+//Homunc related configuration
+import: conf/battle/homunc.conf
+
+//Instance settings
+import: conf/battle/instance.conf

 //Item/card-specific and crafting related options.
 import: conf/battle/items.conf
@@ -32,15 +41,16 @@ import: conf/battle/items.conf
 //Mob related configuration
 import: conf/battle/monster.conf

+// Anything else that didn't fit anywhere else.
+// Includes duel, day/night, mute/manner, log settings.
+import: conf/battle/misc.conf
+
 //Party related configuration
 import: conf/battle/party.conf

 //Pet related configuration
 import: conf/battle/pet.conf

-//Homunc related configuration
-import: conf/battle/homunc.conf
-
 //Player specific settings
 import: conf/battle/player.conf

@@ -50,12 +60,5 @@ import: conf/battle/skill.conf
 //Status change related settings
 import: conf/battle/status.conf

-//Feature control (on/off) settings
-import: conf/battle/feature.conf
-
-// Anything else that didn't fit anywhere else.
-// Includes duel, day/night, mute/manner, log settings.
-import: conf/battle/misc.conf
-
 //Your custom config goes here.
 import: conf/import/battle_conf.txt
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -144,6 +144,10 @@ unknown_char_name: Unknown
 // To log the character server?
 log_char: yes

+// Minimum length for a character name.
+// Must be set to '4' unless your client uses the 'Remove 4/6 letter Character Name limit' diff patch.
+char_name_min_length: 4
+
 // Allow or not identical name for characters but with a different case (upper/lower):
 // example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
 name_ignoring_case: no
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -55,9 +55,15 @@ console: off
 // Note: This only works if client side password encryption is not enabled.
 new_account: no

-//If new_account is enabled, minimum length to userid and passwords should be 4?
-//Must be 'Yes' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
-new_acc_length_limit: yes
+// If new_account is enabled, changes the minimum length for the account name.
+// By default is set to '4' or '6' (depending on the new login UI).
+// Don't change it unless your client uses the 'Remove 4/6 letter User Name limit' diff patch.
+//acc_name_min_length: 6
+
+// If new_account is enabled, changes the minimum length for the password.
+// By default is set to '4' or '6' (depending on the new login UI).
+// Don't change it unless your client uses the 'Remove 4/6 letter Password limit' diff patch.
+//password_min_length: 6

 // Account registration flood protection system
 // allowed_regs is the number of registrations allowed in time_allowed (in seconds)
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1634,5 +1634,8 @@ map: luna_sf1
 map: luna_sf2
 map: mbase_in

+// Market place
+map: prt_mk
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -775,7 +775,7 @@
 730: Character cannot be disguised while in monster form.
 731: Transforming into monster is not allowed in Guild Wars.

-732: Item cannot be opened when your inventory is full.
+//732: Free

 733: Please enter a NPC file name (usage: @reloadnpcfile <file name>).

@@ -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
--- a/conf/msg_conf/map_msg_chn.conf
+++ b/conf/msg_conf/map_msg_chn.conf
@@ -871,9 +871,9 @@
 // @mapinfo
 1038: 請至少輸入一個有效的列表數字 (使用方法: @mapinfo <0-3> [地圖名稱])
 1039: ------ 地圖資訊 ------
-1040: 地圖名: %s | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d
+1040: 地圖名: %s (Zone: %s) | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d | Vendings: %d
 1041: ------ 地圖旗標 ------
-1042: 城市地圖
+1042: Damage Rate Adjustments:
 1043: 可離線掛店
 1044: 不可離線掛店
 1045: 戰場 (類型 %d)
--- a/conf/msg_conf/map_msg_frn.conf
+++ b/conf/msg_conf/map_msg_frn.conf
@@ -883,9 +883,9 @@
 // @mapinfo
 1038: Entrez un numéro de la liste (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Nom de la Map: %s | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d
+1040: Nom de la Map: %s (Zone: %s) | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Damage Rate Adjustments:
 1043: Autotrade Activé
 1044: Autotrade Désactivé
 1045: Battlegrounds ON (type %d)
--- a/conf/msg_conf/map_msg_idn.conf
+++ b/conf/msg_conf/map_msg_idn.conf
@@ -765,7 +765,7 @@
 730: Karakter tidak dapat disguise ketika sedang berwujud monster.
 731: Perubahan menjadi monster tidak diizinkan dalam Guild Wars.

-732: Item tidak dapat dibuka ketika inventory penuh.
+//732: Free

 //733 free

@@ -970,9 +970,9 @@
 // @mapinfo
 1038: Harap masukkan setidaknya 1 pilihan. (Penggunaan: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
+1040: Map: %s (Zone: %s) | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
 1041: ------ Map Flags ------
-1042: Kota
+1042: Damage Rate Adjustments:
 1043: Autotrade diaktifkan
 1044: Autotrade dinonaktifkan
 1045: Battleground ON (tipe %d)
--- a/conf/msg_conf/map_msg_por.conf
+++ b/conf/msg_conf/map_msg_por.conf
@@ -779,7 +779,7 @@
 730: O personagem não pode ser disfarçado enquanto estiver em forma de monstro.
 731: Transformar em monstro não é permitido em GvG.

-732: O item não pode ser aberto quando o seu inventário está cheio.
+//732: Free

 733: Por favor insira um nome de arquivo NPC (uso: @reloadnpcfile <nome do arquivo>).

@@ -1052,9 +1052,9 @@
 // @mapinfo
 1038: Digite pelo menos um número válido da lista (uso: @mapinfo <0-3> <mapa>).
 1039: ------ Informação do Mapa ------
-1040: Mapa: %s | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
+1040: Mapa: %s (Zona: %s) | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
 1041: ------ Map Flags ------
-1042: Mapa de Cidade
+1042: Ajustes na taxa de dano:
 1043: Autotrade Habilitado
 1044: Autotrade Desabilitado
 1045: Battlegrounds Habilitado (tipo %d)
--- a/conf/msg_conf/map_msg_rus.conf
+++ b/conf/msg_conf/map_msg_rus.conf
@@ -884,9 +884,9 @@
 // @mapinfo
 1038: Введите хотя бы один номер (Использование: @mapinfo <0-3> <локация>).
 1039: ------ Информация о локации ------
-1040: Название локации: %s | Игроки: %d | НИП: %d | Чаты: %d
+1040: Название локации: %s (Zone: %s) | Игроки: %d | НИП: %d | Чаты: %d | Vendings: %d
 1041: ------ Мапфлаги ------
-1042: Столица
+1042: Damage Rate Adjustments:
 1043: Autotrade Разрешён
 1044: Autotrade Запрещён
 1045: Battlegrounds ВКЛЮЧЕНО (тип %d)
--- a/conf/msg_conf/map_msg_spn.conf
+++ b/conf/msg_conf/map_msg_spn.conf
@@ -775,7 +775,7 @@
 730: El personaje no puede disfrazarse si está transformado en un monstruo.
 731: No puedes transformarte en monstruo durante la guerra de clanes.

-732: No puedes abrir el objeto porque tu inventario está lleno.
+//732: libre

 733: Introduce la ruta de archivo de un NPC (instrucciones: @reloadnpcfile <ruta>).

@@ -1124,9 +1124,9 @@
 // @mapinfo
 1038: Introduce un número de la lista (instrucciones: @mapinfo <0-3> <mapa>).
 1039: ------ Información del mapa ------
-1040: Mapa: %s | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
+1040: Mapa: %s (Zona: %s) | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
 1041: ------ Opciones del mapa ------
-1042: Mapa de ciudad
+1042: Ajuste de ratios de daño:
 1043: Autotrade activado
 1044: Autotrade desactivado
 1045: Battleground activado (tipo %d)
--- a/conf/msg_conf/map_msg_tha.conf
+++ b/conf/msg_conf/map_msg_tha.conf
@@ -877,9 +877,9 @@
 // @mapinfo
 1038: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>א<EFBFBD>¢<EFBFBD><C2A2>ט<EFBFBD>§<EFBFBD>¹ט<C2B9><D798><EFBFBD>¹<EFBFBD>ט§¤ט<C2A4>¨<EFBFBD><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>¸<EFBFBD>ד×י: @mapinfo <0-3> <map>).
 1039: ------ <20><><EFBFBD><EFBFBD><EFBFBD>א<EFBFBD><D790><EFBFBD>´ב¼¹·<C2B9>ט ------
-1040: ב¼¹·<C2B9>ט: %s | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: ב¼¹·<C2B9>ט: %s (Zone: %s) | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Town Map
+1042: Damage Rate Adjustments:
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)
--- a/db/import-tmpl/item_noequip.txt
+++ b/db/import-tmpl/item_noequip.txt
@@ -1,30 +0,0 @@
-// Forbidden Items Database
-// Defines restrictions on equipment, items, and cards in map types and zones.
-//
-// Structure of Database:
-// ItemID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-//
-// Passing negative value as flag will unset the flag instead.
-//
-// Examples:
-// 1201,1   // Knife can't be worn on normal maps
-// 608,4    // Yggdrasil Seed can't be consumed in both GvG and WoE Castles
-// 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
-// 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
-// 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
-// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
-
--- a/db/import-tmpl/job_noenter_map.txt
+++ b/db/import-tmpl/job_noenter_map.txt
@@ -1,28 +0,0 @@
-// Defines Job(s) that are restricted to enter map (by flag/zones)
-//
-// Structure of Database:
-// JobID,FlagZone,GroupLevelBypass
-//
-// JobID: See JOB_* constants or use job number
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
-//
-// NOTES:
-// - Restriction will be overwritten for multiple defines with the same Job ID
-// - The flag is used by 'jobcanentermap' script.
--- a/db/import-tmpl/map_zones.yml
+++ b/db/import-tmpl/map_zones.yml
@@ -0,0 +1,39 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2024 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http:#www.gnu.org/licenses/>.
+#
+###########################################################################
+# Map Zone Database
+###########################################################################
+#
+# Map Zone Settings
+#
+###########################################################################
+# - Id                        Zone ID.
+#   DisabledCommands:         List of disabled @commands. (Default: null)
+#   DisabledSkills:           List of disabled skills. (Default: null)
+#   DisabledItems:            List of disabled items. (Default: null)
+#   DisabledStatuses:         List of disabled statuses. (Default: null)
+#   RestrictedJobs:           List of restricted jobs from entering zone. (Default: null)
+#   Maps:                     List of maps to apply the zone to.
+#   Mapflags:                 List of mapflags. (Default: null)
+#     - Flag                  Mapflag name.
+#       Value                 Value assigned to mapflag. (Default: true)
+###########################################################################
+
+Header:
+  Type: MAP_ZONES
+  Version: 1
--- a/db/import-tmpl/mob_summon.yml
+++ b/db/import-tmpl/mob_summon.yml
@@ -33,3 +33,24 @@ Header:
  Type: MOB_SUMMONABLE_DB
  Version: 1

+#Body:
+# Pre-re Brasilis
+#=============================================================
+#  - Group: BLOODY_DEAD_BRANCH
+#    Summon:
+#      - Mob: BOITATA
+#        Rate: 1000000
+#  - Group: Branch_Of_Dead_Tree
+#    Summon:
+#      - Mob: IARA
+#        Rate: 71428
+#      - Mob: PIRANHA
+#        Rate: 71428
+#      - Mob: HEADLESS_MULE
+#        Rate: 71428
+#      - Mob: JAGUAR
+#        Rate: 71428
+#      - Mob: TOUCAN
+#        Rate: 71428
+#      - Mob: CURUPIRA
+#        Rate: 71428
--- a/db/import-tmpl/skill_nocast_db.txt
+++ b/db/import-tmpl/skill_nocast_db.txt
@@ -1,24 +0,0 @@
-// Forbidden Skills Database
-// Defines unusable skills in map types and zones.
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - cannot be used in normal maps
-// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-// 4    - cannot be used in GvG maps
-// 8    - cannot be used in Battleground maps
-// 16   - cannot be cloned (clones will not copy this skill)
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - cannot be used in zone 1 maps
-// 64   - cannot be used in zone 2 maps
-// 128  - cannot be used in zone 3 maps
-// 256  - cannot be used in zone 4 maps
-// 512  - cannot be used in zone 5 maps
-// 1024 - cannot be used in zone 6 maps
-// 2048 - cannot be used in zone 7 maps
-//
-// Example:
-// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
-
--- a/db/import-tmpl/status_disabled.txt
+++ b/db/import-tmpl/status_disabled.txt
@@ -1,25 +0,0 @@
-// Status Change Restriction Database
-//
-// Defines restrictions of status changes (SC).
-// Disabled SC will always be removed or fail to be inflicted on this map.
-//
-// Structure of Database:
-// SCType,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-//
-// Example:
-// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
-
--- a/db/map_cache.dat
+++ b/db/map_cache.dat
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1260,6 +1260,7 @@ jor_tmple2
 luna_sf1
 luna_sf2
 mbase_in
+prt_mk

 //======================================================================================
 // - Other/Extra maps -
--- a/db/map_zones.yml
+++ b/db/map_zones.yml
@@ -0,0 +1,47 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2024 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http:#www.gnu.org/licenses/>.
+#
+###########################################################################
+# Map Zone Database
+###########################################################################
+#
+# Map Zone Settings
+#
+###########################################################################
+# - Id                        Zone ID.
+#   DisabledCommands:         List of disabled @commands. (Default: null)
+#   DisabledSkills:           List of disabled skills. (Default: null)
+#   DisabledItems:            List of disabled items. (Default: null)
+#   DisabledStatuses:         List of disabled statuses. (Default: null)
+#   RestrictedJobs:           List of restricted jobs from entering zone. (Default: null)
+#   Maps:                     List of maps to apply the zone to.
+#   Mapflags:                 List of mapflags. (Default: null)
+#     - Flag                  Mapflag name.
+#       Value                 Value assigned to mapflag. (Default: true)
+###########################################################################
+
+Header:
+  Type: MAP_ZONES
+  Version: 1
+
+Footer:
+  Imports:
+  - Path: db/pre-re/map_zones.yml
+    Mode: Prerenewal
+  - Path: db/re/map_zones.yml
+    Mode: Renewal
+  - Path: db/import/map_zones.yml
--- a/db/pre-re/item_db_usable.yml
+++ b/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
@@ -8637,21 +8637,21 @@ Body:
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10,0;
+      searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
  - Id: 12581
    AegisName: Vending_Search_Scroll2
    Name: Universal Catalog Gold
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10,1;
+      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
  - Id: 12591
    AegisName: Uni_Catalog_Bz
    Name: Universal Catalog Bronze
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10,1;
+      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
  - Id: 12609
    AegisName: Old_Ore_Box
    Name: Old Ore Box
--- a/db/pre-re/item_noequip.txt
+++ b/db/pre-re/item_noequip.txt
@@ -1,83 +0,0 @@
-// Forbidden Items Database
-// Defines restrictions on equipment, items, and cards in map types and zones.
-//
-// Structure of Database:
-// ItemID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// Passing negative value as flag will unset the flag instead.
-//
-// Examples:
-// 1201,1   // Knife can't be worn on normal maps
-// 608,4    // Yggdrasil Seed can't be consumed in both GvG and WoE Castles
-// 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
-// 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
-// 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
-// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
-
-//----------------------------------------------------------------------------
-// Normal maps
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// PVP
-//----------------------------------------------------------------------------
-14529,2	//Greed_Scroll
-
-//----------------------------------------------------------------------------
-// GVG
-//----------------------------------------------------------------------------
-12218,4	//Assumptio_5_Scroll
-14529,4	//Greed_Scroll
-14590,4	//Pty_Assumptio_Scroll
-
-//----------------------------------------------------------------------------
-// Battlegrounds
-//----------------------------------------------------------------------------
-12218,8	//Assumptio_5_Scroll
-14590,8	//Pty_Assumptio_Scroll
-
-//----------------------------------------------------------------------------
-// Zone 1 - Aldebaran Turbo Track
-//----------------------------------------------------------------------------
-601,32	//Wing_Of_Fly
-605,32	//Anodyne
-506,32	//Green_Potion
-525,32	//Panacea
-
-//----------------------------------------------------------------------------
-// Zone 2 - Jail
-//----------------------------------------------------------------------------
-601,64	//Wing_Of_Fly
-602,64	//Wing_Of_Butterfly
-12212,64	//Giant_Fly_Wing
-14582,64	//WOB_Rune
-14583,64	//WOB_Schwaltz
-14584,64	//WOB_Rachel
-14585,64	//WOB_Local
-
-//----------------------------------------------------------------------------
-// Zone 3 - Izlude Battle Arena
-//----------------------------------------------------------------------------
-601,128	//Wing_Of_Fly
-
-//----------------------------------------------------------------------------
-// Zone 7 - Towns
-//----------------------------------------------------------------------------
-14529,2048	//Greed_Scroll
--- a/db/pre-re/job_noenter_map.txt
+++ b/db/pre-re/job_noenter_map.txt
@@ -1,28 +0,0 @@
-// Defines Job(s) that are restricted to enter map (by flag/zones)
-//
-// Structure of Database:
-// JobID,FlagZone,GroupLevelBypass
-//
-// JobID: See JOB_* constants or use job number
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
-//
-// NOTES:
-// - Restriction will be overwritten for multiple defines with the same Job ID
-// - The flag is used by 'jobcanentermap' script.
--- a/db/pre-re/map_zones.yml
+++ b/db/pre-re/map_zones.yml
--- a/db/pre-re/pet_db.yml
+++ b/db/pre-re/pet_db.yml
@@ -866,3 +866,14 @@ Body:
        bonus2 bSubEle,Ele_Fire,2;
        bonus2 bAddEle,Ele_Fire,2;
      }
+  - Mob: E_HYDRA
+    TameItem: Leaf_Cat_Ball
+    EggItem: Mystic_Leaf_Cat_Ball
+    Fullness: 0
+    HungryDelay: 0
+    IntimacyStart: 0
+    IntimacyFed: 0
+    IntimacyOverfed: 0
+    IntimacyOwnerDie: 0
+    CaptureRate: 50
+    SpecialPerformance: false
--- a/db/pre-re/skill_db.yml
+++ b/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:
@@ -7359,7 +7369,7 @@ Body:
        Time: 1500
      - Level: 5
        Time: 1000
-    Duration2: 300000
+    Duration1: 300000
    Requires:
      SpCost: 1
      Weapon:
@@ -8538,6 +8548,7 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
+    Duration1: 15000
    Duration2: 12000
    Requires:
      SpCost:
@@ -8829,6 +8840,7 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
+    Duration1: 5000
    Duration2: 5000
    Requires:
      SpCost:
@@ -30724,10 +30736,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Range: 9
-    Hit: Single
-    HitCount: 1
    AfterCastActDelay: 2000
+    AfterCastWalkDelay: 1000
    Requires:
      SpCost:
        - Level: 1
@@ -30750,11 +30760,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-      Splash: true
-    Hit: Single
-    HitCount: 1
-    SplashArea: -1
    AfterCastActDelay: 35000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@@ -30783,7 +30790,6 @@ Body:
    Name: HLIF_BRAIN
    Description: Brain Surgery
    MaxLevel: 5
-    SplashArea: 1
  - Id: 8004
    Name: HLIF_CHANGE
    Description: Change
@@ -30791,7 +30797,14 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
+    AfterCastActDelay:
+      - Level: 1
+        Time: 600000
+      - Level: 2
+        Time: 900000
+      - Level: 3
+        Time: 1200000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -30799,13 +30812,6 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Duration2:
-      - Level: 1
-        Time: 600000
-      - Level: 2
-        Time: 900000
-      - Level: 3
-        Time: 1200000
    Requires:
      SpCost: 100
    Status: Change
@@ -30816,8 +30822,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
-    Duration2: 1000
+    AfterCastActDelay: 1000
+    AfterCastWalkDelay: 1000
    Requires:
      SpCost: 10
  - Id: 8006
@@ -30827,8 +30833,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
    AfterCastActDelay: 30000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@@ -30857,8 +30863,6 @@ Body:
    Name: HAMI_SKIN
    Description: Adamantium Skin
    MaxLevel: 5
-    DamageFlags:
-      NoDamage: true
  - Id: 8008
    Name: HAMI_BLOODLUST
    Description: Bloodlust
@@ -30866,7 +30870,14 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
+    AfterCastActDelay:
+      - Level: 1
+        Time: 300000
+      - Level: 2
+        Time: 600000
+      - Level: 3
+        Time: 900000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -30874,13 +30885,6 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Duration2:
-      - Level: 1
-        Time: 300000
-      - Level: 2
-        Time: 600000
-      - Level: 3
-        Time: 900000
    Requires:
      SpCost: 120
    Status: Bloodlust
@@ -30903,7 +30907,6 @@ Body:
        Count: -2
      - Level: 5
        Count: -3
-    AfterCastWalkDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@@ -30924,6 +30927,18 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
+    AfterCastActDelay:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 120000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -30935,17 +30950,6 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Duration2:
-      - Level: 1
-        Time: 60000
-      - Level: 2
-        Time: 70000
-      - Level: 3
-        Time: 80000
-      - Level: 4
-        Time: 90000
-      - Level: 5
-        Time: 120000
    Requires:
      SpCost:
        - Level: 1
@@ -30969,6 +30973,18 @@ Body:
      NoDamage: true
    Hit: Single
    CastCancel: true
+    AfterCastActDelay:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 120000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -30980,17 +30996,6 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Duration2:
-      - Level: 1
-        Time: 60000
-      - Level: 2
-        Time: 70000
-      - Level: 3
-        Time: 80000
-      - Level: 4
-        Time: 90000
-      - Level: 5
-        Time: 120000
    Requires:
      SpCost:
        - Level: 1
@@ -31013,7 +31018,6 @@ Body:
    Range: 15
    Hit: Single
    HitCount: 1
-    AfterCastActDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8013
@@ -31035,17 +31039,6 @@ Body:
        Count: 4
      - Level: 5
        Count: 5
-    AfterCastActDelay:
-      - Level: 1
-        Time: 2000
-      - Level: 2
-        Time: 2200
-      - Level: 3
-        Time: 2400
-      - Level: 4
-        Time: 2600
-      - Level: 5
-        Time: 2800
    Requires:
      SpCost:
        - Level: 1
@@ -31066,8 +31059,7 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastActDelay: 3000
-    AfterCastWalkDelay: 3000
+    AfterCastWalkDelay: 1500
    Requires:
      SpCost: 40
  - Id: 8015
@@ -31091,7 +31083,6 @@ Body:
    HitCount: 1
    Element: Weapon
    SplashArea: 4
-    AfterCastWalkDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8018
--- a/db/pre-re/skill_nocast_db.txt
+++ b/db/pre-re/skill_nocast_db.txt
@@ -1,176 +0,0 @@
-// Forbidden Skills Database
-// Defines unusable skills in map types and zones.
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - cannot be used in normal maps
-// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-// 4    - cannot be used in GvG maps
-// 8    - cannot be used in Battleground maps
-// 16   - cannot be used in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - cannot be used in zone 1 maps
-// 64   - cannot be used in zone 2 maps
-// 128  - cannot be used in zone 3 maps
-// 256  - cannot be used in zone 4 maps
-// 512  - cannot be used in zone 5 maps
-// 1024 - cannot be used in zone 6 maps
-// 2048 - cannot be used in zone 7 maps
-// 4096 - cannot be used in zone 8 maps
-//
-// Example:
-// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
-
-//----------------------------------------------------------------------------
-// Normal
-//----------------------------------------------------------------------------
-2422,1	//WM_LULLABY_DEEPSLEEP
-2423,1	//WM_SIRCLEOFNATURE
-2430,1	//WM_SATURDAY_NIGHT_FEVER
-2455,1	//SO_ARRULLO
-
-//----------------------------------------------------------------------------
-// PVP
-//----------------------------------------------------------------------------
-1013,2	//BS_GREED
-
-//----------------------------------------------------------------------------
-// GVG
-//----------------------------------------------------------------------------
-26,4	//AL_TELEPORT
-27,4	//AL_WARP
-87,4	//WZ_ICEWALL
-150,4	//TF_BACKSLIDING
-219,4	//RG_INTIMIDATE
-336,4	//WE_CALLPARTNER
-361,4	//HP_ASSUMPTIO
-362,4	//HP_BASILICA
-395,4	//CG_MOONLIT
-409,4	//WE_CALLPARENT
-410,4	//WE_CALLBABY
-491,4	//CR_CULTIVATION
-530,4	//NJ_KIRIKAGE
-691,4	//CASH_ASSUMPTIO
-1013,4	//BS_GREED
-2300,4	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Battlegrounds
-//----------------------------------------------------------------------------
-26,8	//AL_TELEPORT
-27,8	//AL_WARP
-87,8	//WZ_ICEWALL
-150,8	//TF_BACKSLIDING
-219,8	//RG_INTIMIDATE
-264,8	//MO_BODYRELOCATION
-336,8	//WE_CALLPARTNER
-361,8	//HP_ASSUMPTIO
-362,8	//HP_BASILICA
-395,8	//CG_MOONLIT
-409,8	//WE_CALLPARENT
-410,8	//WE_CALLBABY
-491,8	//CR_CULTIVATION
-411,8	//TK_RUN
-426,8	//TK_HIGHJUMP
-427,8	//SG_FEEL
-428,8	//SG_SUN_WARM
-429,8	//SG_MOON_WARM
-430,8	//SG_STAR_WARM
-431,8	//SG_SUN_COMFORT
-432,8	//SG_MOON_COMFORT
-433,8	//SG_STAR_COMFORT
-434,8	//SG_HATE
-435,8	//SG_SUN_ANGER
-436,8	//SG_MOON_ANGER
-437,8	//SG_STAR_ANGER
-438,8	//SG_SUN_BLESS
-439,8	//SG_MOON_BLESS
-440,8	//SG_STAR_BLESS
-530,8	//NJ_KIRIKAGE
-691,8	//CASH_ASSUMPITO
-2300,8	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Mixed
-//----------------------------------------------------------------------------
-488,3	//CG_HERMODE
-3013,3	//KO_KYOUGAKU
-
-//----------------------------------------------------------------------------
-// Zone 1 - Aldebaran Turbo Track
-//----------------------------------------------------------------------------
-8,32	//SM_ENDURE
-26,32	//AL_TELEPORT
-27,32	//AL_WARP
-35,32	//AL_CURE
-51,32	//TF_HIDING
-87,32	//WZ_ICEWALL
-135,32	//AS_CLOAKING
-219,32	//RG_INTIMIDATE
-264,32	//MO_BODYRELOCATION
-357,32	//LK_CONCENTRATION
-359,32	//LK_BERSERK
-362,32	//HP_BASILICA
-387,32	//WS_CARTBOOST
-389,32	//ST_CHASEWALK
-395,32	//CG_MOONLIT
-2300,32	//SC_DIMENSIONDOOR
-2478,32	//GN_CARTBOOST
-
-//----------------------------------------------------------------------------
-// Zone 2 - Jail
-//----------------------------------------------------------------------------
-421,64	//TK_JUMPKICK
-426,64	//TK_HIGHJUMP
-
-//----------------------------------------------------------------------------
-// Zone 3 - Izlude Battle Arena
-//----------------------------------------------------------------------------
-219,128 //RG_INTIMIDATE
-26,128	//AL_TELEPORT
-2300,128	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 4 - WoE:SE
-//----------------------------------------------------------------------------
-426,256 //TK_HIGHJUMP
-290,256	//SA_ABRACADABRA
-
-//----------------------------------------------------------------------------
-// Zone 5 - Sealed Shrine
-//----------------------------------------------------------------------------
-12,512	//MG_SAFETYWALL
-26,512	//AL_TELEPORT
-219,512	//RG_INTIMIDATE
-361,512	//HP_ASSUMPTIO
-691,512	//CASH_ASSUMPTIO
-2294,512	//SC_IGNORANCE
-2300,512	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
-//----------------------------------------------------------------------------
-26,1024	//AL_TELEPORT
-87,1024	//WZ_ICEWALL
-219,1024	//RG_INTIMIDATE
-405,1024	//PF_SPIDERWEB
-674,1024	//NPC_EXPULSION
-2294,1024	//SC_IGNORANCE
-2300,1024	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 7 - Towns
-//----------------------------------------------------------------------------
-232,2048	//AM_CANNIBALIZE
-233,2048	//AM_SPHEREMINE
-491,2048	//CR_CULTIVATION
-1013,2048	//BS_GREED
-2299,2048	//SC_MANHOLE
-2300,2048	//SC_DIMENSIONDOOR
-2301,2048	//SC_CHAOSPANIC
-2303,2048	//SC_BLOODYLUST
-2419,2048	//WM_POEMOFNETHERWORLD
-2482,2048	//GN_WALLOFTHORN
-2493,2048	//GN_SLINGITEM
--- a/db/pre-re/statpoint.yml
+++ b/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
--- a/db/pre-re/status.yml
+++ b/db/pre-re/status.yml
@@ -2478,13 +2478,17 @@ Body:
    DurationLookup: HLIF_AVOID
    CalcFlags:
      Speed: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnWarp: true
  - Status: Change
    DurationLookup: HLIF_CHANGE
    CalcFlags:
      Vit: true
      Int: true
    Flags:
-      RemoveOnChangeMap: true
+      NoSave: true
+      RemoveFromHomOnWarp: true
    Fail:
      Change: true
  - Status: Bloodlust
@@ -2492,6 +2496,9 @@ Body:
    CalcFlags:
      Batk: true
      Watk: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnWarp: true
  - Status: Fleet
    DurationLookup: HFLI_FLEET
    CalcFlags:
@@ -2506,6 +2513,10 @@ Body:
    DurationLookup: HAMI_DEFENCE
    CalcFlags:
      Def: true
+      Vit: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnWarp: true
  - Status: Incaspdrate
    CalcFlags:
      Aspd: true
@@ -3963,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
--- a/db/re/enchantgrade.yml
+++ b/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:
--- a/db/re/instance_db.yml
+++ b/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
--- a/db/re/item_combos.yml
+++ b/db/re/item_combos.yml
@@ -20852,25 +20852,6 @@ Body:
         bonus bMdef,3*.@r_shoes;
         bonus bMatk,5*.@r;
      }
-  - Combos:
-      - Combo:
-          - Hollow_Shoes
-          - Berzebub_Card
-    Script: |
-      .@r = getrefine();
-      skill "PR_MAGNUS",10;
-      bonus2 bMagicAddRace,RC_Undead,30;
-      bonus2 bMagicAddRace,RC_Demon,30;
-      bonus2 bMagicAddEle,Ele_Dark,30;
-      bonus2 bMagicAddEle,Ele_Undead,30;
-      if (BaseLevel >= 100) {
-         bonus bMatk,15*.@r;
-         bonus bVariableCastrate,-7*.@r;
-      }
-      else {
-         bonus bMatk,5*.@r;
-         bonus bVariableCastrate,-2*.@r;
-      }
  - Combos:
      - Combo:
          - Astraea_Ring
@@ -21746,7 +21727,7 @@ Body:
      if (.@sum >= 27) {
         bonus3 bAutoSpell,"HW_NAPALMVULCAN",5,80;
      }
-      else if (.@sum >= 27) {
+      else if (.@sum >= 21) {
         bonus3 bAutoSpell,"HW_NAPALMVULCAN",3,40;
      }
  - Combos:
@@ -21760,7 +21741,7 @@ Body:
      if (.@sum >= 27) {
         bonus3 bAutoSpell,"AS_SONICBLOW",10,80;
      }
-      else if (.@sum >= 27) {
+      else if (.@sum >= 21) {
         bonus3 bAutoSpell,"AS_SONICBLOW",7,40;
      }
  - Combos:
@@ -21770,10 +21751,10 @@ Body:
    Script: |
      .@sum = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES);
      bonus bMatkRate,2;
-      if (.@sum >= 27) {
+      if (.@sum >= 20) {
         bonus3 bAutoSpell,"WL_JACKFROST",max(getskilllv("WL_JACKFROST"),4),80;
      }
-      else if (.@sum >= 27) {
+      else if (.@sum >= 18) {
         bonus3 bAutoSpell,"WL_JACKFROST",max(getskilllv("WL_JACKFROST"),2),40;
      }
  - Combos:
@@ -28403,7 +28384,7 @@ Body:
      bonus bVariableCastrate,-10;
  - Combos:
      - Combo:
-          - aegis_490220   # 490220
+          - Hero_Token_HN   # 490220
          - Blessed_Knife_LT   # 510072
    Script: |
      bonus2 bAddSize,Size_All,15;
@@ -28418,7 +28399,7 @@ Body:
      }
  - Combos:
      - Combo:
-          - aegis_490220   # 490220
+          - Hero_Token_HN   # 490220
          - Freedom_Stick_LT   # 550082
    Script: |
      bonus2 bMagicAddSize,Size_All,15;
@@ -46539,6 +46520,7 @@ Body:
    Script: |
      bonus2 bAddEle,Ele_All,20;
      bonus bAspdRate,5;
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",40;
      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",40;
      bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",20;
  - Combos:
@@ -47407,6 +47389,7 @@ Body:
    Script: |
      bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",25;
      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",25;
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",25;
      bonus2 bSubRace,RC_Player_Human,10;
      bonus2 bSubRace,RC_Player_Doram,10;
  - Combos:
@@ -50872,14 +50855,6 @@ Body:
      bonus bMaxHP,2000;
      bonus bMaxSP,200;
      bonus bHealPower,15;
-  - Combos:
-      - Combo:
-          - aegis_311883    # 311883
-          - aegis_410302    # 410302
-    Script: |
-      bonus bSpeedRate,25;
-      bonus2 bSubRace,RC_Player_Human,5;
-      bonus2 bSubRace,RC_Player_Doram,5;
  - Combos:
      - Combo:
          - R001_Bestia_Card    # 300281
@@ -51483,12 +51458,6 @@ Body:
         bonus bMatk,15*.@eq;
         bonus bVariableCastrate,-7*.@eq;
      }
-  - Combos:
-      - Combo:
-          - Berzebub_Card    # 4145
-          - VesperHeadGear    # 19436
-    Script: |
-      bonus bVariableCastrate,30;
  - Combos:
      - Combo:
          - Preschool_Hat    # 18860
@@ -52035,3 +52004,206 @@ Body:
          - Ignis_Cap    # 18651
    Script: |
      bonus bAspdRate,getequiprefinerycnt(EQI_HEAD_TOP)/2;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_TR   # 400673
+          - MetalVilolin_Furious   # 570072
+      - Combo:
+          - FuriousCirclet_TR   # 400673
+          - MetalWhip_Furious   # 580072
+    Script: |
+      bonus2 bMagicAddRace,RC_All,10;
+      bonus2 bMagicAddRace,RC_Player_Human,-10;
+      bonus2 bMagicAddRace,RC_Player_Doram,-10;
+      bonus2 bSkillAtk,"WM_REVERBERATION",35;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_TR   # 400673
+          - Harp_Furious   # 570073
+      - Combo:
+          - FuriousCirclet_TR   # 400673
+          - Whip_Furious   # 580073
+    Script: |
+      bonus2 bAddRace,RC_All,10;
+      bonus2 bAddRace,RC_Player_Human,-10;
+      bonus2 bAddRace,RC_Player_Doram,-10;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_BO   # 400674
+          - Lapier_Furious   # 500101
+    Script: |
+      bonus2 bSkillCooldown,"BO_EXPLOSIVE_POWDER",-120;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_BO   # 400674
+          - SharpSword_Furious   # 500102
+    Script: |
+      bonus2 bSkillCooldown,"BO_MAYHEMIC_THORNS",-120;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_HN   # 400675
+          - WhiteSword_Furious   # 500103
+    Script: |
+      bonus2 bSkillCooldown,"HN_DOUBLEBOWLINGBASH",-150;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_HN   # 400675
+          - Stick_Furious   # 550148
+    Script: |
+      bonus2 bSkillCooldown,"HN_JUPITEL_THUNDER_STORM",-250;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_AG   # 400694
+          - Specter_Furious   # 550150
+    Script: |
+      bonus2 bMagicAddRace,RC_All,10;
+      bonus2 bMagicAddRace,RC_Player_Human,-10;
+      bonus2 bMagicAddRace,RC_Player_Doram,-10;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_AG   # 400694
+          - Flame_Staff_Furious   # 640053
+    Script: |
+      bonus2 bSkillAtk,"AG_ALL_BLOOM",25;
+      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK",25;
+      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK2",25;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_IQ   # 400695
+          - GaleClaw_Furious   # 560067
+    Script: |
+      bonus2 bSkillCooldown,"IQ_MASSIVE_F_BLASTER",-1200;
+      bonus2 bSkillAtk,"IQ_MASSIVE_F_BLASTER",20;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_IQ   # 400695
+          - Exterminate_Furious   # 560068
+    Script: |
+      bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",25;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_NW   # 400696
+          - Rifle_Furious   # 810042
+    Script: |
+      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",25;
+  - Combos:
+      - Combo:
+          - FuriousCirclet_NW   # 400696
+          - Gatling_Furious   # 830038
+    Script: |
+      bonus2 bAddRace,RC_All,10;
+      bonus2 bAddRace,RC_Player_Human,-10;
+      bonus2 bAddRace,RC_Player_Doram,-10;
+      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",15;
+  - Combos:
+      - Combo:
+          - Lapier_Furious   # 500101
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSkillAtk,"BO_EXPLOSIVE_POWDER",.@sum;
+  - Combos:
+      - Combo:
+          - SharpSword_Furious   # 500102
+          - FuriousBoots   # 470265
+    Script: |
+      bonus bCritAtkRate,15;
+      bonus bCritical,5;
+      if (getenchantgrade()>=ENCHANTGRADE_B) {
+         bonus2 bSkillAtk,"BO_MAYHEMIC_THORNS",15;
+      }
+  - Combos:
+      - Combo:
+          - WhiteSword_Furious   # 500103
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"HN_DOUBLEBOWLINGBASH",.@sum;
+  - Combos:
+      - Combo:
+          - Stick_Furious   # 550148
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"HN_HELLS_DRIVE",20;
+      if (getenchantgrade()>=ENCHANTGRADE_B) {
+         bonus4 bAutoSpellOnSkill,"HN_HELLS_DRIVE","EM_TERRA_DRIVE",4,1000;
+      }
+  - Combos:
+      - Combo:
+          - Specter_Furious   # 550150
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",20;
+  - Combos:
+      - Combo:
+          - GaleClaw_Furious   # 560067
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"IQ_MASSIVE_F_BLASTER",20;
+  - Combos:
+      - Combo:
+          - Exterminate_Furious   # 560068
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",.@sum;
+  - Combos:
+      - Combo:
+          - MetalVilolin_Furious   # 570072
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"WM_REVERBERATION",70;
+      bonus2 bSkillAtk,"TR_METALIC_FURY",20;
+  - Combos:
+      - Combo:
+          - Harp_Furious   # 570073
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",.@sum;
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",.@sum;
+  - Combos:
+      - Combo:
+          - MetalWhip_Furious   # 580072
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"WM_REVERBERATION",70;
+      bonus2 bSkillAtk,"TR_METALIC_FURY",20;
+  - Combos:
+      - Combo:
+          - Whip_Furious   # 580073
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",.@sum;
+      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",.@sum;
+  - Combos:
+      - Combo:
+          - Flame_Staff_Furious   # 640053
+          - FuriousBoots   # 470265
+    Script: |
+      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
+      bonus2 bSkillAtk,"AG_ALL_BLOOM",.@sum;
+      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK",.@sum;
+      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK2",.@sum;
+  - Combos:
+      - Combo:
+          - Rifle_Furious   # 810042
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",25;
+  - Combos:
+      - Combo:
+          - Gatling_Furious   # 830038
+          - FuriousBoots   # 470265
+    Script: |
+      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",25;
+      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",15;
+  - Combos:
+      - Combo:
+          - aegis_300549   # 300549
+          - Sesrumnir_Evt_Ring   # 490557
+    Script: |
+      bonus bShortAtkRate,7;
+      bonus bLongAtkRate,7;
+      bonus2 bMagicAtkEle,Ele_All,7;
--- a/db/re/item_db_equip.yml
+++ b/db/re/item_db_equip.yml
--- a/db/re/item_db_etc.yml
+++ b/db/re/item_db_etc.yml
@@ -14232,7 +14232,7 @@ Body:
    Type: Card
    SubType: Enchant
    Script: |
-      autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ active_transform 1060,5000; specialeffect2 EF_POTION_BERSERK; showscript \"Bigfoot Power !\"; }";
+      autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
    UnEquipScript: |
      heal 0,-300;
  - Id: 4876
@@ -50596,8 +50596,8 @@ Body:
    Script: |
      bonus2 bAddRace,RC_Demon,40;
      bonus2 bAddRace,RC_DemiHuman,40;
-      bonus3 bSubRace,RC_Demon,-30,BF_NORMAL;
-      bonus3 bSubRace,RC_DemiHuman,-30,BF_NORMAL;
+      bonus3 bSubRace,RC_Demon,-30,BF_WEAPON;
+      bonus3 bSubRace,RC_DemiHuman,-30,BF_WEAPON;
  - Id: 300281
    AegisName: R001_Bestia_Card
    Name: R001-Bestia Card
@@ -53760,6 +53760,20 @@ Body:
      bonus bMaxHPrate,-15;
      bonus bPAtk,.@r;
      bonus bAtkRate,.@r;
+  - Id: 300549
+    AegisName: aegis_300549
+    Name: Summer Vacation Pope Card
+    Type: Card
+    Weight: 10
+    Locations:
+      Left_Accessory: true
+    Flags:
+      BuyingStore: true
+      DropEffect: CLIENT
+    Script: |
+      bonus bShortAtkRate,3;
+      bonus bLongAtkRate,3;
+      bonus2 bMagicAtkEle,Ele_All,3;
  - Id: 310000
    AegisName: Ranger_Top2
    Name: Sniper Stone II (Top)
@@ -83045,6 +83059,42 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
+  - Id: 1000284
+    AegisName: EpisodClear13
+    Name: Eps 13 Clear Ticket
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1000285
+    AegisName: EpisodClear14
+    Name: Eps 14 Clear Ticket
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1000286
+    AegisName: EpisodClear15
+    Name: Eps 15 Clear Ticket
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 1000287
    AegisName: EpisodClear17
    Name: Episode 17 Clear Ticket
@@ -86150,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
@@ -86186,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
@@ -86228,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
@@ -86246,7 +86296,7 @@ Body:
    Buy: 1600
    Weight: 10
  - Id: 1001088
-    AegisName: aegis_1001088
+    AegisName: Fresh_Pear
    Name: Fresh Pear
    Type: Etc
    Buy: 1640
@@ -89781,6 +89831,402 @@ Body:
    Weight: 1
    Flags:
      BuyingStore: true
+  - Id: 1001689
+    AegisName: R_Snowflower_Armor
+    Name: Printed Snow Flower Armor
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001690
+    AegisName: R_Snowflower_Manteau
+    Name: Printed Snow Flower Manteau
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001691
+    AegisName: R_Snowflower_Boots
+    Name: Printed Snow Flower Boots
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001692
+    AegisName: R_Snowflower_Pendant
+    Name: Printed Snow Flower Pendant
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001693
+    AegisName: R_Snowflower_Necklace
+    Name: Printed Snow Flower Necklace
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001694
+    AegisName: R_Snowflower_Robe
+    Name: Printed Snow Flower Robe
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001695
+    AegisName: R_Snowflower_Muffler
+    Name: Printed Snow Flower Muffler
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001696
+    AegisName: R_Snowflower_Shoes
+    Name: Printed Snow Flower Shoes
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001697
+    AegisName: R_Snowflower_Ring
+    Name: Printed Snow Flower Ring
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001698
+    AegisName: R_Snowflower_Earring
+    Name: Printed Snow Flower Earring
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001699
+    AegisName: R_Glacier_T_Sword
+    Name: Printed Glacier Two-handed Sword
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001700
+    AegisName: R_Glacier_Lance
+    Name: Printed Glacier Lance
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001701
+    AegisName: R_Glacier_Sword
+    Name: Printed Glacier Sword
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001702
+    AegisName: R_Glacier_B_Sword
+    Name: Printed Glacier Basic Sword
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001703
+    AegisName: R_Glacier_Spear
+    Name: Printed Glacier Spear
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001704
+    AegisName: R_Glacier_T_Axe
+    Name: Printed Glacier Mechanic Axe
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001705
+    AegisName: R_Glacier_Axe
+    Name: Printed Glacier Axe
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001706
+    AegisName: R_Glacier_Mace
+    Name: Printed Glacier Mace
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001707
+    AegisName: R_Glacier_M_Mace
+    Name: Printed Glacier Mechanic Mace
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001708
+    AegisName: R_Glacier_R_Knife
+    Name: Printed Glacier Rogue Knife
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001709
+    AegisName: R_Glacier_B_Knife
+    Name: Printed Glacier Basic Knife
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001710
+    AegisName: R_Glacier_Knuckle
+    Name: Printed Glacier Knuckle
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001711
+    AegisName: R_Glacier_Katar
+    Name: Printed Glacier Katar
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001712
+    AegisName: R_Glacier_Bow
+    Name: Printed Glacier Bow
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001713
+    AegisName: R_Glacier_Violin
+    Name: Printed Glacier Violin
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001714
+    AegisName: R_Glacier_Whip
+    Name: Printed Glacier Whip
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001715
+    AegisName: R_Glacier_Humma
+    Name: Printed Glacier Huuma Shuriken
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001716
+    AegisName: R_Glacier_Book
+    Name: Printed Glacier Book
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001717
+    AegisName: R_Glacier_Wand
+    Name: Printed Glacier Wand
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001718
+    AegisName: R_Glacier_Staff
+    Name: Printed Glacier Staff
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001719
+    AegisName: R_Glacier_Foxtail
+    Name: Printed Glacier Foxtail
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001720
+    AegisName: R_Glacier_Revolver
+    Name: Printed Glacier Revolver
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001721
+    AegisName: R_Glacier_Rifle
+    Name: Printed Glacier Rifle
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001722
+    AegisName: R_Glacier_Shotgun
+    Name: Printed Glacier Shotgun
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001723
+    AegisName: R_Glacier_Gatling
+    Name: Printed Glacier Gatling
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001724
+    AegisName: R_Glacier_Launcher
+    Name: Printed Glacier Launcher
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 1001737
    AegisName: BioloStone_Robe
    Name: Biolo Stone (Garment)
@@ -89796,6 +90242,38 @@ Body:
    Name: Spirit Handler Stone (Garment)
    Type: Etc
    Weight: 100
+  - Id: 1001740
+    AegisName: Summer_Ticket
+    Name: Ocean Week Commemoration Ticket
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001741
+    AegisName: Summer_W_Melon
+    Name: Summer Watermelon
+    Type: Etc
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001742
+    AegisName: aegis_1001742
+    Name: Festival Food Bag
+    Type: Etc
+    Weight: 10
+    Flags:
+      BuyingStore: true
  - Id: 1001744
    AegisName: Kr_B_Event04
    Name: Sweet Strawberry Fresh Cream
@@ -89808,6 +90286,42 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
+  - Id: 1001753
+    AegisName: D_EpisodClear13
+    Name: Episode 13 Pass Ticket    # !todo check english name
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001755
+    AegisName: D_EpisodClear14
+    Name: Episode 14 Pass Ticket    # !todo check english name
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 1001756
+    AegisName: D_EpisodClear15
+    Name: Episode 15 Pass Ticket    # !todo check english name
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 1200000
    AegisName: IDTest_arrow
    Name: IDTest arrow
@@ -89870,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
--- a/db/re/item_db_usable.yml
+++ b/db/re/item_db_usable.yml
@@ -4371,6 +4371,38 @@ Body:
      BuyingStore: true
 #   Script: |
 #     /* TODO */
+  - Id: 11636
+    AegisName: 24_S_Ev_Lime_Soda
+    Name: Lime Soda
+    Type: Healing
+    Weight: 1
+    EquipLevelMin: 90
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      itemheal 1800,0; /* average value */
+  - Id: 11637
+    AegisName: 24_S_Ev_Berry_Soda
+    Name: Berry Soda
+    Type: Healing
+    Weight: 1
+    EquipLevelMin: 90
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      itemheal 0,180; /* average value */
  - Id: 11701
    AegisName: Girl_Bunch_Of_Flower
    Name: Girl's Bouquet
@@ -5700,7 +5732,6 @@ Body:
    AegisName: Tropical_Sograt
    Name: Tropical Sograt
    Type: Usable
-    Buy: 1000
    Weight: 100
    Flags:
      BuyingStore: true
@@ -5710,7 +5741,6 @@ Body:
    AegisName: Vermilion_The_Beach
    Name: Vermilion on the Beach
    Type: Usable
-    Buy: 1000
    Weight: 100
    Flags:
      BuyingStore: true
@@ -11335,7 +11365,7 @@ Body:
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10,0;
+      searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
  - Id: 12581
    AegisName: Vending_Search_Scroll2
    Name: Universal Catalog Gold
@@ -11350,7 +11380,7 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      searchstores 10,1;
+      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
  - Id: 12582
    AegisName: Siege_Supply_Box
    Name: WoE Supply Box
@@ -11494,7 +11524,7 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      searchstores 10,1;
+      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
  - Id: 12592
    AegisName: Cyclops_Box1
    Name: Cyclops Box1
@@ -51130,8 +51160,8 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
-#   Script: |
-#     /* TODO */
+    Script: |
+      getitem 5464,1;
  - Id: 17203
    AegisName: Free_Pass_Box
    Name: Free Pass Box
@@ -63090,7 +63120,6 @@ Body:
    AegisName: Vend_Arbeit1_1Lv
    Name: "[1 Day] Consignment Merchant Envelope Lv1"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63099,7 +63128,6 @@ Body:
    AegisName: Vend_Arbeit1_2Lv
    Name: "[1 Day] Consignment Merchant Envelope Lv2"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63108,7 +63136,6 @@ Body:
    AegisName: Vend_Arbeit1_3Lv
    Name: "[1 Day] Consignment Merchant Envelope Lv3"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63117,7 +63144,6 @@ Body:
    AegisName: Buy_Arbeit1_1Lv
    Name: "[1 Day] Personal Shopper Envelope Lv1"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63126,7 +63152,6 @@ Body:
    AegisName: Buy_Arbeit1_2Lv
    Name: "[1 Day] Personal Shopper Envelope Lv2"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63135,7 +63160,6 @@ Body:
    AegisName: Buy_Arbeit1_3Lv
    Name: "[1 Day] Personal Shopper Envelope Lv3"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63234,7 +63258,6 @@ Body:
    AegisName: Vend_Arbeit3_1Lv
    Name: "[3 Day] Consignment Merchant Envelope Lv1"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63243,7 +63266,6 @@ Body:
    AegisName: Vend_Arbeit3_2Lv
    Name: Consignment Merchant Envelope
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63252,7 +63274,6 @@ Body:
    AegisName: Vend_Arbeit3_3Lv
    Name: "[3 Day] Consignment Merchant Envelope Lv3"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63261,7 +63282,6 @@ Body:
    AegisName: Buy_Arbeit3_1Lv
    Name: "[3 Day] Personal Shopper Envelope Lv1"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63270,7 +63290,6 @@ Body:
    AegisName: Buy_Arbeit3_2Lv
    Name: Personal Shopper Envelope
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63279,7 +63298,6 @@ Body:
    AegisName: Buy_Arbeit3_3Lv
    Name: "[3 Day] Personal Shopper Envelope Lv3"
    Type: Usable
-    Weight: 10
    Flags:
      Container: true
    Script: |
@@ -63385,8 +63403,8 @@ Body:
    Name: Special Shopper Catalog
    Type: Usable
    Weight: 10
-#   Script: |
-#     /* TODO */
+    Script: |
+      searchstores 3, SEARCHSTORE_EFFECT_NORMAL;
  - Id: 23374
    AegisName: Fire_Armor_S
    Name: Fire Armor Scroll
@@ -68476,8 +68494,8 @@ Body:
    Weight: 10
    Flags:
      BuyingStore: true
-#   Script: |
-#     /* TODO */
+    Script: |
+      sc_start SC_EXPBOOST,900000,100;
  - Id: 100352
    AegisName: Real_Battle_Manual
    Name: Real Combat Manual
@@ -68485,8 +68503,9 @@ Body:
    Weight: 10
    Flags:
      BuyingStore: true
-#   Script: |
-#     /* TODO */
+    Script: |
+      sc_start SC_EXPBOOST,3600000,100;
+      sc_start SC_SPEEDUP0,600000,25;
  - Id: 100354
    AegisName: Auto_Armor_Refine_Cube
    Name: Automatic Armor +11 Refinement Cube
@@ -70339,8 +70358,8 @@ Body:
    Weight: 50
    Flags:
      BuyingStore: true
-#   Script: |
-#     /* TODO */
+    Script: |
+      pet 1198;
  - Id: 100810
    AegisName: BroadcastBox_
    Name: Broadcast Box
@@ -72635,8 +72654,8 @@ Body:
    Name: Spring Regulator
    Type: Usable
    Weight: 10
-#   Script: |
-#     /* TODO */
+    Script: |
+      item_enchant(24);
  - Id: 101100
    AegisName: Poenetentia_Box3
    Name: Poenitentia Two Swords Set Box
@@ -73601,6 +73620,7 @@ Body:
    Flags:
      BuyingStore: true
    Script: |
+      /* TODO : pet 21632; */
      pet 1005;
  - Id: 101336
    AegisName: aegis_101336
@@ -76680,23 +76700,31 @@ Body:
    Script: |
      item_reform();
  - Id: 102128
-    AegisName: aegis_102128
+    AegisName: All_In_One_buff
    Name: All-in-One Buff Potion    # !todo check english name
    Type: Usable
    Weight: 10
    Flags:
      BuyingStore: true
-#   Script: |
-#     /* TODO */
+    Script: |
+      specialeffect2 EF_POTION_BERSERK;
+      sc_start SC_M_DEFSCROLL,3600000,0;
+      sc_start SC_LIMIT_POWER_BOOSTER,3600000,30;
+      sc_start SC_INFINITY_DRINK,3600000,0;
+      sc_start SC_SPEEDUP0,600000,25;
  - Id: 102129
-    AegisName: aegis_102129
+    AegisName: All_In_One_Healing
    Name: All-in-one Healing Potion    # !todo check english name
    Type: Usable
    Weight: 10
    Flags:
      BuyingStore: true
-#   Script: |
-#     /* TODO */
+    Script: |
+      specialeffect2 EF_HEAL3;
+      sc_start2 SC_S_LIFEPOTION,3600000,-5,5;
+      sc_start2 SC_L_LIFEPOTION,3600000,-7,4;
+      sc_start2 SC_M_LIFEPOTION,3600000,-4,3;
+      sc_start SC_SPEEDUP0,600000,25;
  - Id: 102193
    AegisName: aegis_102193
    Name: Costume Enchant Stone Box 30
@@ -78650,6 +78678,99 @@ Body:
      Container: true
    Script: |
      getgroupitem(IG_ENCHANT_STONE_BOX35);
+  - Id: 103065
+    AegisName: 24_S_Ev_Noodle
+    Name: Summer Festival Noodle
+    Type: Usable
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 103066
+    AegisName: 24_S_Ev_Grilled
+    Name: Herb Calamari Barbecue
+    Type: Usable
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 103067
+    AegisName: 24_S_Ev_Podding
+    Name: Sweet Watermelon Pudding
+    Type: Usable
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 103068
+    AegisName: 24_S_Ev_Juice
+    Name: Cool Watermelon Juice
+    Type: Usable
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 103069
+    AegisName: 24_S_Ev_IceFlake
+    Name: Cool Red Beans Bingsu
+    Type: Usable
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 103070
+    AegisName: 24_S_Ev_Pop_Corn
+    Name: Gourmet Butter Popcorn
+    Type: Usable
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+  - Id: 103071
+    AegisName: 24_S_Ev_Ripe_Melon
+    Name: Ripe Golden Melon
+    Type: Usable
+    Weight: 50
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      percentheal 100,100;
  - Id: 103095
    AegisName: Kr_B_Special10
    Name: Love Cake
@@ -78662,6 +78783,78 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
+  - Id: 103106
+    AegisName: Stove_Channeling_Box_1
+    Name: Channeling Commemoration Box I
+    Type: Usable
+    Weight: 400
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_STOVE_CHANNELING_BOX_1);
+  - Id: 103107
+    AegisName: Stove_Channeling_Box_2
+    Name: Channeling Commemoration Box II
+    Type: Usable
+    Weight: 400
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_STOVE_CHANNELING_BOX_2);
+  - Id: 103108
+    AegisName: Stove_Channeling_Box_3
+    Name: Channeling Commemoration Box III
+    Type: Usable
+    Weight: 400
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_STOVE_CHANNELING_BOX_3);
+  - Id: 103109
+    AegisName: Stove_Channeling_Box_4
+    Name: Channeling Commemoration Box IV
+    Type: Usable
+    Weight: 400
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_STOVE_CHANNELING_BOX_4);
  - Id: 200000
    AegisName: IDTest_Cash
    Name: IDTest Cash
@@ -80789,6 +80982,8 @@ Body:
 #   Name: (Limited) Nyangvine Fruit Package I (Stone Box 35)
    Name: (Limited) Nyangvine Fruit Package I (Stone Box 35
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80798,12 +80993,14 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_LI_NYANGVINE_BOX1_35);
  - Id: 200406
    AegisName: LI_Nyangvine_Box2_35
 #   Name: (Limited) Nyangvine Fruit Package II (Stone Box 35)
    Name: (Limited) Nyangvine Fruit Package II (Stone Box 3
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80813,12 +81010,14 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_LI_NYANGVINE_BOX2_35);
  - Id: 200407
    AegisName: LI_Nyangvine_Box3_35
 #   Name: (Limited) Nyangvine Fruit Package III (Stone Box 35)
    Name: (Limited) Nyangvine Fruit Package III (Stone Box 
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80828,12 +81027,14 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_LI_NYANGVINE_BOX3_35);
  - Id: 200411
    AegisName: A_Speed_Booster_Box
    Name: Speed Booster Package
    Type: Cash
    Weight: 10
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80843,12 +81044,14 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_A_SPEED_BOOSTER_BOX);
  - Id: 200412
    AegisName: A_Speed_Booster_10_Box
    Name: Speed Booster Package 10 Sets
    Type: Cash
    Weight: 10
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80858,11 +81061,13 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_A_SPEED_BOOSTER_10_BOX);
  - Id: 200415
    AegisName: L_Infinity_Power_Pack
    Name: (Limited) Infinity Power Package
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80872,11 +81077,13 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_L_INFINITY_POWER_PACK);
  - Id: 200416
    AegisName: L_All_Red_Pack
    Name: (Limited) All Red Package
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80886,11 +81093,13 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_L_ALL_RED_PACK);
  - Id: 200417
    AegisName: L_Defense_Potion_Pack
    Name: (Limited) Defender Package
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80900,11 +81109,13 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_L_DEFENSE_POTION_PACK);
  - Id: 200418
    AegisName: L_Speed_Force_Pack
    Name: (Limited) Speed Force Package
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80914,11 +81125,13 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_L_SPEED_FORCE_PACK);
  - Id: 200419
    AegisName: L_Special_Speed_Pack
    Name: (Limited) Speed Booster Special Package
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80928,11 +81141,13 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_L_SPECIAL_SPEED_PACK);
  - Id: 200420
    AegisName: L_Special_Force_Pack
    Name: (Limited) Force Booster Special Package
    Type: Cash
+    Flags:
+      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@@ -80942,7 +81157,58 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      /* TODO */
+      getgroupitem(IG_L_SPECIAL_FORCE_PACK);
+  - Id: 200425
+    AegisName: CostumeMilePack_35_1
+#   Name: Nyangvine Costume Mileage Package I (Stone Box 35)
+    Name: Nyangvine Costume Mileage Package I (Stone Box 35
+    Type: Cash
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_COSTUMEMILEPACK_35_1);
+  - Id: 200426
+    AegisName: CostumeMilePack_35_2
+#   Name: Nyangvine Costume Mileage Package II (Stone Box 35)
+    Name: Nyangvine Costume Mileage Package II (Stone Box 3
+    Type: Cash
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_COSTUMEMILEPACK_35_2);
+  - Id: 200427
+    AegisName: CostumeMilePack_35_3
+#   Name: Nyangvine Costume Mileage Package III (Stone Box 35)
+    Name: Nyangvine Costume Mileage Package III (Stone Box 
+    Type: Cash
+    Flags:
+      Container: true
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_COSTUMEMILEPACK_35_3);
  - Id: 1100000
    AegisName: IDTest_heal
    Name: IDTest heal
--- a/db/re/item_enchant.yml
+++ b/db/re/item_enchant.yml
@@ -32187,6 +32187,20 @@ Body:
      Grimoire_Furious: true
      Soul_Furious: true
      SpiritStick_Furious: true
+      Lapier_Furious: true
+      SharpSword_Furious: true
+      WhiteSword_Furious: true
+      Stick_Furious: true
+      MetalVilolin_Furious: true
+      Harp_Furious: true
+      MetalWhip_Furious: true
+      Whip_Furious: true
+      Flame_Staff_Furious: true
+      Rifle_Furious: true
+      Gatling_Furious: true
+      Specter_Furious: true
+      GaleClaw_Furious: true
+      Exterminate_Furious: true
    Reset:
      Chance: 80000
      Price: 500000
@@ -32357,6 +32371,12 @@ Body:
      FuriousCirclet_MT: true
      FuriousCirclet_EM: true
      FuriousCirclet_SOA: true
+      FuriousCirclet_TR: true
+      FuriousCirclet_BO: true
+      FuriousCirclet_HN: true
+      FuriousCirclet_AG: true
+      FuriousCirclet_IQ: true
+      FuriousCirclet_NW: true
    Reset:
      Chance: 80000
      Price: 500000
--- a/db/re/item_group_db.yml
+++ b/db/re/item_group_db.yml
@@ -92258,7 +92258,7 @@ Body:
            Item: Hero_Token_SH
            Rate: 10
          - Index: 17
-            Item: aegis_490220
+            Item: Hero_Token_HN
            Rate: 10
  - Group: JANUARYGIFTBOX_
    SubGroups:
@@ -113177,3 +113177,265 @@ Body:
          - Index: 65
            Item: Critical_Stone_Bottom
            Rate: 400
+  - Group: STOVE_CHANNELING_BOX_1
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Battle_Manual100
+            Amount: 5
+          - Index: 1
+            Item: E_Token_Of_Siegfried
+            Amount: 5
+          - Index: 2
+            Item: Comp_Kafra_Card
+            Amount: 10
+          - Index: 3
+            Item: World_Tour_Ticket
+            Amount: 10
+  - Group: STOVE_CHANNELING_BOX_2
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Boarding_Halter_Box30_Z
+          - Index: 1
+            Item: Comp_Almighty
+            Amount: 10
+          - Index: 2
+            Item: E_Wing_Of_Fly_3Day_Box
+            Amount: 3
+          - Index: 3
+            Item: Buff_Scroll_Box
+            Amount: 3
+  - Group: STOVE_CHANNELING_BOX_3
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: E_Life_Potion_Pack
+            Amount: 2
+          - Index: 1
+            Item: Comp_Small_Mana_Potion
+            Amount: 20
+          - Index: 2
+            Item: E_Infinity_Drink
+            Amount: 10
+          - Index: 3
+            Item: Comp_Power_Booster
+            Amount: 10
+  - Group: STOVE_CHANNELING_BOX_4
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: All_In_One_buff_B
+            Amount: 10
+          - Index: 1
+            Item: All_In_One_Healing_B
+            Amount: 10
+          - Index: 2
+            Item: Cachua_Coupon
+            Amount: 10
+          - Index: 3
+            Item: Evt_Cos_Coin
+            Amount: 10
+  - Group: LI_NYANGVINE_BOX1_35
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Nyangvine_Fruit
+            Amount: 100
+          - Index: 1
+            Item: Enchant_Stone_Box35
+            Amount: 2
+          - Index: 2
+            Item: Comp_Bubble_Gum
+            Amount: 3
+  - Group: LI_NYANGVINE_BOX2_35
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Nyangvine_Fruit
+            Amount: 200
+          - Index: 1
+            Item: Battle_Manual100
+            Amount: 5
+          - Index: 2
+            Item: Enchant_Stone_Box35
+            Amount: 2
+  - Group: LI_NYANGVINE_BOX3_35
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Nyangvine_Fruit
+            Amount: 400
+          - Index: 1
+            Item: Comp_Bubble_Gum
+            Amount: 10
+          - Index: 2
+            Item: Battle_Manual100
+            Amount: 5
+          - Index: 3
+            Item: Enchant_Stone_Box35
+            Amount: 5
+  - Group: A_SPEED_BOOSTER_BOX
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Speed_Booster
+            Amount: 10
+          - Index: 1
+            Item: K_Secret_Key
+  - Group: A_SPEED_BOOSTER_10_BOX
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Speed_Booster
+            Amount: 100
+          - Index: 1
+            Item: K_Secret_Key
+            Amount: 11
+  - Group: L_INFINITY_POWER_PACK
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Limit_Power_Booster
+            Amount: 100
+          - Index: 1
+            Item: Infinity_Drink
+            Amount: 100
+          - Index: 2
+            Item: K_Secret_Key
+            Amount: 25
+          - Index: 3
+            Item: Cachua_Coupon
+            Amount: 5
+  - Group: L_ALL_RED_PACK
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Almighty
+            Amount: 100
+          - Index: 1
+            Item: Red_Booster
+            Amount: 125
+          - Index: 2
+            Item: K_Secret_Key
+            Amount: 25
+          - Index: 3
+            Item: Cachua_Coupon
+            Amount: 5
+  - Group: L_DEFENSE_POTION_PACK
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Small_Life_Potion
+            Amount: 200
+          - Index: 1
+            Item: Med_Life_Potion
+            Amount: 200
+          - Index: 2
+            Item: Mysterious_Water
+            Amount: 200
+          - Index: 3
+            Item: Small_Mana_Potion
+            Amount: 50
+          - Index: 4
+            Item: M_DEFScroll
+            Amount: 300
+          - Index: 5
+            Item: K_Secret_Key
+            Amount: 25
+          - Index: 6
+            Item: Cachua_Coupon
+            Amount: 5
+  - Group: L_SPEED_FORCE_PACK
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Force_Booster
+            Amount: 100
+          - Index: 1
+            Item: Speed_Booster
+            Amount: 100
+          - Index: 2
+            Item: K_Secret_Key
+            Amount: 25
+          - Index: 3
+            Item: Cachua_Coupon
+            Amount: 5
+  - Group: L_SPECIAL_SPEED_PACK
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Speed_Booster
+            Amount: 200
+          - Index: 1
+            Item: K_Secret_Key
+            Amount: 30
+          - Index: 2
+            Item: Cachua_Coupon
+            Amount: 10
+  - Group: L_SPECIAL_FORCE_PACK
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Force_Booster
+            Amount: 200
+          - Index: 1
+            Item: K_Secret_Key
+            Amount: 30
+          - Index: 2
+            Item: Cachua_Coupon
+            Amount: 10
+  - Group: COSTUMEMILEPACK_35_1
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Nyangvine_Fruit
+            Amount: 100
+          - Index: 1
+            Item: Evt_Cos_Coin
+            Amount: 12
+          - Index: 2
+            Item: Enchant_Stone_Box35
+            Amount: 3
+  - Group: COSTUMEMILEPACK_35_2
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Nyangvine_Fruit
+            Amount: 200
+          - Index: 1
+            Item: Evt_Cos_Coin
+            Amount: 25
+          - Index: 2
+            Item: Enchant_Stone_Box35
+            Amount: 5
+  - Group: COSTUMEMILEPACK_35_3
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Index: 0
+            Item: Nyangvine_Fruit
+            Amount: 400
+          - Index: 1
+            Item: Evt_Cos_Coin
+            Amount: 50
+          - Index: 2
+            Item: Enchant_Stone_Box35
+            Amount: 10
--- a/db/re/item_reform.yml
+++ b/db/re/item_reform.yml
@@ -9837,6 +9837,330 @@ Body:
        RandomOptionGroup: Group_0
        ClearSlots: true
        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Armor
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Armor
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Manteau
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Manteau
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Boots
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Boots
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Pendant
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Pendant
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Necklace
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Necklace
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Robe
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Robe
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Muffler
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Muffler
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Shoes
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Shoes
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Ring
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Ring
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Snowflower_Earring
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Snowflower_Earring
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_T_Sword
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_T_Sword
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Lance
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Lance
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Sword
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Sword
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_B_Sword
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_B_Sword
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Spear
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Spear
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_T_Axe
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_T_Axe
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Axe
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Axe
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Mace
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Mace
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_M_Mace
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_M_Mace
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_R_Knife
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_R_Knife
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_B_Knife
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_B_Knife
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Knuckle
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Knuckle
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Katar
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Katar
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Bow
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Bow
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Violin
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Violin
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Whip
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Whip
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Humma
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Humma
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Book
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Book
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Wand
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Wand
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Staff
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Staff
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Foxtail
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Foxtail
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Revolver
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Revolver
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Rifle
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Rifle
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Shotgun
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Shotgun
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Gatling
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Gatling
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
+      - BaseItem: Glacier_Launcher
+        Materials:
+          - Material: Imperfect_Rune
+            Amount: 10
+        ResultItem: R_Glacier_Launcher
+        ChangeRefine: -20
+        RandomOptionGroup: Group_0
+        ClearSlots: true
+        RemoveEnchantgrade: true
  - Item: Season_H_Upgrade
    BaseItems:
      - BaseItem: Season_Hood_Spring
@@ -10901,6 +11225,206 @@ Body:
            Amount: 20
        ResultItem: FuriousCirclet_SOA
        ChangeRefine: 1
+      - BaseItem: FuriousCirclet_TR
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Ethernium
+            Amount: 10
+          - Material: Enriched_Ethernium
+            Amount: 20
+        ResultItem: FuriousCirclet_TR
+        ChangeRefine: 1
+      - BaseItem: FuriousCirclet_BO
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Ethernium
+            Amount: 10
+          - Material: Enriched_Ethernium
+            Amount: 20
+        ResultItem: FuriousCirclet_BO
+        ChangeRefine: 1
+      - BaseItem: FuriousCirclet_HN
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Ethernium
+            Amount: 10
+          - Material: Enriched_Ethernium
+            Amount: 20
+        ResultItem: FuriousCirclet_HN
+        ChangeRefine: 1
+      - BaseItem: Lapier_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Lapier_Furious
+        ChangeRefine: 1
+      - BaseItem: SharpSword_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: SharpSword_Furious
+        ChangeRefine: 1
+      - BaseItem: WhiteSword_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: WhiteSword_Furious
+        ChangeRefine: 1
+      - BaseItem: Stick_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Stick_Furious
+        ChangeRefine: 1
+      - BaseItem: MetalVilolin_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: MetalVilolin_Furious
+        ChangeRefine: 1
+      - BaseItem: Harp_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Harp_Furious
+        ChangeRefine: 1
+      - BaseItem: MetalWhip_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: MetalWhip_Furious
+        ChangeRefine: 1
+      - BaseItem: Whip_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Whip_Furious
+        ChangeRefine: 1
+      - BaseItem: Flame_Staff_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Flame_Staff_Furious
+        ChangeRefine: 1
+      - BaseItem: Rifle_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Rifle_Furious
+        ChangeRefine: 1
+      - BaseItem: Gatling_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Gatling_Furious
+        ChangeRefine: 1
+      - BaseItem: Specter_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Specter_Furious
+        ChangeRefine: 1
+      - BaseItem: GaleClaw_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: GaleClaw_Furious
+        ChangeRefine: 1
+      - BaseItem: Exterminate_Furious
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Etherdeocon
+            Amount: 10
+          - Material: Enriched_Etherdeocon
+            Amount: 20
+        ResultItem: Exterminate_Furious
+        ChangeRefine: 1
+      - BaseItem: FuriousCirclet_AG
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Ethernium
+            Amount: 10
+          - Material: Enriched_Ethernium
+            Amount: 20
+        ResultItem: FuriousCirclet_AG
+        ChangeRefine: 1
+      - BaseItem: FuriousCirclet_IQ
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Ethernium
+            Amount: 10
+          - Material: Enriched_Ethernium
+            Amount: 20
+        ResultItem: FuriousCirclet_IQ
+        ChangeRefine: 1
+      - BaseItem: FuriousCirclet_NW
+        MinimumRefine: 9
+        MaximumRefine: 11
+        Materials:
+          - Material: HD_Ethernium
+            Amount: 10
+          - Material: Enriched_Ethernium
+            Amount: 20
+        ResultItem: FuriousCirclet_NW
+        ChangeRefine: 1
  - Item: Gaebolg_A_Hammer_1
    BaseItems:
      - BaseItem: Gaebolg_Armor
--- a/db/re/job_basepoints.yml
+++ b/db/re/job_basepoints.yml
--- a/db/re/job_exp.yml
+++ b/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
--- a/db/re/job_noenter_map.txt
+++ b/db/re/job_noenter_map.txt
@@ -1,136 +0,0 @@
-// Defines Job(s) that are restricted to enter map (by flag/zones)
-//
-// Structure of Database:
-// JobID,FlagZone,GroupLevelBypass
-//
-// JobID: See JOB_* constants or use job number
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
-//
-// NOTES:
-// - Restriction will be overwritten for multiple defines with the same Job ID
-// - The flag is used by 'jobcanentermap' script.
-
-JOB_RUNE_KNIGHT,4112,100
-JOB_WARLOCK,4112,100
-JOB_RANGER,4112,100
-JOB_ARCH_BISHOP,4112,100
-JOB_MECHANIC,4112,100
-JOB_GUILLOTINE_CROSS,4112,100
-
-JOB_RUNE_KNIGHT_T,4112,100
-JOB_WARLOCK_T,4112,100
-JOB_RANGER_T,4112,100
-JOB_ARCH_BISHOP_T,4112,100
-JOB_MECHANIC_T,4112,100
-JOB_GUILLOTINE_CROSS_T,4112,100
-
-JOB_ROYAL_GUARD,4112,100
-JOB_SORCERER,4112,100
-JOB_MINSTREL,4112,100
-JOB_WANDERER,4112,100
-JOB_SURA,4112,100
-JOB_GENETIC,4112,100
-JOB_SHADOW_CHASER,4112,100
-
-JOB_ROYAL_GUARD_T,4112,100
-JOB_SORCERER_T,4112,100
-JOB_MINSTREL_T,4112,100
-JOB_WANDERER_T,4112,100
-JOB_SURA_T,4112,100
-JOB_GENETIC_T,4112,100
-JOB_SHADOW_CHASER_T,4112,100
-
-JOB_RUNE_KNIGHT2,4112,100
-JOB_RUNE_KNIGHT_T2,4112,100
-JOB_ROYAL_GUARD2,4112,100
-JOB_ROYAL_GUARD_T2,4112,100
-JOB_RANGER2,4112,100
-JOB_RANGER_T2,4112,100
-JOB_MECHANIC2,4112,100
-JOB_MECHANIC_T2,4112,100
-
-JOB_BABY_RUNE_KNIGHT,4112,100
-JOB_BABY_WARLOCK,4112,100
-JOB_BABY_RANGER,4112,100
-JOB_BABY_ARCH_BISHOP,4112,100
-JOB_BABY_MECHANIC,4112,100
-JOB_BABY_GUILLOTINE_CROSS,4112,100
-JOB_BABY_ROYAL_GUARD,4112,100
-JOB_BABY_SORCERER,4112,100
-JOB_BABY_MINSTREL,4112,100
-JOB_BABY_WANDERER,4112,100
-JOB_BABY_SURA,4112,100
-JOB_BABY_GENETIC,4112,100
-JOB_BABY_SHADOW_CHASER,4112,100
-
-JOB_BABY_RUNE_KNIGHT2,4112,100
-JOB_BABY_ROYAL_GUARD2,4112,100
-JOB_BABY_RANGER2,4112,100
-JOB_BABY_MECHANIC2,4112,100
-
-JOB_SUPER_NOVICE_E,4112,100
-JOB_SUPER_BABY_E,4112,100
-
-JOB_KAGEROU,4112,100
-JOB_BABY_KAGEROU,4112,100
-JOB_OBORO,4112,100
-JOB_BABY_OBORO,4112,100
-
-JOB_REBELLION,4112,100
-JOB_BABY_REBELLION,4112,100
-
-JOB_SUMMONER,4112,100
-JOB_BABY_SUMMONER,4112,100
-
-JOB_STAR_EMPEROR,4112,100
-JOB_SOUL_REAPER,4112,100
-JOB_BABY_STAR_EMPEROR,4112,100
-JOB_BABY_SOUL_REAPER,4112,100
-JOB_STAR_EMPEROR2,4112,100
-JOB_BABY_STAR_EMPEROR2,4112,100
-
-JOB_DRAGON_KNIGHT,4112,100
-JOB_MEISTER,4112,100
-JOB_SHADOW_CROSS,4112,100
-JOB_ARCH_MAGE,4112,100
-JOB_CARDINAL,4112,100
-JOB_WINDHAWK,4112,100
-JOB_IMPERIAL_GUARD,4112,100
-JOB_BIOLO,4112,100
-JOB_ABYSS_CHASER,4112,100
-JOB_ELEMENTAL_MASTER,4112,100
-JOB_INQUISITOR,4112,100
-JOB_TROUBADOUR,4112,100
-JOB_TROUVERE,4112,100
-
-JOB_WINDHAWK2,4112,100
-JOB_MEISTER2,4112,100
-JOB_DRAGON_KNIGHT2,4112,100
-JOB_IMPERIAL_GUARD2,4112,100
-
-JOB_SKY_EMPEROR,4112,100
-JOB_SOUL_ASCETIC,4112,100
-JOB_SHINKIRO,4112,100
-JOB_SHIRANUI,4112,100
-JOB_NIGHT_WATCH,4112,100
-JOB_HYPER_NOVICE,4112,100
-JOB_SPIRIT_HANDLER,4112,100
-
-JOB_SKY_EMPEROR2,4112,100
--- a/db/re/job_stats.yml
+++ b/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
--- a/db/re/map_drops.yml
+++ b/db/re/map_drops.yml
--- a/db/re/map_zones.yml
+++ b/db/re/map_zones.yml
--- a/db/re/mob_db.yml
+++ b/db/re/mob_db.yml
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -13105,6 +13105,108 @@
 20280,G_ILL_WOOTAN_FIGHTER@KN_BRANDISHSPEAR,attack,57,5,2000,0,10000,yes,target,always,0,,,,,,6,
 20280,G_ILL_WOOTAN_FIGHTER@NPC_FIREATTACK,attack,186,4,1000,0,5000,yes,target,always,0,,,,,,,

+// Illusion of Teddy Bear
+20255,ILL_TEDDY_BEAR_R@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20255,ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
+20255,ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
+20255,ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,2,1000,0,5000,yes,target,always,0,,,,,,37,
+20255,ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
+20256,ILL_TEDDY_BEAR_Y@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
+20256,ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
+20256,ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
+20256,ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
+20256,ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
+20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
+20257,ILL_TEDDY_BEAR_G@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20257,ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
+20257,ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
+20258,ILL_TEDDY_BEAR_W@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
+20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
+20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
+20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
+20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
+20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
+20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
+20258,ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
+20258,ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
+20259,ILL_TEDDY_BEAR_B@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
+20259,ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
+20259,ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
+20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_AGIUP,attack,350,1,5000,0,20000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_BLEEDING2,attack,764,5,2000,500,10000,no,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_CRITICALWOUND,attack,673,3,1000,500,20000,no,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_WIDESIGHT,attack,669,1,10000,0,30000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_WEAPONBRAKER,attack,343,1,10000,0,40000,yes,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_DARKBREATH,attack,202,5,2000,3000,10000,no,target,myhpltmaxrate,60,,,,,,0,
+20260,ILL_TEDDY_BEAR_S@CR_HOLYCROSS,attack,253,10,500,0,5000,yes,target,always,0,,,,,,32,
+20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,idle,352,1,10000,0,10000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,chase,352,1,10000,0,5000,yes,self,always,0,,,,,,,
+// 20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE_K,attack,750,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE,attack,653,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_PULSESTRIKE,attack,661,5,3000,3000,20000,no,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,idle,196,1,10000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
+20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,attack,196,1,5000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
+20260,ILL_TEDDY_BEAR_S@NPC_POWERUP,attack,349,5,10000,0,60000,yes,self,myhpltmaxrate,20,,,,,,6,
+20260,ILL_TEDDY_BEAR_S@NPC_GRANDDARKNESS,attack,339,10,3000,1000,5000,no,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,walk,26,1,5000,0,10000,yes,self,rudeattacked,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@SA_LANDPROTECTOR,attack,288,2,3000,1000,10000,no,target,groundattacked,0,,,,,,6,
+20260,ILL_TEDDY_BEAR_S@AL_PNEUMA,attack,25,1,3000,0,5000,yes,target,longrangeattacked,0,,,,,,18,
+20261,ILL_PITMAN@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20261,ILL_PITMAN@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
+20261,ILL_PITMAN@NPC_SILENCEATTACK,chase,178,3,500,0,5000,no,target,always,0,,,,,,6,
+20261,ILL_PITMAN@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
+20261,ILL_PITMAN@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
+20261,ILL_PITMAN@SM_MAGNUM,attack,7,3,1000,0,20000,yes,self,always,0,,,,,,32,
+20261,ILL_PITMAN@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
+20262,ILL_MINERAL@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20262,ILL_MINERAL@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
+20262,ILL_MINERAL@AL_HEAL,idle,28,9,5000,0,1500,yes,friend,mystatuson,0,,,,,,18,
+20262,ILL_MINERAL@TF_HIDING,chase,51,1,2000,0,10000,yes,self,always,0,,,,,,19,
+20262,ILL_MINERAL@TF_HIDING,chase,51,1,10000,0,10000,yes,self,myhpltmaxrate,30,,,,,,19,
+20262,ILL_MINERAL@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
+20262,ILL_MINERAL@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
+20262,ILL_MINERAL@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
+20262,ILL_MINERAL@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
+20262,ILL_MINERAL@NPC_RANDOMATTACK,attack,183,2,1500,500,5000,yes,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@TF_HIDING,idle,51,1,500,500,5000,yes,self,always,0,,,,,,19,
+20263,ILL_OBSIDIAN@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
+20263,ILL_OBSIDIAN@WZ_EARTHSPIKE,chase,90,3,1500,500,5000,no,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@CR_SHIELDCHARGE,attack,250,3,1000,1000,5000,no,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@NPC_GROUNDATTACK,attack,185,2,500,500,5000,yes,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@TF_HIDING,attack,51,1,500,500,50000,yes,self,always,0,,,,,,19,
+20264,G_ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
+20264,G_ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
+20264,G_ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,5,1000,0,5000,yes,target,always,0,,,,,,37,
+20264,G_ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
+20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
+20265,G_ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
+20265,G_ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
+20265,G_ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
+20265,G_ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
+20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
+20266,G_ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
+20266,G_ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
+20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
+20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
+20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
+20267,G_ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
+20267,G_ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
+20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
+20268,G_ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
+20268,G_ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
+20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
+
 // Episode 17.1 - Illusion (custom) #!todo
 20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
 20340,EL-A17T@NPC_POWERUP,attack,349,5,2000,0,60000,no,self,always,0,,,,,,6,
@@ -13504,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,,,,,,,
@@ -13536,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
@@ -14137,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,,,,,,,
@@ -14237,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,,,,,,,

@@ -14468,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
@@ -14673,7 +14775,7 @@
 21360,EP18_MD_SCHULANG_L@NPC_TELEKINESISATTACK,attack,191,2,3000,0,5000,yes,target,always,0,,,,,,,
 21360,EP18_MD_SCHULANG_L@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
 21360,EP18_MD_SCHULANG_L@NPC_DARKSTRIKE,chase,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-// 21360,EP18_MD_SCHULANG_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
+21360,EP18_MD_SCHULANG_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
 21360,EP18_MD_SCHULANG_L@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
 21360,EP18_MD_SCHULANG_L@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
 21360,EP18_MD_SCHULANG_L@NPC_WIDESTONE2,attack,759,3,3000,500,30000,no,target,always,0,,,,,,,
@@ -14698,6 +14800,6 @@
 21361,EP18_MD_DEMI_FREYJA_L@NPC_HELLJUDGEMENT2,attack,768,5,1000,500,120000,yes,target,always,0,,,,,,,
 21361,EP18_MD_DEMI_FREYJA_L@NPC_CHANGEDARKNESS,attack,168,1,1000,0,120000,yes,self,always,0,,,,,,,
 21361,EP18_MD_DEMI_FREYJA_L@NPC_CHANGEHOLY,attack,167,1,3000,0,120000,yes,self,always,0,,,,,,,
-// 21361,EP18_MD_DEMI_FREYJA_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
+21361,EP18_MD_DEMI_FREYJA_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
 21361,EP18_MD_DEMI_FREYJA_L@NPC_CANE_OF_EVIL_EYE,chase,780,3,8000,300,30000,no,target,always,0,,,,,,,
 21361,EP18_MD_DEMI_FREYJA_L@NPC_CANE_OF_EVIL_EYE,attack,780,5,7000,300,30000,yes,target,always,0,,,,,,,
--- a/db/re/pet_db.yml
+++ b/db/re/pet_db.yml
--- a/db/re/quest_db.yml
+++ b/db/re/quest_db.yml
@@ -1404,21 +1404,21 @@ Body:
    TimeLimit: 4h
  - Id: 3455
    Title: Illusion Investigation Team - Machoko
-  # - Id: 3456
-    # Title: Illusion of Teddy Bear 100 Kills
-    # Targets:
-      # - Id: 1
-        # Count: 100
-        # Location: ein_d02_i
-        # MapMobTargets:
-          # ILL_TEDDY_BEAR_B: true
-          # ILL_MINERAL: true
-          # ILL_PITMAN: true
-          # ILL_TEDDY_BEAR_R: true
-          # ILL_TEDDY_BEAR_Y: true
-          # ILL_TEDDY_BEAR_W: true
-          # ILL_OBSIDIAN: true
-          # ILL_TEDDY_BEAR_G: true
+  - Id: 3456
+    Title: Illusion of Teddy Bear 100 Kills
+    Targets:
+      - Id: 1
+        Count: 100
+        Location: ein_d02_i
+        MapMobTargets:
+          ILL_TEDDY_BEAR_B: true
+          ILL_MINERAL: true
+          ILL_PITMAN: true
+          ILL_TEDDY_BEAR_R: true
+          ILL_TEDDY_BEAR_Y: true
+          ILL_TEDDY_BEAR_W: true
+          ILL_OBSIDIAN: true
+          ILL_TEDDY_BEAR_G: true
  - Id: 3457
    Title: Illusion of Teddy Bear 100 Kills - Standby
    TimeLimit: 4h
@@ -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
@@ -8038,14 +8040,74 @@ Body:
  - Id: 11555
    Title: In search of the taste of hometown - Waiting
    TimeLimit: 4h
+  - Id: 11556
+    Title: Missing Steven
+  - Id: 11557
+    Title: Missing Steven
+  - Id: 11558
+    Title: Missing Steven
+  - Id: 11559
+    Title: Missing Steven
+  - Id: 11560
+    Title: Missing Steven
+  - Id: 11561
+    Title: Missing Steven
+  - Id: 11562
+    Title: Missing Steven
+  - Id: 11563
+    Title: Nasarian Conspiracy
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_R
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_Y
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_G
+        Count: 10
+  - Id: 11564
+    Title: Nasarian Conspiracy
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_B
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_W
+        Count: 10
+  - Id: 11565
+    Title: RUN!
+    Targets:
+      - Mob: ILL_PITMAN
+        Count: 10
+      - Mob: ILL_MINERAL
+        Count: 10
+      - Mob: ILL_OBSIDIAN
+        Count: 10
  - Id: 11566
-    Title: Escape!!!! - Wait
+    Title: RUN! - Pending
    TimeLimit: 4h
+  - Id: 11567
+    Title: Things That Shouldn't Exist
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_R
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_Y
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_G
+        Count: 10
+  - Id: 11568
+    Title: Things That Shouldn't Exist
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_B
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_W
+        Count: 10
  - Id: 11569
-    Title: Present not to exist-wait
+    Title: Things That Shouldn't Exist - Pending
    TimeLimit: 4h
+  - Id: 11570
+    Title: Let the Light Devour the Darkness
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_S
+        Count: 1
  - Id: 11571
-    Title: Let the light consume the darkness - Wait
+    Title: Let the Light Devour the Darkness - Pending
    TimeLimit: 4h
  - Id: 11596
    Title: Old Memories
@@ -8136,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
@@ -9275,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
@@ -11452,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
@@ -11792,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?
@@ -11975,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
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
@@ -7235,6 +7235,7 @@ Body:
    TargetType: Self
    DamageFlags:
      IgnoreDefense: true
+      SimpleDefense: true
    Range: 9
    Hit: Single
    HitCount: 1
@@ -7664,6 +7665,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      IgnoreFlee: true
+      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: -2
@@ -7697,7 +7699,6 @@ Body:
      - Level: 5
        Time: 1000
    Duration1: 3000
-    Duration2: 300000
    FixedCastTime:
      - Level: 1
        Time: 2000
@@ -8877,6 +8878,7 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 300
+    Duration1: 15000
    Duration2: 27000
    Cooldown: 4000
    Requires:
@@ -9134,6 +9136,7 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 300
+    Duration1: 4500
    Duration2: 4500
    Cooldown: 4000
    Requires:
@@ -9452,6 +9455,7 @@ Body:
    DamageFlags:
      IgnoreAtkCard: true
      IgnoreFlee: true
+      SimpleDefense: true
    Flags:
      IsNpc: true
      TargetSelf: true
@@ -18360,6 +18364,43 @@ Body:
    HitCount: 1
    Duration1: 60000
    Status: Relieve_off
+  - Id: 776
+    Name: NPC_DEADLYCURSE
+    Description: Deadly Curse
+    MaxLevel: 1
+    TargetType: Attack
+    DamageFlags:
+      NoDamage: true
+    Flags:
+      IgnoreGtb: true
+      IsNpc: true
+    Range: 1
+    Duration1: 15000
+    Status: Deadly_Defeasance
+  - Id: 779
+    Name: NPC_DEADLYCURSE2
+    Description: Deadly Curse 2
+    MaxLevel: 5
+    TargetType: Self
+    DamageFlags:
+      NoDamage: true
+      Splash: true
+    Flags:
+      IgnoreGtb: true
+      IsNpc: true
+    SplashArea:
+      - Level: 1
+        Area: 2
+      - Level: 2
+        Area: 3
+      - Level: 3
+        Area: 4
+      - Level: 4
+        Area: 5
+      - Level: 5
+        Area: 6
+    Duration2: 30000
+    Status: Deadly_Defeasance
  - Id: 780
    Name: NPC_CANE_OF_EVIL_EYE
    Description: Cane of evil eye
@@ -19110,6 +19151,7 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
+      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: 9
@@ -22655,6 +22697,7 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
+      SimpleDefense: true
    Flags:
      AllowOnMado: true
    Range: 9
@@ -28789,6 +28832,7 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
+      SimpleDefense: true
    Range:
      - Level: 1
        Size: 7
@@ -29687,6 +29731,19 @@ Body:
        - Level: 2
          Amount: 100
    Status: Odins_Power
+  - Id: 2543
+    Name: ALL_RAY_OF_PROTECTION
+    Description: Ray of Protection
+    MaxLevel: 1
+    Type: Magic
+    TargetType: Support
+    DamageFlags:
+      NoDamage: true
+    Range: 1
+    Hit: Single
+    HitCount: 1
+    Duration1: 60000
+    Status: Protection
  - Id: 2544
    Name: MC_CARTDECORATE
    Description: Decorate Cart
@@ -33145,6 +33202,7 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
+      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: 9
@@ -42960,10 +43018,10 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Range: 9
-    Hit: Single
-    HitCount: 1
-    AfterCastActDelay: 2000
+    Flags:
+      IgnoreGtb: true
+    AfterCastWalkDelay: 1000
+    Cooldown: 20000
    Requires:
      SpCost:
        - Level: 1
@@ -42986,11 +43044,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-      Splash: true
-    Hit: Single
-    HitCount: 1
-    SplashArea: -1
-    AfterCastActDelay: 35000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@@ -43002,6 +43056,7 @@ Body:
        Time: 25000
      - Level: 5
        Time: 20000
+    Cooldown: 35000
    Requires:
      SpCost:
        - Level: 1
@@ -43019,7 +43074,6 @@ Body:
    Name: HLIF_BRAIN
    Description: Brain Surgery
    MaxLevel: 5
-    SplashArea: 1
  - Id: 8004
    Name: HLIF_CHANGE
    Description: Change
@@ -43027,7 +43081,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -43035,7 +43089,7 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Duration2:
+    Cooldown:
      - Level: 1
        Time: 600000
      - Level: 2
@@ -43052,8 +43106,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
-    Duration2: 1000
+    AfterCastWalkDelay: 1000
+    Cooldown: 1000
    Requires:
      SpCost: 10
  - Id: 8006
@@ -43063,8 +43117,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
-    AfterCastActDelay: 30000
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@@ -43076,6 +43129,7 @@ Body:
        Time: 25000
      - Level: 5
        Time: 20000
+    Cooldown: 30000
    Requires:
      SpCost:
        - Level: 1
@@ -43093,8 +43147,6 @@ Body:
    Name: HAMI_SKIN
    Description: Adamantium Skin
    MaxLevel: 5
-    DamageFlags:
-      NoDamage: true
  - Id: 8008
    Name: HAMI_BLOODLUST
    Description: Bloodlust
@@ -43102,7 +43154,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Hit: Single
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -43110,7 +43162,7 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Duration2:
+    Cooldown:
      - Level: 1
        Time: 300000
      - Level: 2
@@ -43139,7 +43191,7 @@ Body:
        Count: -2
      - Level: 5
        Count: -3
-    AfterCastWalkDelay: 2000
+    Cooldown: 2000
    Requires:
      SpCost:
        - Level: 1
@@ -43160,6 +43212,7 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -43171,7 +43224,7 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Duration2:
+    Cooldown:
      - Level: 1
        Time: 60000
      - Level: 2
@@ -43205,6 +43258,7 @@ Body:
      NoDamage: true
    Hit: Single
    CastCancel: true
+    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -43216,7 +43270,7 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Duration2:
+    Cooldown:
      - Level: 1
        Time: 60000
      - Level: 2
@@ -43249,7 +43303,7 @@ Body:
    Range: 15
    Hit: Single
    HitCount: 1
-    AfterCastActDelay: 1000
+    Cooldown: 1000
    Requires:
      SpCost: 1
  - Id: 8013
@@ -43271,7 +43325,7 @@ Body:
        Count: 4
      - Level: 5
        Count: 5
-    AfterCastActDelay:
+    Cooldown:
      - Level: 1
        Time: 2000
      - Level: 2
@@ -43302,8 +43356,8 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastActDelay: 3000
-    AfterCastWalkDelay: 3000
+    AfterCastWalkDelay: 1500
+    Cooldown: 3000
    Requires:
      SpCost: 40
  - Id: 8015
@@ -43327,7 +43381,8 @@ Body:
    HitCount: 1
    Element: Weapon
    SplashArea: 4
-    AfterCastWalkDelay: 1000
+    AfterCastActDelay: 5000
+    CoolDown: 1000
    Requires:
      SpCost: 1
  - Id: 8018
--- a/db/re/skill_nocast_db.txt
+++ b/db/re/skill_nocast_db.txt
@@ -1,249 +0,0 @@
-// Forbidden Skills Database
-// Defines unusable skills in map types and zones.
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - cannot be used in normal maps
-// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-// 4    - cannot be used in GvG maps
-// 8    - cannot be used in Battleground maps
-// 16   - cannot be used in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - cannot be used in zone 1 maps
-// 64   - cannot be used in zone 2 maps
-// 128  - cannot be used in zone 3 maps
-// 256  - cannot be used in zone 4 maps
-// 512  - cannot be used in zone 5 maps
-// 1024 - cannot be used in zone 6 maps
-// 2048 - cannot be used in zone 7 maps
-// 4096 - cannot be used in zone 8 maps
-// 8192 - cannot be used in zone 9 maps
-//
-// Example:
-// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
-
-//----------------------------------------------------------------------------
-// Normal
-//----------------------------------------------------------------------------
-308,1	//BD_ETERNALCHAOS
-311,1	//BD_ROKISWEIL
-317,1	//BA_DISSONANCE
-325,1	//DC_UGLYDANCE
-328,1	//DC_DONTFORGETME
-2422,1	//WM_LULLABY_DEEPSLEEP
-2423,1	//WM_SIRCLEOFNATURE
-2425,1	//WM_GLOOMYDAY
-2429,1	//WM_SOUND_OF_DESTRUCTION
-2430,1	//WM_SATURDAY_NIGHT_FEVER
-2432,1	//WM_MELODYOFSINK
-2433,1	//WM_BEYOND_OF_WARCRY
-2455,1	//SO_ARRULLO
-2299,1	//SC_MANHOLE
-5359,1	//TR_ROKI_CAPRICCIO
-5363,1	//TR_NIPELHEIM_REQUIEM
-5367,1	//EM_ACTIVITY_BURN
-
-//----------------------------------------------------------------------------
-// PVP
-//----------------------------------------------------------------------------
-2300,2	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// GVG
-//----------------------------------------------------------------------------
-26,4	//AL_TELEPORT
-27,4	//AL_WARP
-87,4	//WZ_ICEWALL
-150,4	//TF_BACKSLIDING
-219,4	//RG_INTIMIDATE
-336,4	//WE_CALLPARTNER
-361,4	//HP_ASSUMPTIO
-362,4	//HP_BASILICA
-395,4	//CG_MOONLIT
-409,4	//WE_CALLPARENT
-410,4	//WE_CALLBABY
-491,4	//CR_CULTIVATION
-530,4	//NJ_KIRIKAGE
-691,4	//CASH_ASSUMPTIO
-2300,4	//SC_DIMENSIONDOOR
-5063,4	//WE_CALLALLFAMILY
-462,4	//SL_KAIZEL
-
-//----------------------------------------------------------------------------
-// Battlegrounds
-//----------------------------------------------------------------------------
-26,8	//AL_TELEPORT
-27,8	//AL_WARP
-87,8	//WZ_ICEWALL
-150,8	//TF_BACKSLIDING
-219,8	//RG_INTIMIDATE
-264,8	//MO_BODYRELOCATION
-336,8	//WE_CALLPARTNER
-361,8	//HP_ASSUMPTIO
-362,8	//HP_BASILICA
-395,8	//CG_MOONLIT
-409,8	//WE_CALLPARENT
-410,8	//WE_CALLBABY
-411,8	//TK_RUN
-426,8	//TK_HIGHJUMP
-427,8	//SG_FEEL
-428,8	//SG_SUN_WARM
-429,8	//SG_MOON_WARM
-430,8	//SG_STAR_WARM
-431,8	//SG_SUN_COMFORT
-432,8	//SG_MOON_COMFORT
-433,8	//SG_STAR_COMFORT
-434,8	//SG_HATE
-435,8	//SG_SUN_ANGER
-436,8	//SG_MOON_ANGER
-437,8	//SG_STAR_ANGER
-438,8	//SG_SUN_BLESS
-439,8	//SG_MOON_BLESS
-440,8	//SG_STAR_BLESS
-491,8	//CR_CULTIVATION
-530,8	//NJ_KIRIKAGE
-691,8	//CASH_ASSUMPITO
-2300,8	//SC_DIMENSIONDOOR
-5063,8	//WE_CALLALLFAMILY
-5023,8	//SU_LOPE
-462,8	//SL_KAIZEL
-
-//----------------------------------------------------------------------------
-// Mixed
-//----------------------------------------------------------------------------
-488,3	//CG_HERMODE
-3013,3	//KO_KYOUGAKU
-
-//----------------------------------------------------------------------------
-// Restricted in WOE:TE Castles
-//----------------------------------------------------------------------------
-8,16	// SM_ENDURE
-26,16	// AL_TELEPORT
-27,16	// AL_WARP
-41,16	// MC_VENDING
-87,16	// WZ_ICEWALL
-147,16	// AC_MAKINGARROW
-150,16	// TF_BACKSLIDING
-211,16	// RG_STEALCOIN
-219,16	// RG_INTIMIDATE
-336,16	// WE_CALLPARTNER
-359,16	// LK_BERSERK
-361,16	// HP_ASSUMPTIO
-362,16	// HP_BASILICA
-389,16	// ST_CHASEWALK
-395,16	// CG_MOONLIT
-396,16	// CG_MARIONETTE
-409,16	// WE_CALLPARENT
-410,16	// WE_CALLBABY
-426,16	// TK_HIGHJUMP
-491,16	//CR_CULTIVATION
-529,16	// NJ_SHADOWJUMP
-// 530,16	// NJ_KIRIKAGE
-691,16	// CASH_ASSUMPTIO
-2300,16	// SC_DIMENSIONDOOR
-//!TODO: More 3rd Class skills
-// 2293,16	// SC_GROOMY
-// 2296,16	// SC_UNLUCKY
-// 2494,16	// GN_CHANGEMATERIAL
-// 2462,16	// SO_EL_ANALYSIS
-5063,16	//WE_CALLALLFAMILY
-
-//----------------------------------------------------------------------------
-// Zone 1 - Aldebaran Turbo Track
-//----------------------------------------------------------------------------
-8,32	//SM_ENDURE
-26,32	//AL_TELEPORT
-27,32	//AL_WARP
-35,32	//AL_CURE
-51,32	//TF_HIDING
-87,32	//WZ_ICEWALL
-135,32	//AS_CLOAKING
-219,32	//RG_INTIMIDATE
-264,32	//MO_BODYRELOCATION
-357,32	//LK_CONCENTRATION
-359,32	//LK_BERSERK
-362,32	//HP_BASILICA
-387,32	//WS_CARTBOOST
-389,32	//ST_CHASEWALK
-395,32	//CG_MOONLIT
-2300,32	//SC_DIMENSIONDOOR
-2478,32	//GN_CARTBOOST
-
-//----------------------------------------------------------------------------
-// Zone 2 - Jail
-//----------------------------------------------------------------------------
-421,64	//TK_JUMPKICK
-426,64	//TK_HIGHJUMP
-5023,64	//SU_LOPE
-
-//----------------------------------------------------------------------------
-// Zone 3 - Izlude Battle Arena
-//----------------------------------------------------------------------------
-219,128 //RG_INTIMIDATE
-26,128	//AL_TELEPORT
-2300,128	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 4 - WoE:SE
-//----------------------------------------------------------------------------
-426,256 //TK_HIGHJUMP
-290,256	//SA_ABRACADABRA
-5023,256	//SU_LOPE
-462,256	//SL_KAIZEL
-
-//----------------------------------------------------------------------------
-// Zone 5 - Sealed Shrine
-//----------------------------------------------------------------------------
-12,512	//MG_SAFETYWALL
-26,512	//AL_TELEPORT
-219,512	//RG_INTIMIDATE
-361,512	//HP_ASSUMPTIO
-691,512	//CASH_ASSUMPTIO
-2294,512	//SC_IGNORANCE
-2300,512	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
-//----------------------------------------------------------------------------
-26,1024	//AL_TELEPORT
-87,1024	//WZ_ICEWALL
-219,1024	//RG_INTIMIDATE
-405,1024	//PF_SPIDERWEB
-674,1024	//NPC_EXPULSION
-2294,1024	//SC_IGNORANCE
-2300,1024	//SC_DIMENSIONDOOR
-
-//----------------------------------------------------------------------------
-// Zone 7 - Towns
-//----------------------------------------------------------------------------
-232,2048	//AM_CANNIBALIZE
-233,2048	//AM_SPHEREMINE
-491,2048	//CR_CULTIVATION
-1013,2048	//BS_GREED
-2419,2048	//WM_POEMOFNETHERWORLD
-2482,2048	//GN_WALLOFTHORN
-2493,2048	//GN_SLINGITEM
-
-//----------------------------------------------------------------------------
-// Zone 8 - WOE:TE Dungeons
-//----------------------------------------------------------------------------
-336,4096 // WE_CALLPARTNER
-409,4096 // WE_CALLPARENT
-410,4096 // WE_CALLBABY
-5063,4096	//WE_CALLALLFAMILY
-
-//----------------------------------------------------------------------------
-// Zone 9 - Wave Mode
-//----------------------------------------------------------------------------
-26,8192	//AL_TELEPORT
-87,8192	//WZ_ICEWALL
-197,8192	//NPC_EMOTION
-219,8192	//RG_INTIMIDATE
-405,8192	//PF_SPIDERWEB
-474,8192	//NPC_EMOTION_ON
-674,8192	//NPC_EXPULSION
-2284,8192	//SC_FATALMENACE
-2294,8192	//SC_IGNORANCE
-2300,8192	//SC_DIMENSIONDOOR
--- a/db/re/statpoint.yml
+++ b/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
--- a/db/re/status.yml
+++ b/db/re/status.yml
@@ -72,6 +72,7 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
+      Protection: true
    EndOnStart:
      Aeterna: true
    EndReturn:
@@ -85,7 +86,7 @@ Body:
    Opt1: StoneWait
    Flags:
      SendOption: true
-      BossResist: true      
+      BossResist: true
      StopAttacking: true
    Fail:
      Whiteimprison: true
@@ -125,6 +126,7 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
+      Protection: true
    EndOnStart:
      Aeterna: true
  - Status: Stun
@@ -144,6 +146,7 @@ Body:
      Inspiration: true
      Gvg_Stun: true
      Stun: true
+      Protection: true
  - Status: Sleep
    DurationLookup: NPC_SLEEPATTACK
    States:
@@ -162,6 +165,7 @@ Body:
      Inspiration: true
      Gvg_Sleep: true
      Sleep: true
+      Protection: true
  - Status: Poison
    DurationLookup: NPC_POISON
    CalcFlags:
@@ -180,6 +184,7 @@ Body:
      Inspiration: true
      Poison: true
      Dpoison: true
+      Protection: true
  - Status: Curse
    DurationLookup: NPC_WIDECURSE
    CalcFlags:
@@ -198,6 +203,7 @@ Body:
      Inspiration: true
      Gvg_Curse: true
      Curse: true
+      Protection: true
  - Status: Silence
    DurationLookup: NPC_SILENCEATTACK
    States:
@@ -214,6 +220,7 @@ Body:
      Inspiration: true
      Gvg_Silence: true
      Silence: true
+      Protection: true
  - Status: Confusion
    DurationLookup: NPC_WIDECONFUSE
    Flags:
@@ -223,6 +230,7 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
+      Protection: true
    EndReturn:
      Confusion: true
  - Status: Blind
@@ -242,6 +250,7 @@ Body:
      Fear: true
      Gvg_Blind: true
      Blind: true
+      Protection: true
  - Status: Bleeding
    Icon: EFST_BLOODING
    DurationLookup: NPC_BLEEDING
@@ -259,6 +268,7 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
+      Protection: true
  - Status: Dpoison
    DurationLookup: NPC_POISON
    CalcFlags:
@@ -999,6 +1009,7 @@ Body:
    Flags:
      SendOption: true
  - Status: Extremityfist
+    Icon: EFST_EXTREMITYFIST
    DurationLookup: MO_EXTREMITYFIST
    CalcFlags:
      Regen: true
@@ -1811,6 +1822,7 @@ Body:
    Icon: EFST_ETERNALCHAOS
    DurationLookup: BD_ETERNALCHAOS
    CalcFlags:
+      Def: true
      Def2: true
    Flags:
      NoDispell: true
@@ -2589,13 +2601,17 @@ Body:
    DurationLookup: HLIF_AVOID
    CalcFlags:
      Speed: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
  - Status: Change
    DurationLookup: HLIF_CHANGE
    CalcFlags:
      Vit: true
      Int: true
    Flags:
-      RemoveOnChangeMap: true
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
    Fail:
      Change: true
  - Status: Bloodlust
@@ -2603,6 +2619,9 @@ Body:
    CalcFlags:
      Batk: true
      Watk: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
  - Status: Fleet
    DurationLookup: HFLI_FLEET
    CalcFlags:
@@ -2616,7 +2635,11 @@ Body:
  - Status: Defence
    DurationLookup: HAMI_DEFENCE
    CalcFlags:
+      Def: true
      Vit: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
  - Status: Incaspdrate
    CalcFlags:
      Aspd: true
@@ -4115,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
@@ -6107,14 +6130,6 @@ Body:
      NoBanishingBuster: true
      NoDispell: true
      RemoveOnHermode: true
-  - Status: Extremityfist2
-    Icon: EFST_EXTREMITYFIST
-    DurationLookup: MO_EXTREMITYFIST
-    Flags:
-      NoRemoveOnDead: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
  - Status: Mtf_Aspd2
    Icon: EFST_MTF_ASPD2
    CalcFlags:
@@ -7007,7 +7022,9 @@ Body:
    CalcFlags:
      Regen: true
  - Status: Earthshaker
+    Icon: EFST_EARTHSHAKER
    Flags:
+      BlEffect: true
      NoWarning: true
  - Status: Weaponblock_On
    Icon: EFST_WEAPONBLOCK_ON
@@ -7022,6 +7039,7 @@ Body:
    Icon: EFST_SPORE_EXPLOSION_DEBUFF
    DurationLookup: GN_SPORE_EXPLOSION
    Flags:
+      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -7443,7 +7461,7 @@ Body:
      NoClearance: true
      NoClearbuff: true
  - Status: Madogear
-    Icon: EFST_MADOGEAR
+    Icon: EFST_MADOGEAR_TYPE
    CalcFlags:
      Speed: true
    Flags:
@@ -7957,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
@@ -8008,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
@@ -8032,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
@@ -8923,3 +8951,21 @@ Body:
      NoClearance: true
    EndOnStart:
      Decreaseagi: true
+  - Status: Protection
+    Icon: EFST_RAY_OF_PROTECTION
+    Flags:
+      NoClearbuff: true
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    EndOnStart:
+      Stun: true
+      Sleep: true
+      Curse: true
+      Stone: true
+      Poison: true
+      Blind: true
+      Silence: true
+      Bleeding: true
+      Confusion: true
+      Freeze: true
--- a/db/status_disabled.txt
+++ b/db/status_disabled.txt
@@ -1,505 +0,0 @@
-// Status Change Restriction Database
-//
-// Defines restrictions of status changes (SC).
-// Disabled SC will always be removed or fail to be inflicted on this map.
-//
-// Structure of Database:
-// SCType,Flag
-//
-// Legend for 'Flag' field (bitmask):
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// 16   - restricted in WOE:TE castles
-// Restricted zones - configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-// 4096 - restricted in zone 8
-//
-// Example:
-// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
-
-//----------------------------------------------------------------------------
-// Disabled/Removed statuses in WoE:TE Castles (16)
-//----------------------------------------------------------------------------
-SC_ENDURE,16
-SC_BERSERK,16
-SC_ASSUMPTIO,16
-
-// RUNE_KNIGHT
-SC_ENCHANTBLADE,16
-SC_DEATHBOUND,16
-SC_MILLENNIUMSHIELD,16
-SC_CRUSHSTRIKE,16
-SC_REFRESH,16
-SC_REUSE_REFRESH,16
-SC_GIANTGROWTH,16
-SC_STONEHARDSKIN,16
-SC_VITALITYACTIVATION,16
-SC_STORMBLAST,16
-SC_FIGHTINGSPIRIT,16
-SC_ABUNDANCE,16
-
-// ARCH_BISHOP
-SC_ADORAMUS,16
-SC_EPICLESIS,16
-SC_ORATIO,16
-SC_LAUDAAGNUS,16
-SC_LAUDARAMUS,16
-SC_RENOVATIO,16
-SC_EXPIATIO,16
-SC_DUPLELIGHT,16
-SC_SECRAMENT,16
-
-// WARLOCK
-SC_WHITEIMPRISON,16
-SC_MARSHOFABYSS,16
-SC_RECOGNIZEDSPELL,16
-SC_STASIS,16
-SC_SPHERE_1,16
-SC_SPHERE_2,16
-SC_SPHERE_3,16
-SC_SPHERE_4,16
-SC_SPHERE_5,16
-SC_READING_SB,16
-SC_FREEZE_SP,16
-SC_SPELLBOOK1,16
-SC_SPELLBOOK2,16
-SC_SPELLBOOK3,16
-SC_SPELLBOOK4,16
-SC_SPELLBOOK5,16
-SC_SPELLBOOK6,16
-SC_MAXSPELLBOOK,16
-
-// RANGER
-SC_FEARBREEZE,16
-SC_ELECTRICSHOCKER,16
-SC_WUGDASH,16
-SC_BITE,16
-SC_CAMOUFLAGE,16
-
-// MECHANIC
-SC_ACCELERATION,16
-SC_HOVERING,16
-SC_SHAPESHIFT,16
-SC_INFRAREDSCAN,16
-SC_ANALYZE,16
-SC_MAGNETICFIELD,16
-SC_NEUTRALBARRIER,16
-SC_NEUTRALBARRIER_MASTER,16
-SC_STEALTHFIELD,16
-SC_STEALTHFIELD_MASTER,16
-SC_OVERHEAT,16
-SC_OVERHEAT_LIMITPOINT,16
-
-// GUILLOTINE_CROSS
-SC_VENOMIMPRESS,16
-SC_POISONINGWEAPON,16
-SC_WEAPONBLOCKING,16
-SC_CLOAKINGEXCEED,16
-SC_HALLUCINATIONWALK,16
-SC_HALLUCINATIONWALK_POSTDELAY,16
-SC_ROLLINGCUTTER,16
-SC_TOXIN,16
-SC_PARALYSE,16
-SC_VENOMBLEED,16
-SC_MAGICMUSHROOM,16
-SC_DEATHHURT,16
-SC_PYREXIA,16
-SC_OBLIVIONCURSE,16
-SC_LEECHESEND,16
-
-// ROYAL_GUARD
-SC_REFLECTDAMAGE,16
-SC_FORCEOFVANGUARD,16
-SC_SHIELDSPELL_HP,16
-SC_SHIELDSPELL_SP,16
-SC_SHIELDSPELL_ATK,16
-SC_EXEEDBREAK,16
-SC_PRESTIGE,16
-SC_BANDING,16
-SC_BANDING_DEFENCE,16
-SC_EARTHDRIVE,16
-SC_INSPIRATION,16
-
-// SORCERER
-SC_SPELLFIST,16
-SC_CRYSTALIZE,16
-SC_STRIKING,16
-SC_WARMER,16
-SC_VACUUM_EXTREME,16
-SC_PROPERTYWALK,16
-SC_VACUUM_EXTREME_POSTDELAY,16
-
-// MINSTREL
-SC_SWINGDANCE,16
-SC_SYMPHONYOFLOVER,16
-SC_MOONLITSERENADE,16
-SC_RUSHWINDMILL,16
-SC_ECHOSONG,16
-SC_HARMONIZE,16
-
-// WANDERER
-SC_VOICEOFSIREN,16
-SC_DEEPSLEEP,16
-SC_SIRCLEOFNATURE,16
-SC_GLOOMYDAY,16
-SC_GLOOMYDAY_SK,16
-
-// MINSTREL & WANDERER
-SC_SONGOFMANA,16
-SC_DANCEWITHWUG,16
-SC_SATURDAYNIGHTFEVER,16
-SC_LERADSDEW,16
-SC_MELODYOFSINK,16
-SC_BEYONDOFWARCRY,16
-SC_UNLIMITEDHUMMINGVOICE,16
-
-// SURA
-SC_SITDOWN_FORCE,16
-SC_NETHERWORLD,16
-SC_CRESCENTELBOW,16
-SC_CURSEDCIRCLE_ATKER,16
-SC_CURSEDCIRCLE_TARGET,16
-SC_LIGHTNINGWALK,16
-SC_RAISINGDRAGON,16
-SC_GT_ENERGYGAIN,16
-SC_GT_CHANGE,16
-SC_GT_REVITALIZE,16
-SC_GN_CARTBOOST,16
-
-// GENETIC
-SC_THORNSTRAP,16
-SC_BLOODSUCKER,16
-SC_SMOKEPOWDER,16
-SC_TEARGAS,16
-SC_MANDRAGORA,16
-SC_STOMACHACHE,16
-SC_MYSTERIOUS_POWDER,16
-SC_MELON_BOMB,16
-SC_BANANA_BOMB,16
-SC_BANANA_BOMB_SITDOWN,16
-SC_SAVAGE_STEAK,16
-SC_COCKTAIL_WARG_BLOOD,16
-SC_MINOR_BBQ,16
-SC_SIROMA_ICE_TEA,16
-SC_DROCERA_HERB_STEAMED,16
-SC_PUTTI_TAILS_NOODLES,16
-SC_BOOST500,16
-SC_FULL_SWING_K,16
-SC_MANA_PLUS,16
-SC_MUSTLE_M,16
-SC_LIFE_FORCE_F,16
-SC_EXTRACT_WHITE_POTION_Z,16
-SC_VITATA_500,16
-SC_EXTRACT_SALAMINE_JUICE,16
-
-// Homunculus
-SC_STYLE_CHANGE,16
-SC_TINDER_BREAKER,16
-SC_TINDER_BREAKER2,16
-SC_CBC,16
-SC_EQC,16
-SC_GOLDENE_FERSE,16
-SC_ANGRIFFS_MODUS,16
-SC_OVERED_BOOST,16
-SC_LIGHT_OF_REGENE,16
-SC_ASH,16
-SC_GRANITIC_ARMOR,16
-SC_MAGMA_FLOW,16
-SC_PYROCLASTIC,16
-SC_PARALYSIS,16
-SC_PAIN_KILLER,16
-
-// SHADOW_CHASER
-SC__REPRODUCE,16
-SC__AUTOSHADOWSPELL,16
-SC__SHADOWFORM,16
-SC__BODYPAINT,16
-SC__INVISIBILITY,16
-SC__DEADLYINFECT,16
-SC__ENERVATION,16
-SC__GROOMY,16
-SC__IGNORANCE,16
-SC__LAZINESS,16
-SC__UNLUCKY,16
-SC__WEAKNESS,16
-SC__STRIPACCESSORY,16
-SC__MANHOLE,16
-SC__BLOODYLUST,16
-
-// Elemental SORCERER
-SC_CIRCLE_OF_FIRE,16
-SC_CIRCLE_OF_FIRE_OPTION,16
-SC_FIRE_CLOAK,16
-SC_FIRE_CLOAK_OPTION,16
-SC_WATER_SCREEN,16
-SC_WATER_SCREEN_OPTION,16
-SC_WATER_DROP,16
-SC_WATER_DROP_OPTION,16
-SC_WATER_BARRIER,16
-SC_WIND_STEP,16
-SC_WIND_STEP_OPTION,16
-SC_WIND_CURTAIN,16
-SC_WIND_CURTAIN_OPTION,16
-SC_ZEPHYR,16
-SC_SOLID_SKIN,16
-SC_SOLID_SKIN_OPTION,16
-SC_STONE_SHIELD,16
-SC_STONE_SHIELD_OPTION,16
-SC_POWER_OF_GAIA,16
-SC_PYROTECHNIC,16
-SC_PYROTECHNIC_OPTION,16
-SC_HEATER,16
-SC_HEATER_OPTION,16
-SC_TROPIC,16
-SC_TROPIC_OPTION,16
-SC_AQUAPLAY,16
-SC_AQUAPLAY_OPTION,16
-SC_COOLER,16
-SC_COOLER_OPTION,16
-SC_CHILLY_AIR,16
-SC_CHILLY_AIR_OPTION,16
-SC_GUST,16
-SC_GUST_OPTION,16
-SC_BLAST,16
-SC_BLAST_OPTION,16
-SC_WILD_STORM,16
-SC_WILD_STORM_OPTION,16
-SC_PETROLOGY,16
-SC_PETROLOGY_OPTION,16
-SC_CURSED_SOIL,16
-SC_CURSED_SOIL_OPTION,16
-SC_UPHEAVAL,16
-SC_UPHEAVAL_OPTION,16
-SC_TIDAL_WEAPON,16
-SC_TIDAL_WEAPON_OPTION,16
-SC_ROCK_CRUSHER,16
-SC_ROCK_CRUSHER_ATK,16
-SC_FIRE_INSIGNIA,16
-SC_WATER_INSIGNIA,16
-SC_WIND_INSIGNIA,16
-SC_EARTH_INSIGNIA,16
-
-// KAGEROU / OBORO
-SC_MEIKYOUSISUI,16
-SC_JYUMONJIKIRI,16
-SC_KYOUGAKU,16
-SC_IZAYOI,16
-SC_ZENKAI,16
-SC_KAGEHUMI,16
-SC_KYOMU,16
-SC_KAGEMUSYA,16
-SC_ZANGETSU,16
-SC_GENSOU,16
-SC_AKAITSUKI,16
-
-//Summoner
-SC_SUHIDE,16
-SC_SU_STOOP,16
-SC_SPRITEMABLE,16
-SC_CATNIPPOWDER,16
-SC_SV_ROOTTWIST,16
-SC_BITESCAR,16
-SC_ARCLOUSEDASH,16
-SC_TUNAPARTY,16
-SC_SHRIMP,16
-SC_FRESHSHRIMP,16
-
-// Rebellion
-SC_HEAT_BARREL,16
-SC_MAGICALBULLET,16
-SC_P_ALTER,16
-SC_E_CHAIN,16
-SC_C_MARKER,16
-SC_ANTI_M_BLAST,16
-SC_B_TRAP,16
-SC_H_MINE,16
-SC_QD_SHOT_READY,16
-
-// Star Emperor
-SC_LIGHTOFMOON,16
-SC_LIGHTOFSUN,16
-SC_LIGHTOFSTAR,16
-SC_LUNARSTANCE,16
-SC_UNIVERSESTANCE,16
-SC_SUNSTANCE,16
-SC_FLASHKICK,16
-SC_NEWMOON,16
-SC_STARSTANCE,16
-SC_DIMENSION,16
-SC_DIMENSION1,16
-SC_DIMENSION2,16
-SC_CREATINGSTAR,16
-SC_FALLINGSTAR,16
-SC_NOVAEXPLOSING,16
-SC_GRAVITYCONTROL,16
-
-// Soul Reaper
-SC_SOULCOLLECT,16
-SC_SOULREAPER,16
-SC_SOULUNITY,16
-SC_SOULSHADOW,16
-SC_SOULFAIRY,16
-SC_SOULFALCON,16
-SC_SOULGOLEM,16
-SC_SOULDIVISION,16
-SC_SOULENERGY,16
-SC_USE_SKILL_SP_SPA,16
-SC_USE_SKILL_SP_SHA,16
-SC_SP_SHA,16
-SC_SOULCURSE,16
-
-// Others
-SC_FEAR,16
-SC_BURNING,16
-SC_FREEZING,16
-SC_TEARGAS_SOB,16
-SC__FEINTBOMB,16
-SC__CHAOS,16
-
-// 4th Job Common Status
-SC_HANDICAPSTATE_DEEPBLIND,16
-SC_HANDICAPSTATE_DEEPSILENCE,16
-SC_HANDICAPSTATE_LASSITUDE,16
-SC_HANDICAPSTATE_FROSTBITE,16
-SC_HANDICAPSTATE_SWOONING,16
-SC_HANDICAPSTATE_LIGHTNINGSTRIKE,16
-SC_HANDICAPSTATE_CRYSTALLIZATION,16
-SC_HANDICAPSTATE_CONFLAGRATION,16
-SC_HANDICAPSTATE_MISFORTUNE,16
-SC_HANDICAPSTATE_DEADLYPOISON,16
-SC_HANDICAPSTATE_DEPRESSION,16
-SC_HANDICAPSTATE_HOLYFLAME,16
-
-// Dragon Knight
-SC_SERVANTWEAPON,16
-SC_SERVANT_SIGN,16
-SC_CHARGINGPIERCE,16
-SC_CHARGINGPIERCE_COUNT,16
-SC_DRAGONIC_AURA,16
-SC_VIGOR,16
-
-// Arch Mage
-SC_DEADLY_DEFEASANCE,16
-SC_CLIMAX_DES_HU,16
-SC_CLIMAX,16
-SC_CLIMAX_EARTH,16
-SC_CLIMAX_BLOOM,16
-SC_CLIMAX_CRYIMP,16
-
-// Windhawk
-SC_WINDSIGN,16
-SC_CRESCIVEBOLT,16
-SC_CALAMITYGALE,16
-
-// Cardinal
-SC_MEDIALE,16
-SC_A_VITA,16
-SC_A_TELUM,16
-SC_PRE_ACIES,16
-SC_COMPETENTIA,16
-SC_RELIGIO,16
-SC_BENEDICTUM,16
-
-// Meister
-SC_AXE_STOMP,16
-SC_A_MACHINE,16
-SC_D_MACHINE,16
-SC_ABR_BATTLE_WARIOR,16
-SC_ABR_DUAL_CANNON,16
-SC_ABR_MOTHER_NET,16
-SC_ABR_INFINITY,16
-
-// Shadow Cross
-SC_SHADOW_EXCEED,16
-SC_DANCING_KNIFE,16
-SC_POTENT_VENOM,16
-SC_SHADOW_SCAR,16
-SC_E_SLASH_COUNT,16
-SC_SHADOW_WEAPON,16
-
-// Imperial Guard
-SC_GUARD_STANCE,16
-SC_ATTACK_STANCE,16
-SC_GUARDIAN_S,16
-SC_REBOUND_S,16
-SC_HOLY_S,16
-SC_ULTIMATE_S,16
-SC_SPEAR_SCAR,16
-SC_SHIELD_POWER,16
-
-// Elemental Master
-SC_SPELL_ENCHANTING,16
-SC_SUMMON_ELEMENTAL_ARDOR,16
-SC_SUMMON_ELEMENTAL_DILUVIO,16
-SC_SUMMON_ELEMENTAL_PROCELLA,16
-SC_SUMMON_ELEMENTAL_TERREMOTUS,16
-SC_SUMMON_ELEMENTAL_SERPENS,16
-SC_ELEMENTAL_VEIL,16
-
-// Troubadour/Trouvere
-SC_MYSTIC_SYMPHONY,16
-SC_KVASIR_SONATA,16
-SC_SOUNDBLEND,16
-SC_GEF_NOCTURN,16
-SC_AIN_RHAPSODY,16
-SC_MUSICAL_INTERLUDE,16
-SC_JAWAII_SERENADE,16
-SC_PRON_MARCH,16
-SC_ROSEBLOSSOM,16
-
-// Inquisitor
-SC_POWERFUL_FAITH,16
-SC_SINCERE_FAITH,16
-SC_FIRM_FAITH,16
-SC_HOLY_OIL,16
-SC_FIRST_BRAND,16
-SC_SECOND_BRAND,16
-SC_SECOND_JUDGE,16
-SC_THIRD_EXOR_FLAME,16
-SC_FIRST_FAITH_POWER,16
-SC_MASSIVE_F_BLASTER,16
-
-// Biolo
-SC_PROTECTSHADOWEQUIP,16
-SC_RESEARCHREPORT,16
-SC_BO_HELL_DUSTY,16
-SC_BIONIC_WOODENWARRIOR,16
-SC_BIONIC_WOODEN_FAIRY,16
-SC_BIONIC_CREEPER,16
-SC_BIONIC_HELLTREE,16
-
-// Abyss Chaser
-SC_SHADOW_STRIP,16
-SC_ABYSS_DAGGER,16
-SC_ABYSSFORCEWEAPON,16
-SC_ABYSS_SLAYER,16
-
-// Super Elementals
-SC_FLAMETECHNIC,16
-SC_FLAMETECHNIC_OPTION,16
-SC_FLAMEARMOR,16
-SC_FLAMEARMOR_OPTION,16
-SC_COLD_FORCE,16
-SC_COLD_FORCE_OPTION,16
-SC_CRYSTAL_ARMOR,16
-SC_CRYSTAL_ARMOR_OPTION,16
-SC_GRACE_BREEZE,16
-SC_GRACE_BREEZE_OPTION,16
-SC_EYES_OF_STORM,16
-SC_EYES_OF_STORM_OPTION,16
-SC_EARTH_CARE,16
-SC_EARTH_CARE_OPTION,16
-SC_STRONG_PROTECTION,16
-SC_STRONG_PROTECTION_OPTION,16
-SC_DEEP_POISONING,16
-SC_DEEP_POISONING_OPTION,16
-SC_POISON_SHIELD,16
-SC_POISON_SHIELD_OPTION,16
--- a/doc/atcommands.txt
+++ b/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 |
 ==============================
--- a/doc/ea_job_system.txt
+++ b/doc/ea_job_system.txt
@@ -63,11 +63,12 @@ The eA Job System:
 	EAJL_2		0x300

 - The third category is type. Classes can either be normal, rebirth/advanced,
-  adopted, or third class.
+  adopted, third class or fourth class.

 	EAJL_UPPER	0x1000
 	EAJL_BABY	0x2000
 	EAJL_THIRD	0x4000
+	EAJL_FOURTH	0x8000

 So using these three categories, any job class can be constructed from the
 others. Let's take a swordman, for example.
@@ -143,6 +144,11 @@ EAJL_THIRD:
 	if(@eac&EAJL_THIRD)
 		mes "Wow, you've really grown!";

+EAJL_FOURTH:
+	Checks if a class is a fourth job.
+	if(@eac&EAJL_FOURTH)
+		mes "Wow, you've really grown!";
+
 EAJ_UPPERMASK:
 	The upper mask can be used to "strip" the upper/baby characteristics of a
 	class, used when you want to know if someone is a certain class regardless
@@ -169,13 +175,19 @@ EAJ_BASEMASK:
 	check will  always fail for the same reasons previously explained.

 EAJ_THIRDMASK:
-	This mask strips 3rd class attributes.  It will give the "normal" class of
+	This mask strips 3rd class attributes. It will give the "normal" class of
 	a third job, regardless of rebirth/adopted status.  When used on non-third
 	class characters, it will return the second job, or, if that also doesn't
 	exist, the first.
 	if ((@eac&EAJ_THIRDMASK) == EAJ_WARLOCK_T)
 		mes "You've gone through rebirth, I see.";

+EAJ_FOURTHMASK:
+	This mask strips 4th class attributes. Although currently there are none,
+	it is suggested to use this for checking.
+	if ((@eac&EAJ_FOURTHMASK) == EAJ_DRAGON_KNIGHT)
+		mes "Oh you are a Dragon Knight, I see.";
+
 The script commands eaclass, roclass:
 -------------------------------------------------------------------------------

--- a/doc/map_zones.txt
+++ b/doc/map_zones.txt
@@ -0,0 +1,76 @@
+//===== rAthena Documentation ================================
+//= Map Zone Structure
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Last Updated: ========================================
+//= 20240112
+//===== Description: =========================================
+//= This file describes the functions of map zones, which
+//= determine the behavior of a map in various situations.
+//============================================================
+
+---------------------------------------
+
+Id: Zone ID (constant). These are defined in e_map_type::clif.hpp.
+
+---------------------------------------
+
+DisabledCommands: @commands can be disabled for players below a certain group level.
+Setting the group level to 0 will remove from the DisabledCommands list. Useful for imports.
+
+  heal: 70 # Makes @heal usable only to those group level 70 and above.
+
+---------------------------------------
+
+DisabledSkills: Skills can be disabled for different game object types below a certain group level.
+Setting the group level to 0 will remove from the DisabledSkills list. Useful for imports.
+
+Object Types:
+Pc   - Player
+Mob  - Monster
+Hom  - Homunculus
+Mer  - Mercenary
+Elem - Elemental
+Npc  - NPC
+
+  - Skill: AL_TELEPORT #  Disables Teleport for players, monsters, homunculi, and mercenary.
+    Pc: 100
+    Mob: 100
+    Hom: 100
+    Mer: 100
+  - Skill: AL_WARP # Disables Warp Portal for players.
+    Pc: 100
+
+---------------------------------------
+
+DisabledItems: Items can be disabled from being used or equipped for players below a certain group level.
+Setting the group level to 0 will remove from the DisabledItems list. Useful for imports.
+
+  Apple: 100 # Apple will not be able to be consumed by anyone.
+  Cap: 100 # Cap will not be able to be equipped by anyone.
+  Hat: 0 # Hat will be able to be equipped by all. Useful for import.
+
+---------------------------------------
+
+DisabledStatuses: Statuses can be disabled in a zone for players below a certain group level. These
+statuses, if active, will be removed when entering a zone and will not be able to be re-applied while in the zone.
+Setting the group level to 0 will remove from the DisabledStatuses list. Useful for imports.
+
+  Endure: 100 # Endure will be disabled from activing and being applied within the zone.
+
+---------------------------------------
+
+RestrictedJobs: Jobs can be disabled from entering a zone for players below a certain group level.
+Setting the group level to 0 will remove from the RestrictedJobs list. Useful for imports.
+
+  Priest: 30 # Makes the Priest job unable to enter the map zone to those group level less than 30.
+
+---------------------------------------
+
+Mapflags: Mapflags that are applies to a zone. By default, the Value label is 1/true/on.
+
+  - Flag: NoTeleport # Sets the 'noteleport' mapflag to the zone.
+  - Flag: Skill_Duration
+	Value: AL_SANCTUARY,400 # Sets the 'skill_duration' mapflag to the zone.
+  - Flag: NoMemo # Removes the 'nomemo' mapflag to the zone. Useful for import.
+    Clear: true
--- a/doc/mapflags.txt
+++ b/doc/mapflags.txt
@@ -174,24 +174,6 @@ Disables skill usage on a map.

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

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

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

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

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

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

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

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

 Allows usage of item Neuralizer (ID 12213).
@@ -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.
+
+---------------------------------------
--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@@ -11,6 +11,12 @@
 This file describes the functions of player group permissions,
 configured in '/conf/groups.conf' under the "permissions" bracket.

+The permission name used in '/conf/groups.conf' goes after the asterisk "*",
+while the constant name used in scripts and src goes between the parentheses "()"
+in the following format:
+
+*permission_name (PC_PERM_CONSTANT_NAME)
+
 To search for a permission, write "*" before its name.
 The format of this file is as follows:
 	1. Basic Permissions
@@ -22,20 +28,20 @@ The format of this file is as follows:
 ========================
 ---------------------------------------

-*can_trade
+*can_trade (PC_PERM_TRADE)

 Allows player to distribute items, such as through trades, dropping,
 vending, storage, mail, etc.

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

-*can_party
+*can_party (PC_PERM_PARTY)

 Allows player to create and join parties.

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

-*attendance
+*attendance (PC_PERM_ATTENDANCE)

 Allows player to use the daily attendance system.

@@ -46,78 +52,78 @@ Allows player to use the daily attendance system.
 ===========================
 ---------------------------------------

-*all_skill
+*all_skill (PC_PERM_ALL_SKILL)

 Grants player all available skills in the player's skill tree.

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

-*all_equipment
+*all_equipment (PC_PERM_USE_ALL_EQUIPMENT)

 Allows player to equip any item, regardless of requirements (class, level,
 etc.). Note that this can cause client errors if a sprite does not exist.

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

-*skill_unconditional
+*skill_unconditional (PC_PERM_SKILL_UNCONDITIONAL)

 Allows player to use any skill, regardless of required conditions (SP,
 items, etc.).

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

-*join_chat
+*join_chat (PC_PERM_JOIN_ALL_CHAT)

 Allows player to join password-protected chatrooms.

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

-*kick_chat
+*kick_chat (PC_PERM_NO_CHAT_KICK)

 Prevents player from being kicked from a chatroom.

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

-*view_hpmeter
+*view_hpmeter (PC_PERM_VIEW_HPMETER)

 Allows player to see the HP bar of every player.

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

-*view_equipment
+*view_equipment (PC_PERM_VIEW_EQUIPMENT)

 Allows player to view the equipment of every player, regardless of that
 player's setting.

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

-*hack_info
+*hack_info (PC_PERM_RECEIVE_HACK_INFO)

 Allows player to receive all information about players who try to hack,
 spoof a name, etc.

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

-*disable_pvm
+*disable_pvm (PC_PERM_DISABLE_PVM)

 Prevents player from attacking monsters.

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

-*disable_pvp
+*disable_pvp (PC_PERM_DISABLE_PVP)

 Prevents player from attacking other players.

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

-*can_trade_bounded
+*can_trade_bounded (PC_PERM_TRADE_BOUNDED)

 Allows player to do normal item actions with bounded items (drop, sell,
 trade, etc.).

 ---------------------------------------
 
-*item_unconditional
+*item_unconditional (PC_PERM_ITEM_UNCONDITIONAL)

 Allows player to consume any consumable item regardless the requirements
 (bypass noitemconsumption mapflag, item's class, gender, status changes,
@@ -125,7 +131,7 @@ item delay, etc).

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

-*trade_unconditional
+*trade_unconditional (PC_PERM_TRADE_UNCONDITIONAL)

 Allows player to ignore the trade conditions of items (drop, trade, sell, cart, storage/gstorage, mail and auction).

@@ -136,32 +142,32 @@ Allows player to ignore the trade conditions of items (drop, trade, sell, cart,
 ======================
 ---------------------------------------

-*all_commands
+*all_commands (PC_PERM_USE_ALL_COMMANDS)

 Allows usage of all atcommands and charcommands.

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

-*disable_commands_when_dead
+*disable_commands_when_dead (PC_PERM_DISABLE_CMD_DEAD)

 Disables usage of atcommands when player is dead.

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

-*hide_session
+*hide_session (PC_PERM_HIDE_SESSION)

 Hides player session from being displayed by atcommands (@who, @whomap,
 etc.).

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

-*who_display_aid
+*who_display_aid (PC_PERM_WHO_DISPLAY_AID)

 Displays all GMs and character/account IDs in the @who command.

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

-*any_warp
+*any_warp (PC_PERM_WARP_ANYWHERE)

 Allows player to bypass 'nowarp', 'nowarpto', 'noteleport', and 'nomemo'
 mapflags in commands which modify a character's map or coordinates (@memo,
@@ -169,63 +175,63 @@ mapflags in commands which modify a character's map or coordinates (@memo,

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

-*receive_requests
+*receive_requests (PC_PERM_RECEIVE_REQUESTS)

 Allows player to receive requests through the @requests command.

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

-*show_bossmobs
+*show_bossmobs (PC_PERM_SHOW_BOSS)

 Displays boss mobs in the @showmobs command.

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

-*channel_admin
+*channel_admin (PC_PERM_CHANNEL_ADMIN)

 Allows player to modify #channel settings regardless of ownership and to
 join password-protected channels without a password.

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

-*use_check
+*use_check (PC_PERM_USE_CHECK)

 Allows player to use the client command /check (displays character status).

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

-*use_changemaptype
+*use_changemaptype (PC_PERM_USE_CHANGEMAPTYPE)

 Allows player to use the client command /changemaptype.

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

-*command_enable
+*command_enable (PC_PERM_ENABLE_COMMAND)

 Enable to use atcommand while talking with NPC.

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

-*bypass_stat_onclone
+*bypass_stat_onclone (PC_PERM_BYPASS_STAT_ONCLONE)

 Bypass max parameter limit while using @clonestat

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

-*bypass_max_stat
+*bypass_max_stat (PC_PERM_BYPASS_MAX_STAT)

 Allow to bypass the maximum stat parameter (at conf/player.conf) to
 maximum value 32,767.

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

-*macro_detect
+*macro_detect (PC_PERM_MACRO_DETECT)

 Allows player to use the client command /macro_detector.

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

-*macro_register
+*macro_register (PC_PERM_MACRO_REGISTER)

 Allows player to use the client commands /macro_register (used to add new captcha) and /macro_preview (used to preview captcha by ID).

--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -5694,22 +5694,35 @@ Example:

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

-*searchstores <uses>,<effect>;
+*searchstores <uses>,<effect>{,"<map name>"};

 Invokes the store search window, which allows to search for both vending
-and buying stores. Parameter uses indicates, how many searches can be
-started, before the window has to be reopened. Effect value affects,
-what happens, when a result item is double-clicked and can be one of the
-following:
+and buying stores.

-	0 = Shows the store's position on the mini-map and highlights the
-	    shop sign with yellow color, when the store is on same map
-	    as the invoking player.
-	1 = Directly opens the shop, regardless of distance.
+Parameter <uses> indicates how many searches can be started
+before the window has to be reopened.

-Example:
-	// Item Universal_Catalog_Gold (10 uses, effect: open shop)
-	searchstores 10,1;
+Parameter <effect> affects what happens when a result item is double-clicked
+and can be one of the following:
+
+	SEARCHSTORE_EFFECT_NORMAL : Shows the store's position on the mini-map and highlights the
+								shop sign with yellow color, when the store is on same map
+								as the invoking player.
+	SEARCHSTORE_EFFECT_REMOTE : Directly opens the shop, regardless of distance.
+	
+Optional parameter <map name> indicates the name of map where the stores will be searched.
+If not set, the search will be on the map the invoking character is currently on.
+Special values for <map name> are:
+
+	"this" : Will search for stores on the map where the invoking character is currently on. (default)
+	"all"  : Will search for stores on all maps.
+
+Examples:
+	// Item Vending_Search_Scroll (10 uses, effect: show mark on minimap, current map)
+	searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
+	
+	// Search stores (1 use, effect: open shop, all maps on the server)
+	searchstores 1, SEARCHSTORE_EFFECT_REMOTE, "all";

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

@@ -6111,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
@@ -6638,8 +6652,8 @@ Examples:

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

-macro_detector({<account ID>});
-macro_detector({"<character name>"});
+*macro_detector({<account ID>});
+*macro_detector({"<character name>"});

 This command will display the captcha UI challenge onto the invoking character or the given <account ID>/<character name>.

@@ -6660,6 +6674,46 @@ Example:

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

+*permission_check(<permission>{,<char_id>});
+
+This command will return true if the attached character has the specified permission, false otherwise.
+If <char_id> is given, it will check the permission for that character instead.
+
+A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
+full permissions documentation can be found in 'doc/permissions.txt'.
+
+
+Example:
+	if (permission_check(PC_PERM_TRADE)) {
+		mes "You have permission to trade!";
+	}
+	else {
+		mes "You do not have permission to trade!";
+	}
+	end;
+
+---------------------------------------
+
+*permission_add(<permission>{,<char_id>});
+*permission_remove(<permission>{,<char_id>});
+
+These commands will temporarily add or remove the specified permission to the attached character,
+or the given <char_id> until the player logs out.
+
+A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
+full permissions documentation can be found in 'doc/permissions.txt'.
+
+Examples:
+	// Adds the 'can_trade' permission to the attached character,
+	// allowing them to trade, drop, sell, store and mail items.
+	permission_add(PC_PERM_TRADE);
+
+	// Removes the 'can_party' permission from the attached character,
+	// preventing them from joining or creating parties.
+	permission_remove(PC_PERM_PARTY);
+
+---------------------------------------
+
 ==================================
 |5.- Mob / NPC -related commands.|
 ==================================
@@ -7962,17 +8016,15 @@ Return values:
 //
 ---------------------------------------

-*npcspeed <speed value>;
-*npcwalkto <x>,<y>;
-*npcstop;
+*npcspeed( <speed value> {,"<npc name>"} );
+*npcwalkto( <x>,<y> {,"<npc name>"} } );
+*npcstop( {"<npc name>", {"<flag>"}});

-These commands will make the NPC object in question move around the map. As they
-currently are, they are a bit buggy and are not useful for much more than making
-an NPC move randomly around the map.
+These commands will make the NPC object in question move around the map.

-'npcspeed' will set the NPCs walking speed to a specified value. As in the
-@speed GM command, 200 is the slowest possible speed while 0 is the fastest
-possible (instant motion). 100 is the default character walking speed.
+'npcspeed' will permanently set the NPCs walking speed to a specified value. As in the
+@speed GM command, MAX_WALK_SPEED (1000) is the slowest possible speed while MIN_WALK_SPEED (20) is the fastest
+possible (instant motion). DEFAULT_NPC_WALK_SPEED (200) is the default NPC walking speed.

 'npcwalkto' will start the NPC sprite moving towards the specified coordinates
 on the same map it is currently on. The script proceeds immediately after the
@@ -7980,10 +8032,17 @@ NPC begins moving.

 'npcstop' will stop the motion.

+The <flag> value in npcstop affects how the unit is stopped. The following flags are bitwise values (can be combined using the pipe operator):
+	USW_NONE = Unit will keep walking to their original destination.
+	USW_FIXPOS = Issue a fixpos packet afterwards.
+	USW_MOVE_ONCE = Force the unit to move one cell if it hasn't yet.
+	USW_MOVE_FULL_CELL = Enable moving to the next cell when unit was already half-way there (may cause on-touch/place side-effects, such as a scripted map change).
+	USW_FORCE_STOP = Force stop moving.
+Default: USW_FIXPOS | USW_MOVE_FULL_CELL | USW_FORCE_STOP
+
 While in transit, the NPC will be clickable, but invoking it will cause it to
 stop moving, which will make its coordinates different from what the client
-computed based on the speed and motion coordinates. The effect is rather
-unnerving.
+computed based on the speed and motion coordinates.

 Only a few NPC sprites have walking animations, and those that do, do not get
 the animation invoked when moving the NPC, due to the problem in the NPC walking
@@ -8450,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
@@ -9798,6 +9866,7 @@ For details on the other parameters, see 'announce'.

 This function checks if a party meets certain requirements, returning 1 if all
 conditions are met and 0 otherwise. It will only check online characters.
+The command returns 0 is the party ID does not exist.

 amount - number of online party members (default is 1).
 min    - minimum level of all characters in the party (default is 1).
@@ -10622,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.

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

--- a/doc/skill_db.txt
+++ b/doc/skill_db.txt
@@ -58,6 +58,7 @@ IgnoreFlee		- Skill ignores target's flee (Magic type always ignores)
 IgnoreDefCard	- Skill ignores target's defense cards.
 IgnoreLongCard	- Skill ignores caster's long range damage cards.
 Critical		- Skill can critical.
+SimpleDefense	- (Renewal-only) Physical damage is flatly reduced by DEF+DEF2. RES is ignored.

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

@@ -80,6 +81,7 @@ IsShadowSpell				- Make skill available for SC_AUTOSHADOWSPELL.
 IsChorus					- Chorus skill.
 IgnoreBgReduction			- Ignore Battleground reduction.
 IgnoreGvgReduction			- Ignore GvG reduction.
+IgnorePKReduction			- Ignore PK reduction.
 DisableNearNpc				- Disable self/ground skills near NPC. In tandem with NoNearNpc node.
 TargetTrap					- Damage traps. If TargetType is Trap.
 IgnoreLandProtector			- Ignore SA_LANDPROTECTOR.
--- a/doc/status.txt
+++ b/doc/status.txt
@@ -254,6 +254,9 @@ Flags: Various status flags for specific status change events.
 	SuperNoviceAngel      - Status that is given from Super Novice Angel.
 	TaekwonAngel          - Status that is given from Taekwon Angel.

+	RemoveFromHomOnWarp    - Removes the status from the Homunculus when teleporting or warping to another map.
+	RemoveFromHomOnMapWarp - Removes the status from the Homunculus when warping to another map.
+
 ---------------------------------------

 MinDuration: Minimum duration, in milliseconds, after reduction calculation for status resistance.
--- a/doc/status_change.txt
+++ b/doc/status_change.txt
@@ -1001,17 +1001,23 @@ SC_FLING	()
 	desc:
 	val1:

-SC_AVOID	()
-	desc:
-	val1:
+SC_AVOID	(EFST_HLIF_AVOID)
+	desc: Increase walkspeed for Players and Homunculus
+	val1: Skill Level
+	val2: Walkspeed increase (10 * val1 for Players, 40 * val1 for Homunculus)

-SC_CHANGE	()
-	desc:
-	val1:
+SC_CHANGE	(EFST_HLIF_CHANGE)
+	desc: Increase some Homunculus' statuses (VIT, INT); Uses MATK for damage calculation; Sets Homunculus' HP and SP to 10 on expiration; On Pre-Renewal, sets Homunculus' HP and SP to 100% on cast
+	val1: Skill Level
+	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:
@@ -1021,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
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@@ -1,26 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Brasilis Town
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Brasilis Town Script
-//===== Additional Comments: ================================= 
-//= 1.0 First version. Transportation and Basic NPCs.
+//===== Changelog: ===========================================
+//= 1.0 First version. Transportation and Basic NPCs. [L0ne_W0lf]
 //= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
 //= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
 //= 1.3 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //= 1.4 Added VIP features. [Euphy]
-//============================================================ 
+//============================================================

 // Brasilis Transportation :: brasilis_trans
 //============================================================
-/* Pre-Renewal coordinates: alberta,247,115,3 */
-alberta,246,82,3	script	Crewman#bra2	100,{
+-	script	::Crewman_bra2	-1,{
 	mes "[Crewman]";
 	mes "Hey, have you heard of a place called Brasilis?";
 	mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
--- a/npc/custom/battleground/bg_pvp.txt
+++ b/npc/custom/battleground/bg_pvp.txt
@@ -14,6 +14,19 @@
 //= 1.1 Use up to date battleground script commands [AnnieRuru]
 //============================================================

+//= Enable applicable mapflags
+//guild_vs3	mapflag	gvg	off
+//guild_vs3	mapflag	battleground	2
+//guild_vs3	mapflag	nosave	SavePoint
+//guild_vs3	mapflag	nowarp
+//guild_vs3	mapflag	nowarpto
+//guild_vs3	mapflag	noteleport
+//guild_vs3	mapflag	nomemo
+//guild_vs3	mapflag	nopenalty
+//guild_vs3	mapflag	nobranch
+//guild_vs3	mapflag	noicewall
+//guild_vs3	mapflag	hidemobhpbar
+
 -	script	bg_pvp#control	-1,{
 OnInit:
 	.minplayer2start = 2;      // minimum players to start (ex. if 3vs3, set to 3)
@@ -107,15 +120,3 @@ OnStart:
 	waitingroom "Blue Team", getvariableofnpc( .minplayer2start, "bg_pvp#control" ) +1, "bg_pvp#control::OnStart", getvariableofnpc( .minplayer2start, "bg_pvp#control" );
 	end;
 }
-
-guild_vs3	mapflag	gvg	off
-guild_vs3	mapflag	battleground	2
-guild_vs3	mapflag	nosave	SavePoint
-guild_vs3	mapflag	nowarp
-guild_vs3	mapflag	nowarpto
-guild_vs3	mapflag	noteleport
-guild_vs3	mapflag	nomemo
-guild_vs3	mapflag	nopenalty
-guild_vs3	mapflag	nobranch
-guild_vs3	mapflag	noicewall
-guild_vs3	mapflag	hidemobhpbar
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -184,7 +184,28 @@ function	Job_Options	{
 			Job_Options(.@job_opt,roclass(.@eac|EAJL_THIRD)); // Expanded SN is "third" cls
 		}
 	}
+
+	// babies don't get to become 4th jobs
+	if (.FourthExpanded && .@eac == EAJ_REBELLION) {
+		Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
+		Job_Options(.@job_opt, roclass(EAJ_NIGHT_WATCH));
+	}
+
+	if (.FourthExpanded && .@eac == EAJ_KAGEROUOBORO) {
+		Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
+		Job_Options(.@job_opt, roclass(EAJ_SHINKIRO_SHIRANUI));
+	}
+
+	if (.FourthExpanded && .@eac == EAJ_SUPER_NOVICE_E) {
+		Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
+		Job_Options(.@job_opt, roclass(EAJ_HYPER_NOVICE));
+	}
 	
+	if (.FourthExpanded && .@eac == EAJ_SUMMONER) {
+		Require_Level(.Req_SHandler[0], .Req_SHandler[1]);
+		Job_Options(.@job_opt, roclass(EAJ_SPIRIT_HANDLER));
+	}
+
 	if (.SecondExpanded && 
 		((.@eac&(~EAJL_BABY)) == EAJ_NINJA || 		// is (Baby) Ninja
 		(.@eac&(~EAJL_BABY)) == EAJ_GUNSLINGER)) {	// is (Baby) Gunslinger
@@ -483,6 +504,7 @@ OnInit:
 	
 	// Settings
 	.FourthClass = true;				// Enable fourth classes?
+	.FourthExpanded = true;				// Enable new expanded fourth classes: Ex. Hyper Novice, Rebellion, Shinkiro/Shiranui?
 	.ThirdClass = true;					// Enable third classes?
 	.RebirthClass = true;				// Enable rebirth classes?
 	.SecondExpanded = true;				// Enable new expanded second classes: Ex. Super Novice, Kagerou/Oboro, Rebellion?
@@ -504,6 +526,7 @@ OnInit:
 	setarray .Req_Fourth[0],200,70;		// Minimum base level, job level to change to fourth class
 	setarray .Req_Exp_NJ_GS[0],99,70; 	// Minimum base level, job level to turn into Expanded Ninja and Gunslinger
 	setarray .Req_Exp_SNOVI[0],99,99; 	// Minimum base level, job level to turn into Expanded Super Novice
+	setarray .Req_SHandler[0],200,60;	// Minimum base level, job level to turn into Spirit Handler
 	.SNovice = 45;						// Minimum base level to turn into Super Novice
 	
 	// Setting adjustments by PACKETVER
--- a/npc/custom/official/GeffenMagicTournament.txt
+++ b/npc/custom/official/GeffenMagicTournament.txt
@@ -4830,33 +4830,3 @@ OnInstanceInit:
 	hideonnpc instance_npcname("Handsome Adventurer#gef");
 	end;
 }
-
-1@gef	mapflag	nowarp
-1@gef	mapflag	nomemo
-1@gef	mapflag	noteleport
-1@gef	mapflag	monster_noteleport
-1@gef	mapflag	nosave
-1@gef	mapflag	nobranch
-1@gef	mapflag	nowarpto
-1@gef	mapflag	noicewall
-1@gef	mapflag	restricted	9
-
-1@ge_st	mapflag	nowarp
-1@ge_st	mapflag	nomemo
-1@ge_st	mapflag	noteleport
-1@ge_st	mapflag	monster_noteleport
-1@ge_st	mapflag	nosave
-1@ge_st	mapflag	nobranch
-1@ge_st	mapflag	nowarpto
-1@ge_st	mapflag	noicewall
-1@ge_st	mapflag	restricted	9
-
-1@gef_in	mapflag	nowarp
-1@gef_in	mapflag	nomemo
-1@gef_in	mapflag	noteleport
-1@gef_in	mapflag	monster_noteleport
-1@gef_in	mapflag	nosave
-1@gef_in	mapflag	nobranch
-1@gef_in	mapflag	nowarpto
-1@gef_in	mapflag	noicewall
-1@gef_in	mapflag	restricted	9
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -110,7 +110,18 @@ function Pick {
 	Go(.@map$,.@x,.@y);
 }
 function Restrict {
-	if ((getarg(0) == "RE" && !checkre(0)) || (getarg(0) == "Pre-RE" && checkre(0))) {
+	.@type$ = getarg(0);
+	
+	if (.@type$ == "Brasilis") {
+		// If the official warper to Brasilis is enabled, meaning is either
+		// Renewal mode or Pre-renewal Brasilis is enabled, we lift the restriction
+		if (getnpcid(0, "Crewman_bra2"))
+			return;
+		// Otherwise we apply the renewal restriction
+		.@type$ = "RE";
+	}
+
+	if ((.@type$ == "RE" && !checkre(0)) || (.@type$ == "Pre-RE" && checkre(0))) {
 		if (getarg(1,0)) {
 			set @warp_block,0;
 			for (set .@i,1; .@i<getargcount(); set .@i,.@i+1)
@@ -141,7 +152,7 @@ T2: Go("alberta",28,234);
 T3: Go("aldebaran",140,131);
 T4: Go("amatsu",198,84);
 T5: Go("ayothaya",208,166);
-T6: Restrict("RE");
+T6: Restrict("Brasilis");
 	Go("brasilis",196,217);
 T7: Go("comodo",209,143);
 T8: Restrict("RE");
@@ -218,7 +229,7 @@ F2: setarray @c[2],173,134,212,150;
 F3: Restrict("RE");
 	setarray @c[2],193,220,220,187;
 	Disp("Bifrost Field",1,2); Pick("bif_fild");
-F4: Restrict("RE");
+F4: Restrict("Brasilis");
 	setarray @c[2],74,32;
 	Disp("Brasilis Field",1,1); Pick("bra_fild");
 F5: Restrict("Pre-RE",5);
@@ -343,7 +354,7 @@ D7: Restrict("RE");
 D8: Restrict("RE",4,5);
 	setarray @c[2],150,288,150,18,140,134,244,52,100,202;
 	Disp("Bio Lab 1:Bio Lab 2:Bio Lab 3:Bio Lab 4:Tomb of the Fallen"); Pick("","lhz_dun01","lhz_dun02","lhz_dun03","lhz_dun04","lhz_dun_n");
-D9: Restrict("RE");
+D9: Restrict("Brasilis");
 	setarray @c[2],87,47,262,262;
 	Disp("Brasilis Dungeon",1,2); Pick("bra_dun");
 D10: Restrict("RE",6);
--- a/npc/jobs/2-1/assassin.txt
+++ b/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;
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@@ -59,7 +59,7 @@ aldeba_in,96,181,4	script	Kafra Service	113,{
 			mes "seems that you don't";
 			mes "have the 20 zeny to pay";
 			mes "the Storage access fee...";
-			close;
+			close3;
 		}
 		mes "[Kafra Leilah]";
 		mes "Although this facility is";
@@ -687,3 +687,12 @@ alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{
 	savepoint "alb2trea",92,64,1,1;
 	callfunc "F_KafEnd",0,1,"at Sunken Ship";
 }
+
+// Brasilis
+//============================================================
+brasilis,197,221,4	script	Kafra Employee::kaf_bra	4_F_KAFRA1,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,3,0,80,700;
+	savepoint "brasilis",195,259,1,1;
+	callfunc "F_KafEnd",0,1,"in the city of Brasilis";
+}
--- a/npc/mapflag/gvg.txt
+++ b/npc/mapflag/gvg.txt
@@ -1,99 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Guild versus Guild mode.
-//===== Description: =========================================
-//= Players can attack other guilds, and will have their guild
-//= icons shown. WoE damage reductions will also take place.
-//= gvg: Turns on GvG mode.
-//= gvg_castle: Describes castle maps for WoE.
-//= gvg_dungeon: Describes dungeon maps for WoE.
-//= gvg_te: Turns on GvG mode for WoE:TE.
-//= gvg_te_castle: Describes castle maps for WoE:TE.
-//===== Changelogs: ==========================================
-//= 1.1 Added Novice Guild Castles.
-//= 1.2 Updated with new meanings of gvg and gvg_castle.
-//= 1.3 Renewal split. [Euphy]
-//= 1.4 Disable costumes in GvG castles. [Aleos]
-//============================================================
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	gvg
-guild_vs2	mapflag	gvg
-guild_vs3	mapflag	gvg
-guild_vs4	mapflag	gvg
-guild_vs5	mapflag	gvg
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	gvg_castle
-aldeg_cas02	mapflag	gvg_castle
-aldeg_cas03	mapflag	gvg_castle
-aldeg_cas04	mapflag	gvg_castle
-aldeg_cas05	mapflag	gvg_castle
-gefg_cas01	mapflag	gvg_castle
-gefg_cas02	mapflag	gvg_castle
-gefg_cas03	mapflag	gvg_castle
-gefg_cas04	mapflag	gvg_castle
-gefg_cas05	mapflag	gvg_castle
-payg_cas01	mapflag	gvg_castle
-payg_cas02	mapflag	gvg_castle
-payg_cas03	mapflag	gvg_castle
-payg_cas04	mapflag	gvg_castle
-payg_cas05	mapflag	gvg_castle
-prtg_cas01	mapflag	gvg_castle
-prtg_cas02	mapflag	gvg_castle
-prtg_cas03	mapflag	gvg_castle
-prtg_cas04	mapflag	gvg_castle
-prtg_cas05	mapflag	gvg_castle
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	gvg_castle
-schg_cas02	mapflag	gvg_castle
-schg_cas03	mapflag	gvg_castle
-schg_cas04	mapflag	gvg_castle
-schg_cas05	mapflag	gvg_castle
-arug_cas01	mapflag	gvg_castle
-arug_cas02	mapflag	gvg_castle
-arug_cas03	mapflag	gvg_castle
-arug_cas04	mapflag	gvg_castle
-arug_cas05	mapflag	gvg_castle
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-//n_castle	mapflag	gvg_castle
-nguild_alde	mapflag	gvg_castle
-nguild_gef	mapflag	gvg_castle
-nguild_pay	mapflag	gvg_castle
-nguild_prt	mapflag	gvg_castle
-
-//============================================================
-// Guild Dungeons
-//============================================================
-arug_dun01	mapflag	gvg_dungeon
-schg_dun01	mapflag	gvg_dungeon
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	gvg
-2009rwc_02	mapflag	gvg
-2009rwc_03	mapflag	gvg
-2009rwc_04	mapflag	gvg
-2009rwc_05	mapflag	gvg
-2009rwc_06	mapflag	gvg
-2009rwc_07	mapflag	gvg
-2009rwc_08	mapflag	gvg
-2009rwc_f01	mapflag	gvg
-2012rwc_01	mapflag	gvg
-2012rwc_02	mapflag	gvg
-2012rwc_03	mapflag	gvg
-2012rwc_04	mapflag	gvg
-2012rwc_05	mapflag	gvg
-2012rwc_06	mapflag	gvg
-2012rwc_07	mapflag	gvg
-2012rwc_08	mapflag	gvg
--- a/npc/mapflag/gvg_noparty.txt
+++ b/npc/mapflag/gvg_noparty.txt
@@ -1,37 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: gvg_noparty.
-//===== Description: =========================================
-//= Ignores party alliances on GvG-enabled maps.
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Capuche]
-//============================================================
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	gvg_noparty
-guild_vs2	mapflag	gvg_noparty
-guild_vs3	mapflag	gvg_noparty
-guild_vs4	mapflag	gvg_noparty
-guild_vs5	mapflag	gvg_noparty
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	gvg_noparty
-2009rwc_02	mapflag	gvg_noparty
-2009rwc_03	mapflag	gvg_noparty
-2009rwc_04	mapflag	gvg_noparty
-2009rwc_05	mapflag	gvg_noparty
-2009rwc_06	mapflag	gvg_noparty
-2009rwc_07	mapflag	gvg_noparty
-2009rwc_08	mapflag	gvg_noparty
-2009rwc_f01	mapflag	gvg_noparty
-2012rwc_01	mapflag	gvg_noparty
-2012rwc_02	mapflag	gvg_noparty
-2012rwc_03	mapflag	gvg_noparty
-2012rwc_04	mapflag	gvg_noparty
-2012rwc_05	mapflag	gvg_noparty
-2012rwc_06	mapflag	gvg_noparty
-2012rwc_07	mapflag	gvg_noparty
-2012rwc_08	mapflag	gvg_noparty
--- a/npc/mapflag/hidemobhpbar.txt
+++ b/npc/mapflag/hidemobhpbar.txt
@@ -1,193 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: hidemobhpbar.
-//===== Description: =========================================
-//= Hide monster's HP bar (added in episode 14.2).
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [Lemongrass]
-//============================================================
-
-//============================================================
-// PvP Arenas
-//============================================================
-pvp_y_1-1	mapflag	hidemobhpbar
-pvp_y_1-2	mapflag	hidemobhpbar
-pvp_y_1-3	mapflag	hidemobhpbar
-pvp_y_1-4	mapflag	hidemobhpbar
-pvp_y_1-5	mapflag	hidemobhpbar
-pvp_y_2-1	mapflag	hidemobhpbar
-pvp_y_2-2	mapflag	hidemobhpbar
-pvp_y_2-3	mapflag	hidemobhpbar
-pvp_y_2-4	mapflag	hidemobhpbar
-pvp_y_2-5	mapflag	hidemobhpbar
-pvp_y_3-1	mapflag	hidemobhpbar
-pvp_y_3-2	mapflag	hidemobhpbar
-pvp_y_3-3	mapflag	hidemobhpbar
-pvp_y_3-4	mapflag	hidemobhpbar
-pvp_y_3-5	mapflag	hidemobhpbar
-pvp_y_4-1	mapflag	hidemobhpbar
-pvp_y_4-2	mapflag	hidemobhpbar
-pvp_y_4-3	mapflag	hidemobhpbar
-pvp_y_4-4	mapflag	hidemobhpbar
-pvp_y_4-5	mapflag	hidemobhpbar
-pvp_y_5-1	mapflag	hidemobhpbar
-pvp_y_5-2	mapflag	hidemobhpbar
-pvp_y_5-3	mapflag	hidemobhpbar
-pvp_y_5-4	mapflag	hidemobhpbar
-pvp_y_5-5	mapflag	hidemobhpbar
-pvp_y_6-1	mapflag	hidemobhpbar
-pvp_y_6-2	mapflag	hidemobhpbar
-pvp_y_6-3	mapflag	hidemobhpbar
-pvp_y_6-4	mapflag	hidemobhpbar
-pvp_y_6-5	mapflag	hidemobhpbar
-pvp_y_7-1	mapflag	hidemobhpbar
-pvp_y_7-2	mapflag	hidemobhpbar
-pvp_y_7-3	mapflag	hidemobhpbar
-pvp_y_7-4	mapflag	hidemobhpbar
-pvp_y_7-5	mapflag	hidemobhpbar
-pvp_y_8-1	mapflag	hidemobhpbar
-pvp_y_8-2	mapflag	hidemobhpbar
-pvp_y_8-3	mapflag	hidemobhpbar
-pvp_y_8-4	mapflag	hidemobhpbar
-pvp_y_8-5	mapflag	hidemobhpbar
-pvp_n_1-1	mapflag	hidemobhpbar
-pvp_n_1-2	mapflag	hidemobhpbar
-pvp_n_1-3	mapflag	hidemobhpbar
-pvp_n_1-4	mapflag	hidemobhpbar
-pvp_n_1-5	mapflag	hidemobhpbar
-pvp_n_2-1	mapflag	hidemobhpbar
-pvp_n_2-2	mapflag	hidemobhpbar
-pvp_n_2-3	mapflag	hidemobhpbar
-pvp_n_2-4	mapflag	hidemobhpbar
-pvp_n_2-5	mapflag	hidemobhpbar
-pvp_n_3-1	mapflag	hidemobhpbar
-pvp_n_3-2	mapflag	hidemobhpbar
-pvp_n_3-3	mapflag	hidemobhpbar
-pvp_n_3-4	mapflag	hidemobhpbar
-pvp_n_3-5	mapflag	hidemobhpbar
-pvp_n_4-1	mapflag	hidemobhpbar
-pvp_n_4-2	mapflag	hidemobhpbar
-pvp_n_4-3	mapflag	hidemobhpbar
-pvp_n_4-4	mapflag	hidemobhpbar
-pvp_n_4-5	mapflag	hidemobhpbar
-pvp_n_5-1	mapflag	hidemobhpbar
-pvp_n_5-2	mapflag	hidemobhpbar
-pvp_n_5-3	mapflag	hidemobhpbar
-pvp_n_5-4	mapflag	hidemobhpbar
-pvp_n_5-5	mapflag	hidemobhpbar
-pvp_n_6-1	mapflag	hidemobhpbar
-pvp_n_6-2	mapflag	hidemobhpbar
-pvp_n_6-3	mapflag	hidemobhpbar
-pvp_n_6-4	mapflag	hidemobhpbar
-pvp_n_6-5	mapflag	hidemobhpbar
-pvp_n_7-1	mapflag	hidemobhpbar
-pvp_n_7-2	mapflag	hidemobhpbar
-pvp_n_7-3	mapflag	hidemobhpbar
-pvp_n_7-4	mapflag	hidemobhpbar
-pvp_n_7-5	mapflag	hidemobhpbar
-pvp_n_8-1	mapflag	hidemobhpbar
-pvp_n_8-2	mapflag	hidemobhpbar
-pvp_n_8-3	mapflag	hidemobhpbar
-pvp_n_8-4	mapflag	hidemobhpbar
-pvp_n_8-5	mapflag	hidemobhpbar
-pvp_2vs2	mapflag	hidemobhpbar
-
-//============================================================
-// Aldebaran Turbo Track
-//============================================================
-turbo_e_4	mapflag	hidemobhpbar
-turbo_e_8	mapflag	hidemobhpbar
-turbo_e_16	mapflag	hidemobhpbar
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	hidemobhpbar
-guild_vs2	mapflag	hidemobhpbar
-guild_vs3	mapflag	hidemobhpbar
-guild_vs4	mapflag	hidemobhpbar
-guild_vs5	mapflag	hidemobhpbar
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	hidemobhpbar
-aldeg_cas02	mapflag	hidemobhpbar
-aldeg_cas03	mapflag	hidemobhpbar
-aldeg_cas04	mapflag	hidemobhpbar
-aldeg_cas05	mapflag	hidemobhpbar
-gefg_cas01	mapflag	hidemobhpbar
-gefg_cas02	mapflag	hidemobhpbar
-gefg_cas03	mapflag	hidemobhpbar
-gefg_cas04	mapflag	hidemobhpbar
-gefg_cas05	mapflag	hidemobhpbar
-payg_cas01	mapflag	hidemobhpbar
-payg_cas02	mapflag	hidemobhpbar
-payg_cas03	mapflag	hidemobhpbar
-payg_cas04	mapflag	hidemobhpbar
-payg_cas05	mapflag	hidemobhpbar
-prtg_cas01	mapflag	hidemobhpbar
-prtg_cas02	mapflag	hidemobhpbar
-prtg_cas03	mapflag	hidemobhpbar
-prtg_cas04	mapflag	hidemobhpbar
-prtg_cas05	mapflag	hidemobhpbar
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	hidemobhpbar
-schg_cas02	mapflag	hidemobhpbar
-schg_cas03	mapflag	hidemobhpbar
-schg_cas04	mapflag	hidemobhpbar
-schg_cas05	mapflag	hidemobhpbar
-arug_cas01	mapflag	hidemobhpbar
-arug_cas02	mapflag	hidemobhpbar
-arug_cas03	mapflag	hidemobhpbar
-arug_cas04	mapflag	hidemobhpbar
-arug_cas05	mapflag	hidemobhpbar
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-//n_castle	mapflag	hidemobhpbar
-nguild_alde	mapflag	hidemobhpbar
-nguild_gef	mapflag	hidemobhpbar
-nguild_pay	mapflag	hidemobhpbar
-nguild_prt	mapflag	hidemobhpbar
-
-//============================================================
-// Guild Dungeons
-//============================================================
-arug_dun01	mapflag	hidemobhpbar
-schg_dun01	mapflag	hidemobhpbar
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_c01	mapflag	hidemobhpbar
-bat_c02	mapflag	hidemobhpbar
-bat_c03	mapflag	hidemobhpbar
-bat_b01	mapflag	hidemobhpbar
-bat_b02	mapflag	hidemobhpbar
-bat_a01	mapflag	hidemobhpbar
-bat_a02	mapflag	hidemobhpbar
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	hidemobhpbar
-2009rwc_02	mapflag	hidemobhpbar
-2009rwc_03	mapflag	hidemobhpbar
-2009rwc_04	mapflag	hidemobhpbar
-2009rwc_05	mapflag	hidemobhpbar
-2009rwc_06	mapflag	hidemobhpbar
-2009rwc_07	mapflag	hidemobhpbar
-2009rwc_08	mapflag	hidemobhpbar
-2009rwc_f01	mapflag	hidemobhpbar
-2012rwc_01	mapflag	hidemobhpbar
-2012rwc_02	mapflag	hidemobhpbar
-2012rwc_03	mapflag	hidemobhpbar
-2012rwc_04	mapflag	hidemobhpbar
-2012rwc_05	mapflag	hidemobhpbar
-2012rwc_06	mapflag	hidemobhpbar
-2012rwc_07	mapflag	hidemobhpbar
-2012rwc_08	mapflag	hidemobhpbar
--- a/npc/mapflag/jail.txt
+++ b/npc/mapflag/jail.txt
@@ -1,48 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Jail.
-//===== Description: ========================================= 
-//= Jail specific restrictions, only for map sec_pri
-//= pvp: Turns on PvP mode
-//= pvp_noparty: Can't attack player in same party
-//= nomemo: No Warp Portal Memory Point allowed.
-//= nowarp: Disables warping from the map.
-//= noreturn: Disables specific warp consumables.
-//= pvp_nightmaredrop: Players drop items/equipment on death.
-//= nosave: No respawn point saving allowed.
-//= noteleport: No Teleporting allowed.  No fly wings or butterfly wings.
-//= hidemobhpbar: No HP bar will be displayed for monsters.
-//= restricted: Disables items configured in item_noequip.txt
-//=				and skills configured in skill_nocast_db.txt.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//============================================================
-
-// No Memory
-sec_pri	mapflag	nomemo
-
-// No Save
-sec_pri	mapflag	nosave	SavePoint
-
-// No Teleport
-sec_pri	mapflag	noteleport
-
-// No Warp
-sec_pri	mapflag	nowarp
-
-// No Return
-sec_pri	mapflag	noreturn
-
-// PvP
-sec_pri	mapflag	pvp
-
-// No Party
-sec_pri	mapflag	pvp_noparty
-
-// Nightmare Equipment Drops
-sec_pri	mapflag	pvp_nightmaredrop	random,equip,300
-
-// Hide Monster HP bar
-sec_pri	mapflag	hidemobhpbar
-
-// Item and Skill restrictions
-sec_pri	mapflag	restricted	2
--- a/npc/mapflag/night.txt
+++ b/npc/mapflag/night.txt
@@ -1,304 +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
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	nightenabled
--- a/npc/mapflag/nightmare.txt
+++ b/npc/mapflag/nightmare.txt
@@ -1,52 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Nightmare mode.
-//===== Description: ========================================= 
-//= Players drop items/equipment on death.
-//= pvp_nightmaredrop	id,type,percent
-//=   id: Drop a specific item ID or "random"
-//=   type: "inventory", "equip", or "all"
-//=   percent: Rate of item drop.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//============================================================
-
-pvp_n_1-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_2-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_3-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_4-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_5-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_6-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_7-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_8-1	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_1-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_2-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_3-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_4-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_5-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_6-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_7-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_8-2	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_1-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_2-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_3-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_4-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_5-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_6-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_7-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_8-3	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_1-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_2-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_3-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_4-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_5-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_6-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_7-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_8-4	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_1-5	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_2-5	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_3-5	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_4-5	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_5-5	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_6-5	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_7-5	mapflag	pvp_nightmaredrop	random,equip,300
-pvp_n_8-5	mapflag	pvp_nightmaredrop	random,equip,300
--- a/npc/mapflag/nobranch.txt
+++ b/npc/mapflag/nobranch.txt
@@ -1,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)
-//===== 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
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nobranch
-2009rwc_02	mapflag	nobranch
-2009rwc_03	mapflag	nobranch
-2009rwc_04	mapflag	nobranch
-2009rwc_05	mapflag	nobranch
-2009rwc_06	mapflag	nobranch
-2009rwc_07	mapflag	nobranch
-2009rwc_08	mapflag	nobranch
-2009rwc_f01	mapflag	nobranch
-2012rwc_01	mapflag	nobranch
-2012rwc_02	mapflag	nobranch
-2012rwc_03	mapflag	nobranch
-2012rwc_04	mapflag	nobranch
-2012rwc_05	mapflag	nobranch
-2012rwc_06	mapflag	nobranch
-2012rwc_07	mapflag	nobranch
-2012rwc_08	mapflag	nobranch
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	nobranch
--- a/npc/mapflag/nocostume.txt
+++ b/npc/mapflag/nocostume.txt
@@ -1,167 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: nocostume
-//===== Description: =========================================
-//= A mapflag to disable costume's sprite on map.
-//= Usage:
-//=     [mapname]	mapflag	nocostume
-//===== Changelogs: ==========================================
-//= 1.0 Initial release. [Cydh]
-//= 1.1 Added arug_dun01 and schg_dun01. [Cydh]
-//============================================================
-
-//============================================================
-// Guild Dungeons
-//============================================================
-teg_dun01	mapflag	nocostume
-teg_dun02	mapflag	nocostume
-arug_dun01	mapflag	nocostume
-schg_dun01	mapflag	nocostume
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	nocostume
-aldeg_cas02	mapflag	nocostume
-aldeg_cas03	mapflag	nocostume
-aldeg_cas04	mapflag	nocostume
-aldeg_cas05	mapflag	nocostume
-gefg_cas01	mapflag	nocostume
-gefg_cas02	mapflag	nocostume
-gefg_cas03	mapflag	nocostume
-gefg_cas04	mapflag	nocostume
-gefg_cas05	mapflag	nocostume
-payg_cas01	mapflag	nocostume
-payg_cas02	mapflag	nocostume
-payg_cas03	mapflag	nocostume
-payg_cas04	mapflag	nocostume
-payg_cas05	mapflag	nocostume
-prtg_cas01	mapflag	nocostume
-prtg_cas02	mapflag	nocostume
-prtg_cas03	mapflag	nocostume
-prtg_cas04	mapflag	nocostume
-prtg_cas05	mapflag	nocostume
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	nocostume
-schg_cas02	mapflag	nocostume
-schg_cas03	mapflag	nocostume
-schg_cas04	mapflag	nocostume
-schg_cas05	mapflag	nocostume
-arug_cas01	mapflag	nocostume
-arug_cas02	mapflag	nocostume
-arug_cas03	mapflag	nocostume
-arug_cas04	mapflag	nocostume
-arug_cas05	mapflag	nocostume
-
-//============================================================
-// WoE:TE Castles
-//============================================================
-te_prtcas01	mapflag	nocostume
-te_prtcas02	mapflag	nocostume
-te_prtcas03	mapflag	nocostume
-te_prtcas04	mapflag	nocostume
-te_prtcas05	mapflag	nocostume
-te_aldecas1	mapflag	nocostume
-te_aldecas2	mapflag	nocostume
-te_aldecas3	mapflag	nocostume
-te_aldecas4	mapflag	nocostume
-te_aldecas5	mapflag	nocostume
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-//n_castle	mapflag	nocostume
-nguild_alde	mapflag	nocostume
-nguild_gef	mapflag	nocostume
-nguild_pay	mapflag	nocostume
-nguild_prt	mapflag	nocostume
-
-//============================================================
-// PvP Arenas
-//============================================================
-pvp_y_1-1	mapflag	nocostume
-pvp_y_1-2	mapflag	nocostume
-pvp_y_1-3	mapflag	nocostume
-pvp_y_1-4	mapflag	nocostume
-pvp_y_1-5	mapflag	nocostume
-pvp_y_2-1	mapflag	nocostume
-pvp_y_2-2	mapflag	nocostume
-pvp_y_2-3	mapflag	nocostume
-pvp_y_2-4	mapflag	nocostume
-pvp_y_2-5	mapflag	nocostume
-pvp_y_3-1	mapflag	nocostume
-pvp_y_3-2	mapflag	nocostume
-pvp_y_3-3	mapflag	nocostume
-pvp_y_3-4	mapflag	nocostume
-pvp_y_3-5	mapflag	nocostume
-pvp_y_4-1	mapflag	nocostume
-pvp_y_4-2	mapflag	nocostume
-pvp_y_4-3	mapflag	nocostume
-pvp_y_4-4	mapflag	nocostume
-pvp_y_4-5	mapflag	nocostume
-pvp_y_5-1	mapflag	nocostume
-pvp_y_5-2	mapflag	nocostume
-pvp_y_5-3	mapflag	nocostume
-pvp_y_5-4	mapflag	nocostume
-pvp_y_5-5	mapflag	nocostume
-pvp_y_6-1	mapflag	nocostume
-pvp_y_6-2	mapflag	nocostume
-pvp_y_6-3	mapflag	nocostume
-pvp_y_6-4	mapflag	nocostume
-pvp_y_6-5	mapflag	nocostume
-pvp_y_7-1	mapflag	nocostume
-pvp_y_7-2	mapflag	nocostume
-pvp_y_7-3	mapflag	nocostume
-pvp_y_7-4	mapflag	nocostume
-pvp_y_7-5	mapflag	nocostume
-pvp_y_8-1	mapflag	nocostume
-pvp_y_8-2	mapflag	nocostume
-pvp_y_8-3	mapflag	nocostume
-pvp_y_8-4	mapflag	nocostume
-pvp_y_8-5	mapflag	nocostume
-pvp_n_1-1	mapflag	nocostume
-pvp_n_1-2	mapflag	nocostume
-pvp_n_1-3	mapflag	nocostume
-pvp_n_1-4	mapflag	nocostume
-pvp_n_1-5	mapflag	nocostume
-pvp_n_2-1	mapflag	nocostume
-pvp_n_2-2	mapflag	nocostume
-pvp_n_2-3	mapflag	nocostume
-pvp_n_2-4	mapflag	nocostume
-pvp_n_2-5	mapflag	nocostume
-pvp_n_3-1	mapflag	nocostume
-pvp_n_3-2	mapflag	nocostume
-pvp_n_3-3	mapflag	nocostume
-pvp_n_3-4	mapflag	nocostume
-pvp_n_3-5	mapflag	nocostume
-pvp_n_4-1	mapflag	nocostume
-pvp_n_4-2	mapflag	nocostume
-pvp_n_4-3	mapflag	nocostume
-pvp_n_4-4	mapflag	nocostume
-pvp_n_4-5	mapflag	nocostume
-pvp_n_5-1	mapflag	nocostume
-pvp_n_5-2	mapflag	nocostume
-pvp_n_5-3	mapflag	nocostume
-pvp_n_5-4	mapflag	nocostume
-pvp_n_5-5	mapflag	nocostume
-pvp_n_6-1	mapflag	nocostume
-pvp_n_6-2	mapflag	nocostume
-pvp_n_6-3	mapflag	nocostume
-pvp_n_6-4	mapflag	nocostume
-pvp_n_6-5	mapflag	nocostume
-pvp_n_7-1	mapflag	nocostume
-pvp_n_7-2	mapflag	nocostume
-pvp_n_7-3	mapflag	nocostume
-pvp_n_7-4	mapflag	nocostume
-pvp_n_7-5	mapflag	nocostume
-pvp_n_8-1	mapflag	nocostume
-pvp_n_8-2	mapflag	nocostume
-pvp_n_8-3	mapflag	nocostume
-pvp_n_8-4	mapflag	nocostume
-pvp_n_8-5	mapflag	nocostume
-pvp_2vs2	mapflag	nocostume
-turbo_e_4	mapflag	nocostume
-turbo_e_8	mapflag	nocostume
-turbo_e_16	mapflag	nocostume
--- a/npc/mapflag/nodynamicnpc.txt
+++ b/npc/mapflag/nodynamicnpc.txt
@@ -1,27 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: No dynamic NPC map setting.
-//===== Description: ========================================= 
-//= Blocks the use of dynamic NPCs on a map.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Lemongrass]
-//============================================================
-
-// Endless Tower
-1@tower	mapflag	nodynamicnpc
-2@tower	mapflag	nodynamicnpc
-3@tower	mapflag	nodynamicnpc
-4@tower	mapflag	nodynamicnpc
-5@tower	mapflag	nodynamicnpc
-6@tower	mapflag	nodynamicnpc
-
-// Sealed Catacomb
-1@cata	mapflag	nodynamicnpc
-2@cata	mapflag	nodynamicnpc
-
-// Orc's Memory
-1@orcs	mapflag	nodynamicnpc
-2@orcs	mapflag	nodynamicnpc
-
-// Nidhoggur's Nest
-1@nyd	mapflag	nodynamicnpc
-2@nyd	mapflag	nodynamicnpc
--- a/npc/mapflag/noicewall.txt
+++ b/npc/mapflag/noicewall.txt
@@ -1,149 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable Ice Wall.
-//===== Description: ========================================= 
-//= Blocks usage of WZ_ICEWALL.
-//===== Additional Comments: ================================= 
-//= 1.6a Re-enabled icewalls for cities [Lupus]
-//= 1.7 Officially icewall is allowed on interiors. [L0ne_w0lf]
-//= 1.8 Fixed arug_cas map names.
-//= 1.9 Renewal split. [Euphy]
-//============================================================
-
-//ayo_in01	mapflag	noicewall
-//ayo_in02	mapflag	noicewall
-//alberta_in	mapflag	noicewall
-//alberta	mapflag	noicewall
-//alde_alche	mapflag	noicewall
-//aldeba_in	mapflag	noicewall
-//aldebaran	mapflag	noicewall
-//ama_in01	mapflag	noicewall
-//ama_in02	mapflag	noicewall
-//amatsu	mapflag	noicewall
-//ayothaya	mapflag	noicewall
-//cmd_in01	mapflag	noicewall
-//cmd_in02	mapflag	noicewall
-//comodo	mapflag	noicewall
-//einbroch	mapflag	noicewall
-//einbech	mapflag	noicewall
-//gef_tower	mapflag	noicewall
-//geffen	mapflag	noicewall
-//geffen_in	mapflag	noicewall
-//gon_in	mapflag	noicewall
-//gonryun	mapflag	noicewall
-//in_hunter	mapflag	noicewall
-//in_moc_16	mapflag	noicewall
-//in_orcs01	mapflag	noicewall
-//izlude_in	mapflag	noicewall
-//izlude	mapflag	noicewall
-//hugel	mapflag	noicewall
-//jawaii	mapflag	noicewall
-//moc_castle	mapflag	noicewall
-//monk_in	mapflag	noicewall
-//morocc_in	mapflag	noicewall
-//morocc	mapflag	noicewall
-//mosk_in	mapflag	noicewall
-//payon_in01	mapflag	noicewall
-//payon_in02	mapflag	noicewall
-//payon_in03	mapflag	noicewall
-//payon	mapflag	noicewall
-//pay_arche	mapflag	noicewall
-//prt_are_in	mapflag	noicewall
-//prt_are01	mapflag	noicewall
-//prt_castle	mapflag	noicewall
-//prt_church	mapflag	noicewall
-//prt_in	mapflag	noicewall
-//prontera	mapflag	noicewall
-//sec_in01	mapflag	noicewall
-//job_sword1	mapflag	noicewall
-//um_in	mapflag	noicewall
-//umbala	mapflag	noicewall
-//xmas_in	mapflag	noicewall
-//xmas	mapflag	noicewall
-//yuno_in01	mapflag	noicewall
-//yuno_in02	mapflag	noicewall
-//yuno_in03	mapflag	noicewall
-//yuno_in04	mapflag	noicewall
-//yuno_in05	mapflag	noicewall
-//yuno	mapflag	noicewall
-//gon_test	mapflag	noicewall
-//nif_in	mapflag	noicewall
-//louyang	mapflag	noicewall
-//que_sign01	mapflag	noicewall
-//ein_in01	mapflag	noicewall
-//airport	mapflag	noicewall
-//airplane	mapflag	noicewall
-//airplane_01	mapflag	noicewall
-//lighthalzen	mapflag	noicewall
-//yuno_pre	mapflag	noicewall
-//y_airport	mapflag	noicewall
-//lhz_airport	mapflag	noicewall
-//lhz_in01	mapflag	noicewall
-//lhz_in02	mapflag	noicewall
-//lhz_in03	mapflag	noicewall
-//rachel	mapflag	noicewall
-//ra_in01	mapflag	noicewall
-//ra_temin	mapflag	noicewall
-//ra_temple	mapflag	noicewall
-//ra_temsky	mapflag	noicewall
-//que_rachel	mapflag	noicewall
-//auction_01	mapflag	noicewall
-//auction_02	mapflag	noicewall
-//hu_in01	mapflag	noicewall
-//kh_mansion	mapflag	noicewall
-//kh_rossi	mapflag	noicewall
-//kh_school	mapflag	noicewall
-//kh_vila	mapflag	noicewall
-//ve_in	mapflag	noicewall
-//ve_in02	mapflag	noicewall
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	noicewall
-aldeg_cas02	mapflag	noicewall
-aldeg_cas03	mapflag	noicewall
-aldeg_cas04	mapflag	noicewall
-aldeg_cas05	mapflag	noicewall
-gefg_cas01	mapflag	noicewall
-gefg_cas02	mapflag	noicewall
-gefg_cas03	mapflag	noicewall
-gefg_cas04	mapflag	noicewall
-gefg_cas05	mapflag	noicewall
-payg_cas01	mapflag	noicewall
-payg_cas02	mapflag	noicewall
-payg_cas03	mapflag	noicewall
-payg_cas04	mapflag	noicewall
-payg_cas05	mapflag	noicewall
-prtg_cas01	mapflag	noicewall
-prtg_cas02	mapflag	noicewall
-prtg_cas03	mapflag	noicewall
-prtg_cas04	mapflag	noicewall
-prtg_cas05	mapflag	noicewall
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	noicewall
-schg_cas02	mapflag	noicewall
-schg_cas03	mapflag	noicewall
-schg_cas04	mapflag	noicewall
-schg_cas05	mapflag	noicewall
-arug_cas01	mapflag	noicewall
-arug_cas02	mapflag	noicewall
-arug_cas03	mapflag	noicewall
-arug_cas04	mapflag	noicewall
-arug_cas05	mapflag	noicewall
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-nguild_alde	mapflag	noicewall
-nguild_gef	mapflag	noicewall
-nguild_pay	mapflag	noicewall
-nguild_prt	mapflag	noicewall
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	noicewall
-poring_w02	mapflag	noicewall
--- a/npc/mapflag/nomemo.txt
+++ b/npc/mapflag/nomemo.txt
@@ -1,763 +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
-
-//evt_zombie	mapflag	nomemo
-
-//============================================================
-// Bossnia (Custom) #!todo Verify
-//============================================================
-bossnia_01	mapflag	nomemo
-bossnia_02	mapflag	nomemo
-bossnia_03	mapflag	nomemo
-bossnia_04	mapflag	nomemo
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nomemo
-2009rwc_02	mapflag	nomemo
-2009rwc_03	mapflag	nomemo
-2009rwc_04	mapflag	nomemo
-2009rwc_05	mapflag	nomemo
-2009rwc_06	mapflag	nomemo
-2009rwc_07	mapflag	nomemo
-2009rwc_08	mapflag	nomemo
-2009rwc_f01	mapflag	nomemo
-2012rwc_01	mapflag	nomemo
-2012rwc_02	mapflag	nomemo
-2012rwc_03	mapflag	nomemo
-2012rwc_04	mapflag	nomemo
-2012rwc_05	mapflag	nomemo
-2012rwc_06	mapflag	nomemo
-2012rwc_07	mapflag	nomemo
-2012rwc_08	mapflag	nomemo
--- a/npc/mapflag/nopenalty.txt
+++ b/npc/mapflag/nopenalty.txt
@@ -1,321 +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
-comodo	mapflag	nopenalty
-cmd_in01	mapflag	nopenalty
-cmd_in02	mapflag	nopenalty
-geffen	mapflag	nopenalty
-gef_dun03	mapflag	nopenalty
-gef_tower	mapflag	nopenalty
-geffen_in	mapflag	nopenalty
-gonryun	mapflag	nopenalty
-gon_in	mapflag	nopenalty
-gon_test	mapflag	nopenalty
-hugel	mapflag	nopenalty
-in_orcs01	mapflag	nopenalty
-izlude	mapflag	nopenalty
-izlude_in	mapflag	nopenalty
-jawaii	mapflag	nopenalty
-jawaii_in	mapflag	nopenalty
-lighthalzen	mapflag	nopenalty
-louyang	mapflag	nopenalty
-lou_in01	mapflag	nopenalty
-lou_in02	mapflag	nopenalty
-morocc	mapflag	nopenalty
-moc_castle	mapflag	nopenalty
-morocc_in	mapflag	nopenalty
-nif_in	mapflag	nopenalty
-pay_arche	mapflag	nopenalty
-payon	mapflag	nopenalty
-payon_in01	mapflag	nopenalty
-payon_in02	mapflag	nopenalty
-payon_in03	mapflag	nopenalty
-prontera	mapflag	nopenalty
-prt_are_in	mapflag	nopenalty
-prt_are01	mapflag	nopenalty
-prt_castle	mapflag	nopenalty
-prt_church	mapflag	nopenalty
-prt_in	mapflag	nopenalty
-umbala	mapflag	nopenalty
-um_in	mapflag	nopenalty
-xmas	mapflag	nopenalty
-xmas_in	mapflag	nopenalty
-yuno	mapflag	nopenalty
-yuno_in01	mapflag	nopenalty
-yuno_in02	mapflag	nopenalty
-yuno_in03	mapflag	nopenalty
-yuno_in04	mapflag	nopenalty
-yuno_in05	mapflag	nopenalty
-yuno_pre	mapflag	nopenalty
-lhz_in01	mapflag	nopenalty
-lhz_in02	mapflag	nopenalty
-lhz_in03	mapflag	nopenalty
-rachel	mapflag	nopenalty
-ra_in01	mapflag	nopenalty
-ra_temin	mapflag	nopenalty
-ra_temple	mapflag	nopenalty
-ra_temsky	mapflag	nopenalty
-que_rachel	mapflag	nopenalty
-einbech	mapflag	nopenalty
-einbroch	mapflag	nopenalty
-ein_in01	mapflag	nopenalty
-job_soul	mapflag	nopenalty
-job_star	mapflag	nopenalty
-auction_01	mapflag	nopenalty
-auction_02	mapflag	nopenalty
-hu_in01	mapflag	nopenalty
-kh_mansion	mapflag	nopenalty
-kh_rossi	mapflag	nopenalty
-kh_school	mapflag	nopenalty
-kh_vila	mapflag	nopenalty
-kh_kiehl01	mapflag	nopenalty
-kh_kiehl02	mapflag	nopenalty
-ayothaya	mapflag	nopenalty
-veins	mapflag	nopenalty
-ve_in	mapflag	nopenalty
-ve_in02	mapflag	nopenalty
-thor_camp	mapflag	nopenalty
-moc_para01	mapflag	nopenalty
-mid_camp	mapflag	nopenalty
-mid_campin	mapflag	nopenalty
-moc_fild22b	mapflag	nopenalty
-manuk	mapflag	nopenalty
-man_in01	mapflag	nopenalty
-splendide	mapflag	nopenalty
-spl_in01	mapflag	nopenalty
-spl_in02	mapflag	nopenalty
-
-//============================================================
-// Airport
-//============================================================
-airport	mapflag	nopenalty
-airplane	mapflag	nopenalty
-y_airport	mapflag	nopenalty
-lhz_airport	mapflag	nopenalty
-
-
-//============================================================
-// Novice Starter Zone
-//============================================================
-new_zone01	mapflag	nopenalty
-new_zone02	mapflag	nopenalty
-new_zone03	mapflag	nopenalty
-new_zone04	mapflag	nopenalty
-new_1-1	mapflag	nopenalty
-new_1-2	mapflag	nopenalty
-new_1-3	mapflag	nopenalty
-new_1-4	mapflag	nopenalty
-new_2-1	mapflag	nopenalty
-new_2-2	mapflag	nopenalty
-new_2-3	mapflag	nopenalty
-new_2-4	mapflag	nopenalty
-new_3-1	mapflag	nopenalty
-new_3-2	mapflag	nopenalty
-new_3-3	mapflag	nopenalty
-new_3-4	mapflag	nopenalty
-new_4-1	mapflag	nopenalty
-new_4-2	mapflag	nopenalty
-new_4-3	mapflag	nopenalty
-new_4-4	mapflag	nopenalty
-new_5-1	mapflag	nopenalty
-new_5-2	mapflag	nopenalty
-new_5-3	mapflag	nopenalty
-new_5-4	mapflag	nopenalty
-
-//============================================================
-// Job Quests
-//============================================================
-job_sword1	mapflag	nopenalty
-job_thief1	mapflag	nopenalty
-// 2-1 Classes
-job_prist	mapflag	nopenalty
-job_wiz	mapflag	nopenalty
-job_hunte	mapflag	nopenalty
-in_hunter	mapflag	nopenalty
-in_moc_16	mapflag	nopenalty
-// 2-2 Classes
-alde_alche	mapflag	nopenalty
-job_cru	mapflag	nopenalty
-job_duncer	mapflag	nopenalty
-job_monk	mapflag	nopenalty
-monk_test	mapflag	nopenalty
-monk_in	mapflag	nopenalty
-in_rogue	mapflag	nopenalty
-job_sage	mapflag	nopenalty
-
-//============================================================
-// Quest Places
-//============================================================
-mosk_ship	mapflag	nopenalty
-que_sign01	mapflag	nopenalty
-que_sign02	mapflag	nopenalty
-que_ng	mapflag	nopenalty
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	nopenalty
-guild_vs2	mapflag	nopenalty
-guild_vs3	mapflag	nopenalty
-guild_vs4	mapflag	nopenalty
-guild_vs5	mapflag	nopenalty
-
-//============================================================
-// Arenas
-//============================================================
-sec_in01	mapflag	nopenalty
-sec_in02	mapflag	nopenalty
-// Izlude Battle Arena
-force_1-1	mapflag	nopenalty
-force_1-2	mapflag	nopenalty
-force_1-3	mapflag	nopenalty
-force_2-1	mapflag	nopenalty
-force_2-2	mapflag	nopenalty
-force_2-3	mapflag	nopenalty
-force_3-1	mapflag	nopenalty
-force_3-2	mapflag	nopenalty
-force_3-3	mapflag	nopenalty
-
-//============================================================
-// PvP Arenas
-//============================================================
-pvp_y_1-1	mapflag	nopenalty
-pvp_y_1-2	mapflag	nopenalty
-pvp_y_1-3	mapflag	nopenalty
-pvp_y_1-4	mapflag	nopenalty
-pvp_y_1-5	mapflag	nopenalty
-pvp_y_2-1	mapflag	nopenalty
-pvp_y_2-2	mapflag	nopenalty
-pvp_y_2-3	mapflag	nopenalty
-pvp_y_2-4	mapflag	nopenalty
-pvp_y_2-5	mapflag	nopenalty
-pvp_y_3-1	mapflag	nopenalty
-pvp_y_3-2	mapflag	nopenalty
-pvp_y_3-3	mapflag	nopenalty
-pvp_y_3-4	mapflag	nopenalty
-pvp_y_3-5	mapflag	nopenalty
-pvp_y_4-1	mapflag	nopenalty
-pvp_y_4-2	mapflag	nopenalty
-pvp_y_4-3	mapflag	nopenalty
-pvp_y_4-4	mapflag	nopenalty
-pvp_y_4-5	mapflag	nopenalty
-pvp_y_5-1	mapflag	nopenalty
-pvp_y_5-2	mapflag	nopenalty
-pvp_y_5-3	mapflag	nopenalty
-pvp_y_5-4	mapflag	nopenalty
-pvp_y_5-5	mapflag	nopenalty
-pvp_y_6-1	mapflag	nopenalty
-pvp_y_6-2	mapflag	nopenalty
-pvp_y_6-3	mapflag	nopenalty
-pvp_y_6-4	mapflag	nopenalty
-pvp_y_6-5	mapflag	nopenalty
-pvp_y_7-1	mapflag	nopenalty
-pvp_y_7-2	mapflag	nopenalty
-pvp_y_7-3	mapflag	nopenalty
-pvp_y_7-4	mapflag	nopenalty
-pvp_y_7-5	mapflag	nopenalty
-pvp_y_8-1	mapflag	nopenalty
-pvp_y_8-2	mapflag	nopenalty
-pvp_y_8-3	mapflag	nopenalty
-pvp_y_8-4	mapflag	nopenalty
-pvp_y_8-5	mapflag	nopenalty
-pvp_2vs2	mapflag	nopenalty
-
-//============================================================
-// Aldebaran Turbo Track
-//============================================================
-turbo_room	mapflag	nopenalty
-turbo_n_1	mapflag	nopenalty
-turbo_n_4	mapflag	nopenalty
-turbo_n_8	mapflag	nopenalty
-turbo_n_16	mapflag	nopenalty
-turbo_e_4	mapflag	nopenalty
-turbo_e_8	mapflag	nopenalty
-turbo_e_16	mapflag	nopenalty
-
-//============================================================
-// Monster Races
-//============================================================
-p_track01	mapflag	nopenalty
-p_track02	mapflag	nopenalty
-
-//============================================================
-// Poring War
-//============================================================
-poring_w02	mapflag	nopenalty
-
-//============================================================
-// Vision of Okolnir
-//============================================================
-que_qsch01	mapflag	nopenalty
-que_qsch02	mapflag	nopenalty
-que_qsch03	mapflag	nopenalty
-que_qsch04	mapflag	nopenalty
-que_qsch05	mapflag	nopenalty
-que_qaru01	mapflag	nopenalty
-que_qaru02	mapflag	nopenalty
-que_qaru03	mapflag	nopenalty
-que_qaru04	mapflag	nopenalty
-que_qaru05	mapflag	nopenalty
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_c01	mapflag	nopenalty
-bat_c02	mapflag	nopenalty
-bat_c03	mapflag	nopenalty
-bat_room	mapflag	nopenalty
-bat_b01	mapflag	nopenalty
-bat_b02	mapflag	nopenalty
-bat_a01	mapflag	nopenalty
-bat_a02	mapflag	nopenalty
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nopenalty
-2009rwc_02	mapflag	nopenalty
-2009rwc_03	mapflag	nopenalty
-2009rwc_04	mapflag	nopenalty
-2009rwc_05	mapflag	nopenalty
-2009rwc_06	mapflag	nopenalty
-2009rwc_07	mapflag	nopenalty
-2009rwc_08	mapflag	nopenalty
-2009rwc_f01	mapflag	nopenalty
-2012rwc_01	mapflag	nopenalty
-2012rwc_02	mapflag	nopenalty
-2012rwc_03	mapflag	nopenalty
-2012rwc_04	mapflag	nopenalty
-2012rwc_05	mapflag	nopenalty
-2012rwc_06	mapflag	nopenalty
-2012rwc_07	mapflag	nopenalty
-2012rwc_08	mapflag	nopenalty
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	nopenalty
--- a/npc/mapflag/nopvp.txt
+++ b/npc/mapflag/nopvp.txt
@@ -1,149 +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
-cmd_in01	mapflag	pvp	off
-cmd_in02	mapflag	pvp	off
-comodo	mapflag	pvp	off
-gef_tower	mapflag	pvp	off
-geffen	mapflag	pvp	off
-geffen_in	mapflag	pvp	off
-gon_in	mapflag	pvp	off
-gonryun	mapflag	pvp	off
-gon_test	mapflag	pvp	off
-in_hunter	mapflag	pvp	off
-in_moc_16	mapflag	pvp	off
-in_orcs01	mapflag	pvp	off
-izlude_in	mapflag	pvp	off
-izlude	mapflag	pvp	off
-hugel	mapflag	pvp	off
-hu_in01	mapflag	pvp	off
-lighthalzen	mapflag	pvp	off
-lhz_airport	mapflag	pvp	off
-lhz_in01	mapflag	pvp	off
-lhz_in02	mapflag	pvp	off
-lhz_in03	mapflag	pvp	off
-louyang	mapflag	pvp	off
-lou_in01	mapflag	pvp	off
-lou_in02	mapflag	pvp	off
-moc_castle	mapflag	pvp	off
-monk_in	mapflag	pvp	off
-morocc_in	mapflag	pvp	off
-morocc	mapflag	pvp	off
-mosk_in	mapflag	pvp	off
-nif_in	mapflag	pvp	off
-payon_in01	mapflag	pvp	off
-payon_in02	mapflag	pvp	off
-payon_in03	mapflag	pvp	off
-payon	mapflag	pvp	off
-pay_arche	mapflag	pvp	off
-prt_are_in	mapflag	pvp	off
-prt_are01	mapflag	pvp	off
-prt_castle	mapflag	pvp	off
-prt_church	mapflag	pvp	off
-prt_in	mapflag	pvp	off
-prontera	mapflag	pvp	off
-sec_in01	mapflag	pvp	off
-job_sword1	mapflag	pvp	off
-um_in	mapflag	pvp	off
-umbala	mapflag	pvp	off
-xmas_in	mapflag	pvp	off
-xmas	mapflag	pvp	off
-yuno_in01	mapflag	pvp	off
-yuno_in03	mapflag	pvp	off
-yuno_in04	mapflag	pvp	off
-yuno_in05	mapflag	pvp	off
-yuno	mapflag	pvp	off
-yuno_pre	mapflag	pvp	off
-y_airport	mapflag	pvp	off
-rachel	mapflag	pvp	off
-ra_in01	mapflag	pvp	off
-ra_temin	mapflag	pvp	off
-airplane	mapflag	pvp	off
-airport	mapflag	pvp	off
-einbech	mapflag	pvp	off
-einbroch	mapflag	pvp	off
-ein_in01	mapflag	pvp	off
-ayothaya	mapflag	pvp	off
-veins	mapflag	pvp	off
-ve_in	mapflag	pvp	off
-ve_in02	mapflag	pvp	off
-cave	mapflag	pvp	off
-
-e_tower	mapflag	pvp	off
-
-mid_camp	mapflag	pvp	off
-mid_campin	mapflag	pvp	off
-man_fild01	mapflag	pvp	off
-moc_fild22b	mapflag	pvp	off
-que_dan01	mapflag	pvp	off
-que_dan02	mapflag	pvp	off
-schg_que01	mapflag	pvp	off
-arug_que01	mapflag	pvp	off
-
-manuk	mapflag	pvp	off
-man_in01	mapflag	pvp	off
-splendide	mapflag	pvp	off
-spl_in01	mapflag	pvp	off
-spl_in02	mapflag	pvp	off
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	pvp	off
--- a/npc/mapflag/noreturn.txt
+++ b/npc/mapflag/noreturn.txt
@@ -1,263 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable return warp.
-//===== Description: ========================================= 
-//= Disables the following items:
-//=   Butterfly Wing (602), Siege Teleport Scroll (14591),
-//=   Yellow/Green/Red/Blue Butterfly Wings (14582-14585),
-//=   Dungeon Teleport Scrolls (14527/14581)
-//= Also restricts "warpparty" and "warpguild" script commands.
-//===== Additional Comments: ================================= 
-//= 1.3 According to the patch, enabled Butterfly wings in the Castles. [Lupus]
-//= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]
-//= 1.4a Added job_knt. [Samuray22]
-//= 1.5 Commented out new_zone entries. [L0ne_W0lf]
-//= 1.6 Enabled B. wings on all maps but que_hugel. [L0ne_W0lf]
-//============================================================
-
-//============================================================
-// Municipality (Cities/Towns/Villages)
-//============================================================
-//ayo_in01	mapflag	noreturn
-//ayo_in02	mapflag	noreturn
-//alb_ship	mapflag	noreturn
-//alberta_in	mapflag	noreturn
-//aldeba_in	mapflag	noreturn
-//ama_in01	mapflag	noreturn
-//ama_in02	mapflag	noreturn
-//ama_test	mapflag	noreturn
-//cmd_in01	mapflag	noreturn
-//cmd_in02	mapflag	noreturn
-//gef_tower	mapflag	noreturn
-//geffen_in	mapflag	noreturn
-//gon_test	mapflag	noreturn
-//gon_in	mapflag	noreturn
-//in_orcs01	mapflag	noreturn
-//izlude_in	mapflag	noreturn
-//hu_in01	mapflag	noreturn
-//jawaii_in	mapflag	noreturn
-//lou_in01	mapflag	noreturn
-//lou_in02	mapflag	noreturn
-//moc_castle	mapflag	noreturn
-//morocc_in	mapflag	noreturn
-//mosk_in	mapflag	noreturn
-//new_zone01	mapflag	noreturn
-//new_zone02	mapflag	noreturn
-//new_zone03	mapflag	noreturn
-//new_zone04	mapflag	noreturn
-//nif_in	mapflag	noreturn
-//payon_in01	mapflag	noreturn
-//payon_in02	mapflag	noreturn
-//payon_in03	mapflag	noreturn
-//prt_are_in	mapflag	noreturn
-//prt_are01	mapflag	noreturn
-//prt_castle	mapflag	noreturn
-//prt_church	mapflag	noreturn
-//prt_in	mapflag	noreturn
-//um_in	mapflag	noreturn
-//xmas_in	mapflag	noreturn
-//yuno_in01	mapflag	noreturn
-//yuno_in03	mapflag	noreturn
-//yuno_in04	mapflag	noreturn
-//yuno_in05	mapflag	noreturn
-//que_sign01	mapflag	noreturn
-//ein_in01	mapflag	noreturn
-//airport	mapflag	noreturn
-//airplane	mapflag	noreturn
-//airplane_01	mapflag	noreturn
-//yuno_pre	mapflag	noreturn
-//y_airport	mapflag	noreturn
-//lhz_airport	mapflag	noreturn
-//lhz_in01	mapflag	noreturn
-//lhz_in02	mapflag	noreturn
-//lhz_in03	mapflag	noreturn
-//lhz_que01	mapflag	noreturn
-//kh_mansion	mapflag	noreturn
-//kh_rossi	mapflag	noreturn
-//kh_school	mapflag	noreturn
-//kh_vila	mapflag	noreturn
-//ra_in01	mapflag	noreturn
-//ra_temin	mapflag	noreturn
-//ve_in	mapflag	noreturn
-//ve_in02	mapflag	noreturn
-
-//============================================================
-// Job Quests
-//============================================================
-//job_sword1	mapflag	noreturn
-//job_thief1	mapflag	noreturn
-// 2-1 Classes
-//job_knt	mapflag	noreturn
-//job_hunte	mapflag	noreturn
-//job_prist	mapflag	noreturn
-//job_wiz	mapflag	noreturn
-//in_hunter	mapflag	noreturn
-//in_moc_16	mapflag	noreturn
-// 2-2 Classes
-//alde_alche	mapflag	noreturn
-//job_cru	mapflag	noreturn
-//job_duncer	mapflag	noreturn
-//job_monk	mapflag	noreturn
-//monk_test	mapflag	noreturn
-//monk_in	mapflag	noreturn
-//in_rogue	mapflag	noreturn
-//job_sage	mapflag	noreturn
-//que_ng	mapflag	noreturn
-
-//============================================================
-// Quest Places
-//============================================================
-//que_god01	mapflag	noreturn
-//que_god02	mapflag	noreturn
-//que_bingo	mapflag	noreturn
-que_hugel	mapflag	noreturn
-//que_thor	mapflag	noreturn
-//poring_c01	mapflag	noreturn
-//poring_c02	mapflag	noreturn
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-//= 1.3 According to the kRO patch, enabled Butterfly wings in the Castles
-//aldeg_cas01	mapflag	noreturn
-//aldeg_cas02	mapflag	noreturn
-//aldeg_cas03	mapflag	noreturn
-//aldeg_cas04	mapflag	noreturn
-//aldeg_cas05	mapflag	noreturn
-//gefg_cas01	mapflag	noreturn
-//gefg_cas02	mapflag	noreturn
-//gefg_cas03	mapflag	noreturn
-//gefg_cas04	mapflag	noreturn
-//gefg_cas05	mapflag	noreturn
-//payg_cas01	mapflag	noreturn
-//payg_cas02	mapflag	noreturn
-//payg_cas03	mapflag	noreturn
-//payg_cas04	mapflag	noreturn
-//payg_cas05	mapflag	noreturn
-//prtg_cas01	mapflag	noreturn
-//prtg_cas02	mapflag	noreturn
-//prtg_cas03	mapflag	noreturn
-//prtg_cas04	mapflag	noreturn
-//prtg_cas05	mapflag	noreturn
-//nguild_alde	mapflag	noreturn
-//nguild_gef	mapflag	noreturn
-//nguild_pay	mapflag	noreturn
-//nguild_prt	mapflag	noreturn
-
-//============================================================
-// GvG Arenas
-//============================================================
-//guild_vs1	mapflag	noreturn
-//guild_vs2	mapflag	noreturn
-//guild_vs3	mapflag	noreturn
-//guild_vs4	mapflag	noreturn
-//guild_vs5	mapflag	noreturn
-
-//============================================================
-// Arenas
-//============================================================
-//arena_room	mapflag	noreturn
-//sec_in01	mapflag	noreturn
-//sec_in02	mapflag	noreturn
-
-//============================================================
-// PvP Arenas
-//============================================================
-//pvp_y_room	mapflag	noreturn
-//pvp_y_1-1	mapflag	noreturn
-//pvp_y_1-2	mapflag	noreturn
-//pvp_y_1-3	mapflag	noreturn
-//pvp_y_1-4	mapflag	noreturn
-//pvp_y_1-5	mapflag	noreturn
-//pvp_y_2-1	mapflag	noreturn
-//pvp_y_2-2	mapflag	noreturn
-//pvp_y_2-3	mapflag	noreturn
-//pvp_y_2-4	mapflag	noreturn
-//pvp_y_2-5	mapflag	noreturn
-//pvp_y_3-1	mapflag	noreturn
-//pvp_y_3-2	mapflag	noreturn
-//pvp_y_3-3	mapflag	noreturn
-//pvp_y_3-4	mapflag	noreturn
-//pvp_y_3-5	mapflag	noreturn
-//pvp_y_4-1	mapflag	noreturn
-//pvp_y_4-2	mapflag	noreturn
-//pvp_y_4-3	mapflag	noreturn
-//pvp_y_4-4	mapflag	noreturn
-//pvp_y_4-5	mapflag	noreturn
-//pvp_y_5-1	mapflag	noreturn
-//pvp_y_5-2	mapflag	noreturn
-//pvp_y_5-3	mapflag	noreturn
-//pvp_y_5-4	mapflag	noreturn
-//pvp_y_5-5	mapflag	noreturn
-//pvp_y_6-1	mapflag	noreturn
-//pvp_y_6-2	mapflag	noreturn
-//pvp_y_6-3	mapflag	noreturn
-//pvp_y_6-4	mapflag	noreturn
-//pvp_y_6-5	mapflag	noreturn
-//pvp_y_7-1	mapflag	noreturn
-//pvp_y_7-2	mapflag	noreturn
-//pvp_y_7-3	mapflag	noreturn
-//pvp_y_7-4	mapflag	noreturn
-//pvp_y_7-5	mapflag	noreturn
-//pvp_y_8-1	mapflag	noreturn
-//pvp_y_8-2	mapflag	noreturn
-//pvp_y_8-3	mapflag	noreturn
-//pvp_y_8-4	mapflag	noreturn
-//pvp_y_8-5	mapflag	noreturn
-//pvp_n_room	mapflag	noreturn
-//pvp_n_1-1	mapflag	noreturn
-//pvp_n_1-2	mapflag	noreturn
-//pvp_n_1-3	mapflag	noreturn
-//pvp_n_1-4	mapflag	noreturn
-//pvp_n_1-5	mapflag	noreturn
-//pvp_n_2-1	mapflag	noreturn
-//pvp_n_2-2	mapflag	noreturn
-//pvp_n_2-3	mapflag	noreturn
-//pvp_n_2-4	mapflag	noreturn
-//pvp_n_2-5	mapflag	noreturn
-//pvp_n_3-1	mapflag	noreturn
-//pvp_n_3-2	mapflag	noreturn
-//pvp_n_3-3	mapflag	noreturn
-//pvp_n_3-4	mapflag	noreturn
-//pvp_n_3-5	mapflag	noreturn
-//pvp_n_4-1	mapflag	noreturn
-//pvp_n_4-2	mapflag	noreturn
-//pvp_n_4-3	mapflag	noreturn
-//pvp_n_4-4	mapflag	noreturn
-//pvp_n_4-5	mapflag	noreturn
-//pvp_n_5-1	mapflag	noreturn
-//pvp_n_5-2	mapflag	noreturn
-//pvp_n_5-3	mapflag	noreturn
-//pvp_n_5-4	mapflag	noreturn
-//pvp_n_5-5	mapflag	noreturn
-//pvp_n_6-1	mapflag	noreturn
-//pvp_n_6-2	mapflag	noreturn
-//pvp_n_6-3	mapflag	noreturn
-//pvp_n_6-4	mapflag	noreturn
-//pvp_n_6-5	mapflag	noreturn
-//pvp_n_7-1	mapflag	noreturn
-//pvp_n_7-2	mapflag	noreturn
-//pvp_n_7-3	mapflag	noreturn
-//pvp_n_7-4	mapflag	noreturn
-//pvp_n_7-5	mapflag	noreturn
-//pvp_n_8-1	mapflag	noreturn
-//pvp_n_8-2	mapflag	noreturn
-//pvp_n_8-3	mapflag	noreturn
-//pvp_n_8-4	mapflag	noreturn
-//pvp_n_8-5	mapflag	noreturn
-//pvp_2vs2	mapflag	noreturn
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_c01	mapflag	noreturn
-bat_c02	mapflag	noreturn
-bat_c03	mapflag	noreturn
-bat_b01	mapflag	noreturn
-bat_b02	mapflag	noreturn
-bat_a01	mapflag	noreturn
-bat_a02	mapflag	noreturn
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	noreturn
--- a/npc/mapflag/nosave.txt
+++ b/npc/mapflag/nosave.txt
@@ -1,319 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable auto-save.
-//===== Description: ========================================= 
-//= Characters logging out on the specified map will be warped
-//= to the map specified in the last field, or "SavePoint".
-//===== Additional Comments: ================================= 
-//= 1.7 Updated. [Lupus]
-//= 1.8 Updated. [L0ne_W0lf]
-//= 1.9 Renewal split. [Euphy]
-//= 2.0 Moved instances to pre-renewal. [Lemongrass]
-//============================================================
-
-//============================================================
-// Job Quests
-//============================================================
-job_sword1	mapflag	nosave	SavePoint
-//job_thief1	mapflag	nosave	SavePoint
-// 2-1 Classes
-job_knt	mapflag	nosave	SavePoint
-job_prist	mapflag	nosave	SavePoint
-job_wiz	mapflag	nosave	SavePoint
-in_moc_16	mapflag	nosave	SavePoint
-job_hunte	mapflag	nosave	SavePoint
-//in_hunter	mapflag	nosave	SavePoint
-// 2-2 Classes
-alde_alche	mapflag	nosave	SavePoint
-job_cru	mapflag	nosave	SavePoint
-job_duncer	mapflag	nosave	SavePoint
-job_monk	mapflag	nosave	SavePoint
-monk_test	mapflag	nosave	SavePoint
-in_rogue	mapflag	nosave	SavePoint
-job_sage	mapflag	nosave	SavePoint
-// Expanded Classes
-job_star	mapflag	nosave	SavePoint
-job_soul	mapflag	nosave	SavePoint
-
-//============================================================
-// Quest Places
-//============================================================
-ama_test	mapflag	nosave	SavePoint
-gef_dun03	mapflag	nosave	SavePoint
-que_ba	mapflag	nosave	SavePoint
-que_god01	mapflag	nosave	SavePoint
-que_god02	mapflag	nosave	SavePoint
-que_sign01	mapflag	nosave	SavePoint
-que_sign02	mapflag	nosave	SavePoint
-que_thor	mapflag	nosave	SavePoint
-que_ng	mapflag	nosave	SavePoint
-gon_test	mapflag	nosave	SavePoint
-kh_kiehl01	mapflag	nosave	SavePoint
-kh_kiehl02	mapflag	nosave	SavePoint
-que_bingo	mapflag	nosave	SavePoint
-
-//============================================================
-// GvG Arenas
-//============================================================
-guild_vs1	mapflag	nosave	SavePoint
-guild_vs2	mapflag	nosave	SavePoint
-guild_vs3	mapflag	nosave	SavePoint
-guild_vs4	mapflag	nosave	SavePoint
-guild_vs5	mapflag	nosave	SavePoint
-
-//============================================================
-// Arenas
-//============================================================
-force_1-1	mapflag	nosave	SavePoint
-force_1-2	mapflag	nosave	SavePoint
-force_1-3	mapflag	nosave	SavePoint
-force_2-1	mapflag	nosave	SavePoint
-force_2-2	mapflag	nosave	SavePoint
-force_2-3	mapflag	nosave	SavePoint
-force_3-1	mapflag	nosave	SavePoint
-force_3-2	mapflag	nosave	SavePoint
-force_3-3	mapflag	nosave	SavePoint
-force_4-1	mapflag	nosave	SavePoint
-force_5-1	mapflag	nosave	SavePoint
-prt_are_in	mapflag	nosave	SavePoint
-
-//============================================================
-// Juperos
-//============================================================
-jupe_area1	mapflag	nosave	SavePoint
-jupe_area2	mapflag	nosave	SavePoint
-jupe_ele	mapflag	nosave	SavePoint
-jupe_ele_r	mapflag	nosave	SavePoint
-jupe_gate	mapflag	nosave	SavePoint
-
-//============================================================
-// PvP Arenas
-//============================================================
-pvp_y_room	mapflag	nosave	SavePoint
-pvp_y_1-1	mapflag	nosave	SavePoint
-pvp_y_1-2	mapflag	nosave	SavePoint
-pvp_y_1-3	mapflag	nosave	SavePoint
-pvp_y_1-4	mapflag	nosave	SavePoint
-pvp_y_1-5	mapflag	nosave	SavePoint
-pvp_y_2-1	mapflag	nosave	SavePoint
-pvp_y_2-2	mapflag	nosave	SavePoint
-pvp_y_2-3	mapflag	nosave	SavePoint
-pvp_y_2-4	mapflag	nosave	SavePoint
-pvp_y_2-5	mapflag	nosave	SavePoint
-pvp_y_3-1	mapflag	nosave	SavePoint
-pvp_y_3-2	mapflag	nosave	SavePoint
-pvp_y_3-3	mapflag	nosave	SavePoint
-pvp_y_3-4	mapflag	nosave	SavePoint
-pvp_y_3-5	mapflag	nosave	SavePoint
-pvp_y_4-1	mapflag	nosave	SavePoint
-pvp_y_4-2	mapflag	nosave	SavePoint
-pvp_y_4-3	mapflag	nosave	SavePoint
-pvp_y_4-4	mapflag	nosave	SavePoint
-pvp_y_4-5	mapflag	nosave	SavePoint
-pvp_y_5-1	mapflag	nosave	SavePoint
-pvp_y_5-2	mapflag	nosave	SavePoint
-pvp_y_5-3	mapflag	nosave	SavePoint
-pvp_y_5-4	mapflag	nosave	SavePoint
-pvp_y_5-5	mapflag	nosave	SavePoint
-pvp_y_6-1	mapflag	nosave	SavePoint
-pvp_y_6-2	mapflag	nosave	SavePoint
-pvp_y_6-3	mapflag	nosave	SavePoint
-pvp_y_6-4	mapflag	nosave	SavePoint
-pvp_y_6-5	mapflag	nosave	SavePoint
-pvp_y_7-1	mapflag	nosave	SavePoint
-pvp_y_7-2	mapflag	nosave	SavePoint
-pvp_y_7-3	mapflag	nosave	SavePoint
-pvp_y_7-4	mapflag	nosave	SavePoint
-pvp_y_7-5	mapflag	nosave	SavePoint
-pvp_y_8-1	mapflag	nosave	SavePoint
-pvp_y_8-2	mapflag	nosave	SavePoint
-pvp_y_8-3	mapflag	nosave	SavePoint
-pvp_y_8-4	mapflag	nosave	SavePoint
-pvp_y_8-5	mapflag	nosave	SavePoint
-pvp_n_room	mapflag	nosave	SavePoint
-pvp_n_1-1	mapflag	nosave	SavePoint
-pvp_n_1-2	mapflag	nosave	SavePoint
-pvp_n_1-3	mapflag	nosave	SavePoint
-pvp_n_1-4	mapflag	nosave	SavePoint
-pvp_n_1-5	mapflag	nosave	SavePoint
-pvp_n_2-1	mapflag	nosave	SavePoint
-pvp_n_2-2	mapflag	nosave	SavePoint
-pvp_n_2-3	mapflag	nosave	SavePoint
-pvp_n_2-4	mapflag	nosave	SavePoint
-pvp_n_2-5	mapflag	nosave	SavePoint
-pvp_n_3-1	mapflag	nosave	SavePoint
-pvp_n_3-2	mapflag	nosave	SavePoint
-pvp_n_3-3	mapflag	nosave	SavePoint
-pvp_n_3-4	mapflag	nosave	SavePoint
-pvp_n_3-5	mapflag	nosave	SavePoint
-pvp_n_4-1	mapflag	nosave	SavePoint
-pvp_n_4-2	mapflag	nosave	SavePoint
-pvp_n_4-3	mapflag	nosave	SavePoint
-pvp_n_4-4	mapflag	nosave	SavePoint
-pvp_n_4-5	mapflag	nosave	SavePoint
-pvp_n_5-1	mapflag	nosave	SavePoint
-pvp_n_5-2	mapflag	nosave	SavePoint
-pvp_n_5-3	mapflag	nosave	SavePoint
-pvp_n_5-4	mapflag	nosave	SavePoint
-pvp_n_5-5	mapflag	nosave	SavePoint
-pvp_n_6-1	mapflag	nosave	SavePoint
-pvp_n_6-2	mapflag	nosave	SavePoint
-pvp_n_6-3	mapflag	nosave	SavePoint
-pvp_n_6-4	mapflag	nosave	SavePoint
-pvp_n_6-5	mapflag	nosave	SavePoint
-pvp_n_7-1	mapflag	nosave	SavePoint
-pvp_n_7-2	mapflag	nosave	SavePoint
-pvp_n_7-3	mapflag	nosave	SavePoint
-pvp_n_7-4	mapflag	nosave	SavePoint
-pvp_n_7-5	mapflag	nosave	SavePoint
-pvp_n_8-1	mapflag	nosave	SavePoint
-pvp_n_8-2	mapflag	nosave	SavePoint
-pvp_n_8-3	mapflag	nosave	SavePoint
-pvp_n_8-4	mapflag	nosave	SavePoint
-pvp_n_8-5	mapflag	nosave	SavePoint
-pvp_2vs2	mapflag	nosave	SavePoint
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	nosave	SavePoint
-aldeg_cas02	mapflag	nosave	SavePoint
-aldeg_cas03	mapflag	nosave	SavePoint
-aldeg_cas04	mapflag	nosave	SavePoint
-aldeg_cas05	mapflag	nosave	SavePoint
-gefg_cas01	mapflag	nosave	SavePoint
-gefg_cas02	mapflag	nosave	SavePoint
-gefg_cas03	mapflag	nosave	SavePoint
-gefg_cas04	mapflag	nosave	SavePoint
-gefg_cas05	mapflag	nosave	SavePoint
-payg_cas01	mapflag	nosave	SavePoint
-payg_cas02	mapflag	nosave	SavePoint
-payg_cas03	mapflag	nosave	SavePoint
-payg_cas04	mapflag	nosave	SavePoint
-payg_cas05	mapflag	nosave	SavePoint
-prtg_cas01	mapflag	nosave	SavePoint
-prtg_cas02	mapflag	nosave	SavePoint
-prtg_cas03	mapflag	nosave	SavePoint
-prtg_cas04	mapflag	nosave	SavePoint
-prtg_cas05	mapflag	nosave	SavePoint
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	nosave	SavePoint
-schg_cas02	mapflag	nosave	SavePoint
-schg_cas03	mapflag	nosave	SavePoint
-schg_cas04	mapflag	nosave	SavePoint
-schg_cas05	mapflag	nosave	SavePoint
-arug_cas01	mapflag	nosave	SavePoint
-arug_cas02	mapflag	nosave	SavePoint
-arug_cas03	mapflag	nosave	SavePoint
-arug_cas04	mapflag	nosave	SavePoint
-arug_cas05	mapflag	nosave	SavePoint
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-nguild_alde	mapflag	nosave	SavePoint
-nguild_gef	mapflag	nosave	SavePoint
-nguild_pay	mapflag	nosave	SavePoint
-nguild_prt	mapflag	nosave	SavePoint
-
-//============================================================
-// Guild Dungeons
-//============================================================
-gld_dun01	mapflag	nosave	SavePoint
-gld_dun02	mapflag	nosave	SavePoint
-gld_dun03	mapflag	nosave	SavePoint
-gld_dun04	mapflag	nosave	SavePoint
-
-//============================================================
-// Normal Maps
-//============================================================
-yggdrasil01	mapflag	nosave	SavePoint
-thana_boss	mapflag	nosave	SavePoint
-
-//============================================================
-// Aldebaran Turbo Track
-//============================================================
-turbo_n_1	mapflag	nosave	SavePoint
-turbo_n_4	mapflag	nosave	SavePoint
-turbo_n_8	mapflag	nosave	SavePoint
-turbo_n_16	mapflag	nosave	SavePoint
-turbo_e_4	mapflag	nosave	SavePoint
-turbo_e_8	mapflag	nosave	SavePoint
-turbo_e_16	mapflag	nosave	SavePoint
-
-//============================================================
-// Monster Races
-//============================================================
-p_track01	mapflag	nosave	SavePoint
-p_track02	mapflag	nosave	SavePoint
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	nosave	SavePoint
-poring_w02	mapflag	nosave	SavePoint
-
-//============================================================
-// Vision of Okolnir
-//============================================================
-que_qsch01	mapflag	nosave	SavePoint
-que_qsch02	mapflag	nosave	SavePoint
-que_qsch03	mapflag	nosave	SavePoint
-que_qsch04	mapflag	nosave	SavePoint
-que_qsch05	mapflag	nosave	SavePoint
-que_qaru01	mapflag	nosave	SavePoint
-que_qaru02	mapflag	nosave	SavePoint
-que_qaru03	mapflag	nosave	SavePoint
-que_qaru04	mapflag	nosave	SavePoint
-que_qaru05	mapflag	nosave	SavePoint
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_c01	mapflag	nosave	SavePoint
-bat_c02	mapflag	nosave	SavePoint
-bat_c03	mapflag	nosave	SavePoint
-bat_b01	mapflag	nosave	SavePoint
-bat_b02	mapflag	nosave	SavePoint
-bat_a01	mapflag	nosave	SavePoint
-bat_a02	mapflag	nosave	SavePoint
-
-//============================================================
-// Episode 13
-//============================================================
-moc_fild22b	mapflag	nosave	SavePoint
-que_dan01	mapflag	nosave	SavePoint
-que_dan02	mapflag	nosave	SavePoint
-schg_que01	mapflag	nosave	SavePoint
-schg_dun01	mapflag	nosave	SavePoint
-arug_que01	mapflag	nosave	SavePoint
-arug_dun01	mapflag	nosave	SavePoint
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nosave	SavePoint
-2009rwc_02	mapflag	nosave	SavePoint
-2009rwc_03	mapflag	nosave	SavePoint
-2009rwc_04	mapflag	nosave	SavePoint
-2009rwc_05	mapflag	nosave	SavePoint
-2009rwc_06	mapflag	nosave	SavePoint
-2009rwc_07	mapflag	nosave	SavePoint
-2009rwc_08	mapflag	nosave	SavePoint
-2009rwc_f01	mapflag	nosave	SavePoint
-2012rwc_01	mapflag	nosave	SavePoint
-2012rwc_02	mapflag	nosave	SavePoint
-2012rwc_03	mapflag	nosave	SavePoint
-2012rwc_04	mapflag	nosave	SavePoint
-2012rwc_05	mapflag	nosave	SavePoint
-2012rwc_06	mapflag	nosave	SavePoint
-2012rwc_07	mapflag	nosave	SavePoint
-2012rwc_08	mapflag	nosave	SavePoint
-
-//============================================================
-// Events
-//============================================================
-evt_bomb	mapflag	nosave	SavePoint
-//evt_zombie	mapflag	nosave	SavePoint
--- a/npc/mapflag/noskill.txt
+++ b/npc/mapflag/noskill.txt
@@ -1,37 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable skill use.
-//===== Description: ========================================= 
-//= Disables all skills on the map.
-//===== Additional Comments: ================================= 
-//= 1.1 Added additional maps. [L0ne_W0lf]
-//============================================================
-
-//============================================================
-// Arenas
-//============================================================
-prt_are_in	mapflag	noskill
-
-//============================================================
-// The Sign Quest
-//============================================================
-himinn	mapflag	noskill
-
-//============================================================
-// Quiz
-//============================================================
-quiz_00	mapflag	noskill
-quiz_01	mapflag	noskill
-quiz_02	mapflag	noskill
-quiz_test	mapflag	noskill
-
-//============================================================
-// Hugel Minigames
-//============================================================
-que_bingo	mapflag	noskill
-p_track01	mapflag	noskill
-p_track02	mapflag	noskill
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	noskill
--- a/npc/mapflag/noteleport.txt
+++ b/npc/mapflag/noteleport.txt
@@ -1,481 +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
-//============================================================
-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
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	noteleport
-1@orcs	mapflag	monster_noteleport
-2@orcs	mapflag	noteleport
-2@orcs	mapflag	monster_noteleport
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	noteleport
-1@nyd	mapflag	monster_noteleport
-2@nyd	mapflag	noteleport
-2@nyd	mapflag	monster_noteleport
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	noteleport
-2009rwc_02	mapflag	noteleport
-2009rwc_03	mapflag	noteleport
-2009rwc_04	mapflag	noteleport
-2009rwc_05	mapflag	noteleport
-2009rwc_06	mapflag	noteleport
-2009rwc_07	mapflag	noteleport
-2009rwc_08	mapflag	noteleport
-2009rwc_f01	mapflag	noteleport
-2012rwc_01	mapflag	noteleport
-2012rwc_02	mapflag	noteleport
-2012rwc_03	mapflag	noteleport
-2012rwc_04	mapflag	noteleport
-2012rwc_05	mapflag	noteleport
-2012rwc_06	mapflag	noteleport
-2012rwc_07	mapflag	noteleport
-2012rwc_08	mapflag	noteleport
-
-//============================================================
-// Events
-//============================================================
-//evt_zombie	mapflag	noteleport
--- a/npc/mapflag/nowarp.txt
+++ b/npc/mapflag/nowarp.txt
@@ -1,121 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable warping.
-//===== Description: ========================================= 
-//= Disables warping from a map.
-//= Script commands 'warpparty' and 'warpguild' will not warp
-//=   players.
-//= Atcommands @warp, @go, @load, @jump, @partyrecall,
-//=   @guildrecall, and @recallall will not warp players.
-//= GD_EMERGENCYCALL and UNT_CALLFAMILY will not warp players.
-//===== Additional Comments: ================================= 
-//= 1.3 Added WoE SE maps.
-//============================================================
-
-//============================================================
-// Quest Places
-//============================================================
-ama_test	mapflag	nowarp
-gon_test	mapflag	nowarp
-que_ba	mapflag	nowarp
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-aldeg_cas01	mapflag	nowarp
-aldeg_cas02	mapflag	nowarp
-aldeg_cas03	mapflag	nowarp
-aldeg_cas04	mapflag	nowarp
-aldeg_cas05	mapflag	nowarp
-gefg_cas01	mapflag	nowarp
-gefg_cas02	mapflag	nowarp
-gefg_cas03	mapflag	nowarp
-gefg_cas04	mapflag	nowarp
-gefg_cas05	mapflag	nowarp
-payg_cas01	mapflag	nowarp
-payg_cas02	mapflag	nowarp
-payg_cas03	mapflag	nowarp
-payg_cas04	mapflag	nowarp
-payg_cas05	mapflag	nowarp
-prtg_cas01	mapflag	nowarp
-prtg_cas02	mapflag	nowarp
-prtg_cas03	mapflag	nowarp
-prtg_cas04	mapflag	nowarp
-prtg_cas05	mapflag	nowarp
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	nowarp
-schg_cas02	mapflag	nowarp
-schg_cas03	mapflag	nowarp
-schg_cas04	mapflag	nowarp
-schg_cas05	mapflag	nowarp
-arug_cas01	mapflag	nowarp
-arug_cas02	mapflag	nowarp
-arug_cas03	mapflag	nowarp
-arug_cas04	mapflag	nowarp
-arug_cas05	mapflag	nowarp
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-n_castle	mapflag	nowarp
-nguild_alde	mapflag	nowarp
-nguild_gef	mapflag	nowarp
-nguild_pay	mapflag	nowarp
-nguild_prt	mapflag	nowarp
-
-//============================================================
-// Aldebaran Turbo Track
-//============================================================
-turbo_n_1	mapflag	nowarp
-turbo_n_4	mapflag	nowarp
-turbo_n_8	mapflag	nowarp
-turbo_n_16	mapflag	nowarp
-turbo_e_4	mapflag	nowarp
-turbo_e_8	mapflag	nowarp
-turbo_e_16	mapflag	nowarp
-
-//============================================================
-// Monster Races
-//============================================================
-p_track01	mapflag	nowarp
-p_track02	mapflag	nowarp
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_c01	mapflag	nowarp
-bat_c02	mapflag	nowarp
-bat_c03	mapflag	nowarp
-bat_b01	mapflag	nowarp
-bat_b02	mapflag	nowarp
-bat_a01	mapflag	nowarp
-bat_a02	mapflag	nowarp
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	nowarp
-poring_w02	mapflag	nowarp
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nowarp
-2009rwc_02	mapflag	nowarp
-2009rwc_03	mapflag	nowarp
-2009rwc_04	mapflag	nowarp
-2009rwc_05	mapflag	nowarp
-2009rwc_06	mapflag	nowarp
-2009rwc_07	mapflag	nowarp
-2009rwc_08	mapflag	nowarp
-2009rwc_f01	mapflag	nowarp
-2012rwc_01	mapflag	nowarp
-2012rwc_02	mapflag	nowarp
-2012rwc_03	mapflag	nowarp
-2012rwc_04	mapflag	nowarp
-2012rwc_05	mapflag	nowarp
-2012rwc_06	mapflag	nowarp
-2012rwc_07	mapflag	nowarp
-2012rwc_08	mapflag	nowarp
--- a/npc/mapflag/nowarpto.txt
+++ b/npc/mapflag/nowarpto.txt
@@ -1,219 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable warpto.
-//===== Description: ========================================= 
-//= Disables warping to a map.
-//= Atcommands @warp, @go, @load, @jump, @partyrecall,
-//=   @guildrecall, and @recallall are disabled.
-//= Command /memo is disabled.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//= 1.4 Updated. [L0ne_W0lf]
-//= 1.5 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// WoE:FE Castles
-//============================================================
-//alde_gld	mapflag	nowarpto
-aldeg_cas01	mapflag	nowarpto
-aldeg_cas02	mapflag	nowarpto
-aldeg_cas03	mapflag	nowarpto
-aldeg_cas04	mapflag	nowarpto
-aldeg_cas05	mapflag	nowarpto
-gefg_cas01	mapflag	nowarpto
-gefg_cas02	mapflag	nowarpto
-gefg_cas03	mapflag	nowarpto
-gefg_cas04	mapflag	nowarpto
-gefg_cas05	mapflag	nowarpto
-//pay_gld	mapflag	nowarpto
-payg_cas01	mapflag	nowarpto
-payg_cas02	mapflag	nowarpto
-payg_cas03	mapflag	nowarpto
-payg_cas04	mapflag	nowarpto
-payg_cas05	mapflag	nowarpto
-//prt_gld	mapflag	nowarpto
-prtg_cas01	mapflag	nowarpto
-prtg_cas02	mapflag	nowarpto
-prtg_cas03	mapflag	nowarpto
-prtg_cas04	mapflag	nowarpto
-prtg_cas05	mapflag	nowarpto
-
-//============================================================
-// WoE:SE Castles
-//============================================================
-schg_cas01	mapflag	nowarpto
-schg_cas02	mapflag	nowarpto
-schg_cas03	mapflag	nowarpto
-schg_cas04	mapflag	nowarpto
-schg_cas05	mapflag	nowarpto
-arug_cas01	mapflag	nowarpto
-arug_cas02	mapflag	nowarpto
-arug_cas03	mapflag	nowarpto
-arug_cas04	mapflag	nowarpto
-arug_cas05	mapflag	nowarpto
-
-//============================================================
-// WoE:Novice Castles
-//============================================================
-n_castle	mapflag	nowarpto
-nguild_alde	mapflag	nowarpto
-nguild_gef	mapflag	nowarpto
-nguild_pay	mapflag	nowarpto
-nguild_prt	mapflag	nowarpto
-
-//============================================================
-// Lighthalzen Bio-Lab
-//============================================================
-lhz_dun03	mapflag	nowarpto
-
-//============================================================
-// Quest Places
-//============================================================
-ama_test	mapflag	nowarpto
-gon_test	mapflag	nowarpto
-que_rachel	mapflag	nowarpto
-que_san04	mapflag	nowarpto
-cave	mapflag	nowarpto
-
-//============================================================
-// Aldebaran Turbo Track
-//============================================================
-turbo_n_1	mapflag	nowarpto
-turbo_n_4	mapflag	nowarpto
-turbo_n_8	mapflag	nowarpto
-turbo_n_16	mapflag	nowarpto
-turbo_e_4	mapflag	nowarpto
-turbo_e_8	mapflag	nowarpto
-turbo_e_16	mapflag	nowarpto
-
-//============================================================
-// Izlude Battle Arena
-//============================================================
-force_1-1	mapflag	nowarpto
-force_2-1	mapflag	nowarpto
-force_3-1	mapflag	nowarpto
-force_4-1	mapflag	nowarpto
-force_5-1	mapflag	nowarpto
-force_1-2	mapflag	nowarpto
-force_1-3	mapflag	nowarpto
-prt_are_in	mapflag	nowarpto
-
-//============================================================
-// Monster Races
-//============================================================
-p_track01	mapflag	nowarpto
-p_track02	mapflag	nowarpto
-
-//============================================================
-// Poring War
-//============================================================
-poring_w01	mapflag	nowarpto
-poring_w02	mapflag	nowarpto
-
-//============================================================
-// Vision of Okolnir
-//============================================================
-que_qsch01	mapflag	nowarpto
-que_qsch02	mapflag	nowarpto
-que_qsch03	mapflag	nowarpto
-que_qsch04	mapflag	nowarpto
-que_qsch05	mapflag	nowarpto
-que_qaru01	mapflag	nowarpto
-que_qaru02	mapflag	nowarpto
-que_qaru03	mapflag	nowarpto
-que_qaru04	mapflag	nowarpto
-que_qaru05	mapflag	nowarpto
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	nowarpto
-2@cata	mapflag	nowarpto
-
-//============================================================
-// Endless Tower
-//============================================================
-e_tower	mapflag	nowarpto
-1@tower	mapflag	nowarpto
-2@tower	mapflag	nowarpto
-3@tower	mapflag	nowarpto
-4@tower	mapflag	nowarpto
-5@tower	mapflag	nowarpto
-6@tower	mapflag	nowarpto
-
-//============================================================
-// Battlegrounds
-//============================================================
-bat_c01	mapflag	nowarpto
-bat_c02	mapflag	nowarpto
-bat_c03	mapflag	nowarpto
-bat_room	mapflag	nowarpto
-bat_b01	mapflag	nowarpto
-bat_b02	mapflag	nowarpto
-bat_a01	mapflag	nowarpto
-bat_a02	mapflag	nowarpto
-
-//============================================================
-// Episode 13
-//============================================================
-mid_campin	mapflag	nowarpto
-man_fild01	mapflag	nowarpto
-man_fild03	mapflag	nowarpto
-spl_fild02	mapflag	nowarpto
-spl_fild03	mapflag	nowarpto
-moc_fild22b	mapflag	nowarpto
-que_dan01	mapflag	nowarpto
-que_dan02	mapflag	nowarpto
-schg_que01	mapflag	nowarpto
-schg_dun01	mapflag	nowarpto
-arug_que01	mapflag	nowarpto
-arug_dun01	mapflag	nowarpto
-nyd_dun01	mapflag	nowarpto
-nyd_dun02	mapflag	nowarpto
-manuk	mapflag	nowarpto
-man_fild02	mapflag	nowarpto
-man_in01	mapflag	nowarpto
-splendide	mapflag	nowarpto
-spl_fild01	mapflag	nowarpto
-spl_in01	mapflag	nowarpto
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	nowarpto
-2@orcs	mapflag	nowarpto
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	nowarpto
-2@nyd	mapflag	nowarpto
-
-//============================================================
-// Bossnia (Custom) #!todo Verify
-//============================================================
-bossnia_01	mapflag	nowarpto
-bossnia_02	mapflag	nowarpto
-bossnia_03	mapflag	nowarpto
-bossnia_04	mapflag	nowarpto
-
-//============================================================
-// RWC
-//============================================================
-2009rwc_01	mapflag	nowarpto
-2009rwc_02	mapflag	nowarpto
-2009rwc_03	mapflag	nowarpto
-2009rwc_04	mapflag	nowarpto
-2009rwc_05	mapflag	nowarpto
-2009rwc_06	mapflag	nowarpto
-2009rwc_07	mapflag	nowarpto
-2009rwc_08	mapflag	nowarpto
-2009rwc_f01	mapflag	nowarpto
-2012rwc_01	mapflag	nowarpto
-2012rwc_02	mapflag	nowarpto
-2012rwc_03	mapflag	nowarpto
-2012rwc_04	mapflag	nowarpto
-2012rwc_05	mapflag	nowarpto
-2012rwc_06	mapflag	nowarpto
-2012rwc_07	mapflag	nowarpto
-2012rwc_08	mapflag	nowarpto
--- a/npc/mapflag/partylock.txt
+++ b/npc/mapflag/partylock.txt
@@ -1,38 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Party lock.
-//===== Description: ========================================= 
-//= Blocks all party modifications on a map:
-//=   /organize, /leave, /invite, @changeleader
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script.
-//= 1.1 Updated. [L0ne_W0lf]
-//= 1.2 Renewal split. [Euphy]
-//============================================================
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	partylock
-2@cata	mapflag	partylock
-
-//============================================================
-// Endless Tower
-//============================================================
-1@tower	mapflag	partylock
-2@tower	mapflag	partylock
-3@tower	mapflag	partylock
-4@tower	mapflag	partylock
-5@tower	mapflag	partylock
-6@tower	mapflag	partylock
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	partylock
-2@orcs	mapflag	partylock
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	partylock
-2@nyd	mapflag	partylock
--- a/Show More
+++ b/Show More