Leftovers

Small mistake
Copypaste fail
2024-04-15 10:41:53 +02:00 · 2024-04-15 10:32:00 +02:00 · 2024-04-15 10:24:04 +02:00 · 2024-04-15 10:09:36 +02:00 · 2024-04-13 17:35:47 +02:00 · 2024-04-13 17:04:43 +02:00
384 changed files with 47280 additions and 85044 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,9 +0,0 @@
-# Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.
-# https://github.com/rathena/rathena/commit/637ae9a4dcde0d5885a18841d2f3875e06893c30
-637ae9a4dcde0d5885a18841d2f3875e06893c30
-# Applied AStyle code formating as discussed on tid:74602.
-# https://github.com/rathena/rathena/commit/a7c32653f70bd420bdf5a621acdf3aea5c6e6002
-a7c32653f70bd420bdf5a621acdf3aea5c6e6002
-# Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
-# https://github.com/rathena/rathena/commit/a2bdc47dafb32f6d18ed350d8bbe79b8f679a049
-a2bdc47dafb32f6d18ed350d8bbe79b8f679a049
--- a/.github/workflows/analysis_codeql.yml
+++ b/.github/workflows/analysis_codeql.yml
@@ -38,11 +38,11 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
        with:
           # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
           # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
@@ -74,7 +74,7 @@ jobs:
      #- name: Autobuild
      #  uses: github/codeql-action/autobuild@v2

-      # ?? If the Autobuild fails above, remove it and uncomment the following
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following
      #    three lines and modify them (or add more) to build your code if your
      #    project uses a compiled language
      - name: Command - configure
@@ -89,4 +89,4 @@ jobs:
        run: make server

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2
--- a/.github/workflows/build_servers_clang.yml
+++ b/.github/workflows/build_servers_clang.yml
@@ -34,7 +34,7 @@ jobs:
          clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - name: Set up Clang
        uses: egor-tensin/setup-clang@v1
--- a/.github/workflows/build_servers_cmake.yml
+++ b/.github/workflows/build_servers_cmake.yml
@@ -34,7 +34,7 @@ jobs:
          os: [ubuntu-latest]

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # Install latest CMake.
      - uses: lukka/get-cmake@latest
--- a/.github/workflows/build_servers_gcc.yml
+++ b/.github/workflows/build_servers_gcc.yml
@@ -31,14 +31,10 @@ jobs:
          # Available: ubuntu-22.04, ubuntu-20.04
          os: [ubuntu-latest]
          # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['9', '10', '11', '12']
-          # GCC 13 was removed from 22.04, include it as a separate job
-          include:
-            - os: ubuntu-24.04
-              gcc: 13
+          gcc: ['9', '10', '11']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - name: Update & Install packages
        # Ubuntu runners already have most of the packages rAthena requires to build.
@@ -49,10 +45,8 @@ jobs:

      - name: Command - configure
        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }}'
-        # -Werror: to treat all warnings as errors
-        # -Wno-error=builtin-declaration-mismatch: otherwise ./configure checks fail
-        run: ./configure $CONFIGURE_FLAGS --enable-buildbot=yes CXXFLAGS='-Werror -Wno-error=builtin-declaration-mismatch'
+            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-buildbot=yes'
+        run: ./configure $CONFIGURE_FLAGS
      
      - name: Command - make clean
        run: make clean
--- a/.github/workflows/build_servers_modes.yml
+++ b/.github/workflows/build_servers_modes.yml
@@ -36,7 +36,7 @@ jobs:
          mode: ['PRE','RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/.github/workflows/build_servers_msbuild.yml
+++ b/.github/workflows/build_servers_msbuild.yml
@@ -34,15 +34,15 @@ jobs:
          mode: ['PRE', 'RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v1.1

      - name: Build solution in Debug
        if: ${{ matrix.mode == 'PRE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE" /warnaserror
+        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE"

      - name: Build solution in Debug
        if: ${{ matrix.mode == 'RE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT" /warnaserror
+        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT"
--- a/.github/workflows/build_servers_packetversions.yml
+++ b/.github/workflows/build_servers_packetversions.yml
@@ -38,7 +38,7 @@ jobs:
          packetver: ['20211103', '20200902', '20200401', '20180620', '20151104']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/.github/workflows/build_servers_vip.yml
+++ b/.github/workflows/build_servers_vip.yml
@@ -36,7 +36,7 @@ jobs:
          mode: ['PRE', 'RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/.github/workflows/npc_db_validation.yml
+++ b/.github/workflows/npc_db_validation.yml
@@ -39,7 +39,7 @@ jobs:
          mode: ['PRE', 'RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      
      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
@@ -918,11 +918,6 @@ Body:
  - Command: reloadbattleconf
    Help: |
      Reload battle settings.
-  - Command: reloadcashdb
-    Aliases:
-      - reloadcashshop
-    Help: |
-      Reload cash shop database.
  - Command: reloadinstancedb
    Help: |
      Reload instance database.
@@ -961,7 +956,6 @@ Body:
      atcommand       battleconf     statusdb
      pcdb                    motd             script
      questdb              msgconf       packetdb
-      cashdb
  - Command: langtype
    Help: |
      Params: <language>
@@ -1032,11 +1026,6 @@ 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/battle.conf
+++ b/conf/battle/battle.conf
@@ -130,19 +130,10 @@ equip_self_break_rate: 100
 // This affects the behaviour of skills like acid terror and meltdown
 equip_skill_break_rate: 100

-// Should damage have a delay before it is applied? (Note 1)
-// Some skills might not have a delay by default regardless of this setting.
-// The official setting is yes, even thought it degrades performance a bit.
+// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
+// NOTE: The official setting is yes, even thought it degrades performance a bit.
 delay_battle_damage: yes

-// Should the damage timing be synchronized between the client and server? (Note 1)
-// This is not official behavior, but it should remove the position lag after being hit by a monster.
-// This setting only affects normal monster attacks and takes priority over "delay_battle_damage".
-// Many skills show their damage immediately, so setting "delay_battle_damage" to "no" at the same
-// time might improve the experience further, but will not work for all skills.
-// Tired of Dark Illusion hitting you 5 seconds too late? Then turn this on.
-synchronize_damage: no
-
 // Are arrows/ammo consumed when used on a bow/gun?
 // 0 = No
 // 1 = Yes
--- a/conf/battle/battleground.conf
+++ b/conf/battle/battleground.conf
@@ -9,6 +9,25 @@
 //         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/exp.conf
+++ b/conf/battle/exp.conf
@@ -33,7 +33,8 @@ max_exp_gain_rate: 0
 // Method of calculating earned experience when defeating a monster:
 // 0 = uses damage given / total damage as damage ratio
 // 1 = uses damage given / max_hp as damage ratio
-// 2 = 0 + first attacker counts twice
+// NOTE: Using type 1 disables the bonus where the first attacker gets 
+//       his share of the exp doubled when multiple people attack the mob.
 exp_calc_type: 0

 // Experience increase per attacker. That is, every additional attacker to the
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -27,6 +27,25 @@ 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,18 +17,10 @@
 // 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
@@ -1,27 +0,0 @@
-//--------------------------------------------------------------
-// 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,10 +12,8 @@
 // The highest value at which an item can be sold via the merchant vend skill. (in zeny)
 vending_max_value: 1000000000

-// 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.
+// 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.
 vending_over_max: yes

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

-// Allow map_addflooritem to check if item is droppable? (Note 1)
+// Allow map_flooritem 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,6 +39,14 @@ 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

@@ -175,17 +183,3 @@ mail_delay: 1000

 // Hides items from the player's favorite tab from being sold to a NPC. (Note 1)
 hide_fav_sell: no
-
-// When searching for a random position on the map, how much of the border of the map shall not be considered?
-// Officially the 15 tiles from the edge of the map on each side are not considered as target cells.
-// On some maps like in Pyramids this causes there to be very few monsters in the outer areas. This also
-// affects teleportation. Set this to 1 if you want it to be closer to the old emulator behavior.
-// Valid values: 1-40
-map_edge_size: 15
-
-// When a player drops items, can they stack on the same cell? (Note 1)
-// Officially there's no limit on how many items you can drop on the same cell.
-// If you set this to "no", when you drop an item, it will only drop on a cell that has no item on it yet.
-// A free cell will be searched for in eight directions. If no free cell could be found in those eight tries,
-// then dropping the item will fail (the item stays in the player's inventory).
-item_stacking: yes
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -79,10 +79,10 @@ monster_chase_refresh: 30
 // 8: Enable mob-warping when standing on Dimensional Door
 mob_warp: 0

-// Defines the time (in ms) during which monsters will have their AI active
-// after all players have left their vicinity.
-mob_active_time: 5000
-boss_active_time: 5000
+// If these are set above 0, they define the time (in ms) during which monsters
+// will have their 'AI' active after all players have left their vicinity.
+mob_active_time: 0
+boss_active_time: 0

 // Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)
 view_range_rate: 100
@@ -163,15 +163,6 @@ no_spawn_on_player: 0
 // map regardless of what the mob-spawn file says.
 force_random_spawn: no

-// Should each monster's center cell be randomized? (Note 1)
-// Officially, at server start, each monster's center cell is set to a random cell in the spawn area.
-// Each time the monster spawns it will spawn in an area around its center cell rather than the
-// original center of the spawn definition. This results in a much larger total spawn area and a
-// different experience each server start.
-// Set this to "no" if you want all monsters of a spawn to spawn around the original center of the
-// spawn definition, making the total spawn area much smaller (old eAthena behavior).
-randomize_center_cell: yes
-
 // Do summon slaves inherit the passive/aggressive traits of their master?
 // 0: No, retain original mode.
 // 1: Slaves are always aggressive.
@@ -311,8 +302,3 @@ slave_stick_with_master: no
 // Also used in delaying the spawning of guardians when a guild is not loaded.
 // Default (Official): 1000
 mob_respawn_time: 1000
-
-// Defines the time (in ms) after which a monster unlocks its target when trapped.
-// During this time monsters will still be in idle mode and use idle skills on random
-// targets, but they continue chasing their original target when no longer trapped.
-mob_unlock_time: 2000
--- a/conf/battle/pet.conf
+++ b/conf/battle/pet.conf
@@ -41,10 +41,6 @@ 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,12 +295,15 @@ trait_points_job_change: 7

 // Max trait stats cap.
 // Trait Stats: POW, STA, WIS, SPL, CON, CRT
-// Official is 110.
-max_trait_parameter: 110
+// Official is 100.
+max_trait_parameter: 100

-// Max percent of RES/MRES that can be ignored by item bonus/skill.
-// Default: 50
-max_res_mres_ignored: 50
+// 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

 // Maximum AP
 // Default: 1000
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -26,8 +26,8 @@ min_skill_delay_limit: 100

 // This delay is the min 'can't walk delay' of all skills.
 // NOTE: Do not set this too low, if a character starts moving too soon after 
-// doing a skill, the client will not update this, and the player will appear
-// to "teleport" afterwards. Monsters use AttackMotion instead.
+// doing a skill, the client will not update this, and the player/mob will 
+// appear to "teleport" afterwards.
 default_walk_delay: 300

 // Completely disable skill delay of the following types (Note 3)
@@ -270,10 +270,8 @@ 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
-// 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 ratio (100% = 10000)
+sg_miracle_skill_ratio: 2

 // 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,9 +8,6 @@
 //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

@@ -20,20 +17,14 @@ 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

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

 //Item/card-specific and crafting related options.
 import: conf/battle/items.conf
@@ -41,16 +32,15 @@ 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

@@ -60,5 +50,12 @@ 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,10 +144,6 @@ 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,15 +55,9 @@ console: off
 // Note: This only works if client side password encryption is not enabled.
 new_account: no

-// 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
+//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

 // 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
@@ -1613,29 +1613,5 @@ map: bl_depth2
 // Fantasy Series Sonic Collaboration - Dr. Eggman's Secret Base
 map: 1@vrsn

-// Episode 21
-map: 1@ep21a
-map: 1@ep21b
-map: 1@mdtem
-map: 1@twbs2
-map: 1@wtgs
-map: 2@mdtem
-map: jalbe_in
-map: jor_albe
-map: jor_base
-map: jor_crk
-map: jor_crk_p
-map: jor_mbase
-map: jor_raise1
-map: jor_raise2
-map: jor_tmple1
-map: jor_tmple2
-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: Free
+732: Item cannot be opened when your inventory is full.

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

@@ -933,14 +933,7 @@
 // NoBank Mapflag
 831: You cannot use the Bank on this map.

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

 //------------------------------------
 // More atcommands message
@@ -1131,9 +1124,9 @@
 // @mapinfo
 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s (Zone: %s) | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: Map: %s | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Town Map
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)
@@ -1827,8 +1820,5 @@
 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 (Zone: %s) | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d | Vendings: %d
+1040: 地圖名: %s | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d
 1041: ------ 地圖旗標 ------
-1042: Damage Rate Adjustments:
+1042: 城市地圖
 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 (Zone: %s) | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d | Vendings: %d
+1040: Nom de la Map: %s | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Town Map
 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: Free
+732: Item tidak dapat dibuka ketika inventory penuh.

 //733 free

@@ -970,9 +970,9 @@
 // @mapinfo
 1038: Harap masukkan setidaknya 1 pilihan. (Penggunaan: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s (Zone: %s) | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
+1040: Map: %s | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Kota
 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: Free
+732: O item não pode ser aberto quando o seu inventário está cheio.

 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 (Zona: %s) | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
+1040: Mapa: %s | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
 1041: ------ Map Flags ------
-1042: Ajustes na taxa de dano:
+1042: Mapa de Cidade
 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 (Zone: %s) | Игроки: %d | НИП: %d | Чаты: %d | Vendings: %d
+1040: Название локации: %s | Игроки: %d | НИП: %d | Чаты: %d
 1041: ------ Мапфлаги ------
-1042: Damage Rate Adjustments:
+1042: Столица
 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: libre
+732: No puedes abrir el objeto porque tu inventario está lleno.

 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 (Zona: %s) | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
+1040: Mapa: %s | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
 1041: ------ Opciones del mapa ------
-1042: Ajuste de ratios de daño:
+1042: Mapa de ciudad
 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 (Zone: %s) | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: ב¼¹·<C2B9>ט: %s | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Town Map
 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
@@ -0,0 +1,30 @@
+// 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
@@ -0,0 +1,28 @@
+// 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
@@ -1,39 +0,0 @@
-# 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_db.yml
+++ b/db/import-tmpl/mob_db.yml
@@ -56,7 +56,6 @@
 #   WalkSpeed               Walk speed. (Default: DEFAULT_WALK_SPEED)
 #   AttackDelay             Attack speed. (Default: 0)
 #   AttackMotion            Attack animation speed. (Default: 0)
-#   ClientAttackMotion      Client attack speed. (Default: AttackMotion)
 #   DamageMotion            Damage animation speed. (Default: 0)
 #   DamageTaken             Rate at which the monster will receive incoming damage. (Default: 100)
 #   Ai                      Aegis monster type AI behavior. (Default: 06)
@@ -78,7 +77,7 @@

 Header:
  Type: MOB_DB
-  Version: 4
+  Version: 3

 #Body:
 # eAthena Dev Team
--- a/db/import-tmpl/mob_summon.yml
+++ b/db/import-tmpl/mob_summon.yml
@@ -33,24 +33,3 @@ 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
@@ -0,0 +1,24 @@
+// 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
@@ -0,0 +1,25 @@
+// 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
@@ -1241,26 +1241,6 @@ t_garden
 3@vrpop
 bl_depth2
 1@vrsn
-1@ep21a
-1@ep21b
-1@mdtem
-1@twbs2
-1@wtgs
-2@mdtem
-jalbe_in
-jor_albe
-jor_base
-jor_crk
-jor_crk_p
-jor_mbase
-jor_raise1
-jor_raise2
-jor_tmple1
-jor_tmple2
-luna_sf1
-luna_sf2
-mbase_in
-prt_mk

 //======================================================================================
 // - Other/Extra maps -
--- a/db/map_zones.yml
+++ b/db/map_zones.yml
@@ -1,47 +0,0 @@
-# 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/mob_db.yml
+++ b/db/mob_db.yml
@@ -56,7 +56,6 @@
 #   WalkSpeed               Walk speed. (Default: DEFAULT_WALK_SPEED)
 #   AttackDelay             Attack speed. (Default: 0)
 #   AttackMotion            Attack animation speed. (Default: 0)
-#   ClientAttackMotion      Client attack speed. (Default: AttackMotion)
 #   DamageMotion            Damage animation speed. (Default: 0)
 #   DamageTaken             Rate at which the monster will receive incoming damage. (Default: 100)
 #   Ai                      Aegis monster type AI behavior. (Default: 06)
@@ -78,7 +77,7 @@

 Header:
  Type: MOB_DB
-  Version: 4
+  Version: 3

 Footer:
  Imports:
--- 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,100;
+      sc_start SC_SlowDown,5000,0;
  - Id: 12018
    AegisName: Fire_Cracker
    Name: Firecracker
@@ -8637,21 +8637,21 @@ Body:
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
+      searchstores 10,0;
  - Id: 12581
    AegisName: Vending_Search_Scroll2
    Name: Universal Catalog Gold
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
+      searchstores 10,1;
  - Id: 12591
    AegisName: Uni_Catalog_Bz
    Name: Universal Catalog Bronze
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
+      searchstores 10,1;
  - Id: 12609
    AegisName: Old_Ore_Box
    Name: Old Ore Box
--- a/db/pre-re/item_noequip.txt
+++ b/db/pre-re/item_noequip.txt
@@ -0,0 +1,83 @@
+// 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
@@ -0,0 +1,28 @@
+// 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/mob_db.yml
+++ b/db/pre-re/mob_db.yml
--- a/db/pre-re/mob_skill_db.txt
+++ b/db/pre-re/mob_skill_db.txt
@@ -102,7 +102,7 @@
 1019,Peco Peco@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,6,,,,,,
 1019,Peco Peco@NPC_FIREATTACK,attack,186,1,2000,0,5000,yes,target,always,0,,,,,,,
 1019,Peco Peco@NPC_PROVOCATION,chase,194,1,200,0,5000,yes,target,always,0,,,,,,19,
-1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,,,,,,,
 1023,Orc Warrior@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,6,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -349,7 +349,7 @@
 1067,Cornutus@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
 1067,Cornutus@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1067,Cornutus@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,,
+1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1069,Swordfish@NPC_WATERATTACK,attack,184,1,2000,0,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,attack,86,3,500,1500,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,chase,86,3,500,1500,5000,yes,target,always,0,,,,,,,
@@ -601,9 +601,9 @@
 1117,Evil Druid@NPC_UNDEADATTACK,chase,347,3,500,500,5000,no,target,always,0,,,,,,9,
 1117,Evil Druid@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,0,,,,,,,
 1117,Evil Druid@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,0,,,,,,,
-1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1118,Flora@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
-1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,attack,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,,
@@ -1297,7 +1297,7 @@
 1276,Raydric Archer@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
-1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,target,always,0,,,,,,,
+1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
 1278,Stalactite Golem@NPC_STUNATTACK,attack,179,4,500,1500,5000,no,target,always,0,,,,,,6,
@@ -1580,7 +1580,7 @@
 1367,Blazer@WZ_SIGHTRASHER,attack,81,5,500,1000,5000,no,target,always,0,,,,,,6,
 1368,Geographer@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
 1368,Geographer@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
-1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1369,Grand Peco@AS_SONICBLOW,attack,136,5,500,800,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -2563,8 +2563,8 @@
 1510,Hylozoist@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,attack,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
@@ -2583,11 +2583,11 @@
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,skillused,83,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,longrangeattacked,,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,casttargeted,,,,,,,9,
-1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,always,0,,,,,,9,
+1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,attack,80,10,5000,0,2000,yes,around2,always,0,,,,,,,
-1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,,
+1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,randomtarget,always,0,,,,,,,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,5000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1511,Amon Ra@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -3398,18 +3398,18 @@
 1663,Laurell Weinder@NPC_EMOTION,idle,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,attack,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,chase,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,target,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1668,Archdam@NPC_PIERCINGATT,attack,158,5,1000,0,5000,yes,target,always,0,,,,,,,
 1668,Archdam@NPC_GUIDEDATTACK,attack,172,2,500,1000,20000,no,target,always,0,,,,,,29,
 1668,Archdam@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,,
@@ -3446,9 +3446,9 @@
 1673,Dimik@NPC_COMBOATTACK,attack,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_COMBOATTACK,chase,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_FIREATTACK,attack,186,3,500,0,5000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1675,Venatu@NPC_SILENCEATTACK,attack,178,3,500,700,5000,no,target,always,0,,,,,,,
 1675,Venatu@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
 1675,Venatu@NPC_STUNATTACK,attack,179,2,500,1500,5000,no,target,always,0,,,,,,11,
@@ -3524,11 +3524,11 @@
 1688,Lady Tany@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@AL_TELEPORT,attack,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,target,myhpltmaxrate,60,,,,,,,
-1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,target,always,0,,,,,,,
+1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,randomtarget,always,0,,,,,,,
 1688,Lady Tany@NPC_DEFENDER,attack,205,1,500,0,30000,yes,self,longrangeattacked,,,,,,,29,
 1688,Lady Tany@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
 1688,Lady Tany@NPC_SUMMONSLAVE,attack,196,5,10000,2000,5000,no,self,slavele,2,1691,,,,,,
@@ -4055,7 +4055,7 @@
 1764,Skeggiold@NPC_HOLYATTACK,chase,189,2,500,500,5000,no,target,always,0,,,,,,18,
 1764,Skeggiold@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1764,Skeggiold@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1765,Valkyrie@AL_HEAL,idle,28,11,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
+1765,Valkyrie@AL_HEAL,idle,28,10,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_HEAL,attack,28,11,10000,500,10000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1765,Valkyrie@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
@@ -4220,18 +4220,18 @@
 1779,Ktullanux@NPC_AGIUP,attack,350,5,2000,0,100000,yes,self,always,0,,,,,,,
 1779,Ktullanux@NPC_AGIUP,attack,350,5,10000,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 1779,Ktullanux@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,6,
-1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,randomtarget,always,0,,,,,,6,
+1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1780,Muscipular@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
 1780,Muscipular@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,target,always,0,,,,,,,
-1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1781,Drosera@RG_CLOSECONFINE,attack,1005,1,1000,0,30000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
-1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,randomtarget,always,0,,,,,,6,
+1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1782,Roween@NPC_WINDATTACK,attack,187,2,500,500,5000,no,target,always,0,,,,,,,
 1782,Roween@NPC_COMBOATTACK,attack,171,4,500,500,5000,no,target,always,0,,,,,,6,
 1782,Roween@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,22,0x308D,,,,,
@@ -5594,7 +5594,7 @@
 2017,Rata@NPC_ARMORBRAKE,attack,344,3,2000,0,5000,yes,target,myhpltmaxrate,60,,,,,,,
 2017,Rata@WZ_EARTHSPIKE,attack,90,5,3000,1000,5000,no,target,always,0,,,,,,6,
 2017,Rata@NPC_PIERCINGATT,attack,158,3,500,0,5000,yes,target,always,0,,,,,,,
-2017,Rata@SM_MAGNUM,attack,7,25,500,500,5000,no,self,always,0,,,,,,,
+2017,Rata@SM_MAGNUM,attack,7,10,500,500,5000,no,self,always,0,,,,,,,
 2017,Rata@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,,
 2017,Rata@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
 2017,Rata@NPC_POISONATTACK,attack,188,1,2000,0,5000,yes,target,always,0,,,,,,,
@@ -5694,14 +5694,6 @@
 2027,Dark Shadow@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,,
 2027,Dark Shadow@NPC_DARKNESSBREATH,attack,658,1,500,1000,5000,no,target,always,0,,,,,,,

-//****
-// NC Mechanic Summons
-2042,Silver Sniper@NPC_REVENGE,idle,333,1,10000,0,0,yes,self,masterattacked,0,,,,,,,
-2043,Magic Decoy Fire@MG_FIREBOLT,idle,19,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2044,Magic Decoy Water@MG_COLDBOLT,idle,14,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2045,Magic Decoy Earth@WZ_EARTHSPIKE,idle,90,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,idle,20,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-
 // Brasilis
 2068,Boitata@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
 2068,Boitata@MG_FIREBALL,idle,17,5,10000,0,5000,yes,randomtarget,always,0,,,,,,,
@@ -5779,3 +5771,28 @@
 2082,Piranha@MG_COLDBOLT,chase,14,3,500,1000,5000,yes,target,always,0,,,,,,,
 2082,Piranha@WZ_WATERBALL,attack,86,3,500,1000,5000,yes,target,always,0,,,,,,6,
 2082,Piranha@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+//****
+// NC Mechanic Summons
+2042,Silver Sniper@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,attack,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,chase,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,attack,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,chase,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,attack,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,chase,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,attack,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,chase,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
--- a/db/pre-re/pet_db.yml
+++ b/db/pre-re/pet_db.yml
@@ -866,14 +866,3 @@ 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,27 +3660,17 @@ 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: 1200
+        Time: 2000
      - Level: 3
-        Time: 1400
+        Time: 3000
      - Level: 4
-        Time: 1600
+        Time: 4000
      - Level: 5
-        Time: 1800
+        Time: 5000
+    AfterCastActDelay: 700
    Requires:
      SpCost:
        - Level: 1
@@ -3732,7 +3722,7 @@ Body:
        Time: 4000
      - Level: 5
        Time: 5000
-    AfterCastActDelay: 1000
+    AfterCastActDelay: 700
    Duration1: 100
    Requires:
      SpCost:
@@ -4163,6 +4153,7 @@ Body:
        Time: 120000
      - Level: 5
        Time: 60000
+    Duration2: 3000
    Requires:
      SpCost: 10
      ItemCost:
@@ -4417,7 +4408,6 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
    Flags:
      IsTrap: true
      AlterRangeResearchTrap: true
@@ -5194,8 +5184,6 @@ Body:
    MaxLevel: 1
    Type: Weapon
    TargetType: Attack
-    DamageFlags:
-      IgnoreAtkCard: true
    Flags:
      IsQuest: true
    Range: 1
@@ -6897,9 +6885,12 @@ Body:
    MaxLevel: 10
    Type: Magic
    TargetType: Self
+    DamageFlags:
+      IgnoreAtkCard: true
+      IgnoreFlee: true
    Flags:
      TargetSelf: true
-    Range: 9
+    Range: 5
    Hit: Single
    HitCount: 1
    Element: Holy
@@ -7369,7 +7360,7 @@ Body:
        Time: 1500
      - Level: 5
        Time: 1000
-    Duration1: 300000
+    Duration2: 300000
    Requires:
      SpCost: 1
      Weapon:
@@ -8548,7 +8539,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
-    Duration1: 15000
    Duration2: 12000
    Requires:
      SpCost:
@@ -8840,7 +8830,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
-    Duration1: 5000
    Duration2: 5000
    Requires:
      SpCost:
@@ -10010,15 +9999,15 @@ Body:
    Element: Weapon
    Duration1:
      - Level: 1
-        Time: 2000
-      - Level: 2
        Time: 4000
-      - Level: 3
-        Time: 6000
-      - Level: 4
+      - Level: 2
        Time: 8000
+      - Level: 3
+        Time: 12000
+      - Level: 4
+        Time: 16000
      - Level: 5
-        Time: 10000
+        Time: 24000
    CastDelayFlags:
      IgnoreStatus: true
    Requires:
@@ -10034,7 +10023,7 @@ Body:
        - Level: 5
          Amount: 12
      SpiritSphereCost: 1
-    Status: Ankle
+    Status: Stop
  - Id: 372
    Name: CH_CHAINCRUSH
    Description: Chain Crush Combo
@@ -10813,7 +10802,7 @@ Body:
      IgnoreDefense: true
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -10855,7 +10844,7 @@ Body:
      Weapon:
        1hSpear: true
        2hSpear: true
-    Status: Ankle
+    Status: Stop
  - Id: 398
    Name: LK_HEADCRUSH
    Description: Traumatic Blow
@@ -11074,7 +11063,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      NoDamage: true
-    Range: 9
+    Range: 7
    Hit: Single
    HitCount: 1
    ActiveInstance: 3
@@ -14306,7 +14295,6 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
      IgnoreFlee: true
    Flags:
      AlterRangeSnakeEye: true
@@ -14392,7 +14380,7 @@ Body:
    Type: Weapon
    TargetType: Attack
    DamageFlags:
-      IgnoreAtkCard: true
+      IgnoreFlee: true
    Range: 9
    Hit: Single
    HitCount: 1
@@ -14410,6 +14398,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      IgnoreAtkCard: true
+      IgnoreFlee: true
    Range: 9
    Hit: Multi_Hit
    HitCount: 3
@@ -14485,7 +14474,7 @@ Body:
    Flags:
      IgnoreBgReduction: true
      IgnoreGvgReduction: true
-    Range: 7
+    Range: 9
    Hit: Single
    HitCount: 1
    CopyFlags:
@@ -14522,8 +14511,6 @@ Body:
    MaxLevel: 5
    Type: Weapon
    TargetType: Self
-    DamageFlags:
-      IgnoreAtkCard: true
    Hit: Single
    HitCount: 1
    Element: Weapon
@@ -16344,7 +16331,7 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 300000
+    Duration1: -1
    Status: Invincible
  - Id: 686
    Name: NPC_INVINCIBLEOFF
@@ -16356,6 +16343,8 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
+    Duration1: 60000
+    Status: InvincibleOff
  - Id: 687
    Name: NPC_ALLHEAL
    Description: Full Heal
@@ -17192,7 +17181,6 @@ Body:
    TargetType: Attack
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
    Flags:
      IsQuest: true
    Range: -1
@@ -30736,8 +30724,10 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
+    Range: 9
+    Hit: Single
+    HitCount: 1
    AfterCastActDelay: 2000
-    AfterCastWalkDelay: 1000
    Requires:
      SpCost:
        - Level: 1
@@ -30760,8 +30750,11 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
+      Splash: true
+    Hit: Single
+    HitCount: 1
+    SplashArea: -1
    AfterCastActDelay: 35000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@@ -30790,6 +30783,7 @@ Body:
    Name: HLIF_BRAIN
    Description: Brain Surgery
    MaxLevel: 5
+    SplashArea: 1
  - Id: 8004
    Name: HLIF_CHANGE
    Description: Change
@@ -30797,14 +30791,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastActDelay:
-      - Level: 1
-        Time: 600000
-      - Level: 2
-        Time: 900000
-      - Level: 3
-        Time: 1200000
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@@ -30812,6 +30799,13 @@ 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
@@ -30822,8 +30816,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastActDelay: 1000
-    AfterCastWalkDelay: 1000
+    Hit: Single
+    Duration2: 1000
    Requires:
      SpCost: 10
  - Id: 8006
@@ -30833,8 +30827,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
+    Hit: Single
    AfterCastActDelay: 30000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@@ -30863,6 +30857,8 @@ Body:
    Name: HAMI_SKIN
    Description: Adamantium Skin
    MaxLevel: 5
+    DamageFlags:
+      NoDamage: true
  - Id: 8008
    Name: HAMI_BLOODLUST
    Description: Bloodlust
@@ -30870,14 +30866,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastActDelay:
-      - Level: 1
-        Time: 300000
-      - Level: 2
-        Time: 600000
-      - Level: 3
-        Time: 900000
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@@ -30885,6 +30874,13 @@ 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
@@ -30907,6 +30903,7 @@ Body:
        Count: -2
      - Level: 5
        Count: -3
+    AfterCastWalkDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@@ -30927,18 +30924,6 @@ 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
@@ -30950,6 +30935,17 @@ 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
@@ -30973,18 +30969,6 @@ 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
@@ -30996,6 +30980,17 @@ 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
@@ -31018,6 +31013,7 @@ Body:
    Range: 15
    Hit: Single
    HitCount: 1
+    AfterCastActDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8013
@@ -31039,6 +31035,17 @@ 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
@@ -31059,7 +31066,8 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastWalkDelay: 1500
+    AfterCastActDelay: 3000
+    AfterCastWalkDelay: 3000
    Requires:
      SpCost: 40
  - Id: 8015
@@ -31083,6 +31091,7 @@ Body:
    HitCount: 1
    Element: Weapon
    SplashArea: 4
+    AfterCastWalkDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8018
@@ -32576,7 +32585,6 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
    Flags:
      IsTrap: true
      AlterRangeResearchTrap: true
@@ -32743,7 +32751,7 @@ Body:
      IgnoreDefense: true
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -32786,7 +32794,7 @@ Body:
          Amount: 27
        - Level: 5
          Amount: 30
-    Status: Ankle
+    Status: Stop
  - Id: 8219
    Name: ML_DEFENDER
    Description: Defending_Aura
--- a/db/pre-re/skill_nocast_db.txt
+++ b/db/pre-re/skill_nocast_db.txt
@@ -0,0 +1,176 @@
+// 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,33 +552,3 @@ 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
@@ -769,6 +769,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
      RemoveOnChangeMap: true
+    MinDuration: 5000
  - Status: Keeping
    DurationLookup: NPC_KEEPING
    CalcFlags:
@@ -2478,17 +2479,13 @@ Body:
    DurationLookup: HLIF_AVOID
    CalcFlags:
      Speed: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
  - Status: Change
    DurationLookup: HLIF_CHANGE
    CalcFlags:
      Vit: true
      Int: true
    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
+      RemoveOnChangeMap: true
    Fail:
      Change: true
  - Status: Bloodlust
@@ -2496,9 +2493,6 @@ Body:
    CalcFlags:
      Batk: true
      Watk: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
  - Status: Fleet
    DurationLookup: HFLI_FLEET
    CalcFlags:
@@ -2513,10 +2507,6 @@ Body:
    DurationLookup: HAMI_DEFENCE
    CalcFlags:
      Def: true
-      Vit: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
  - Status: Incaspdrate
    CalcFlags:
      Aspd: true
@@ -2834,12 +2824,23 @@ Body:
    Icon: EFST_INVINCIBLE
    DurationLookup: NPC_INVINCIBLE
    CalcFlags:
-      Aspd: true
      Speed: true
    Flags:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
+    EndOnStart:
+      Invincibleoff: true
+  - Status: Invincibleoff
+    DurationLookup: NPC_INVINCIBLEOFF
+    CalcFlags:
+      Speed: true
+    Flags:
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    EndOnStart:
+      Invincible: true
  - Status: Manu_Atk
    Icon: EFST_MANU_ATK
    Flags:
@@ -3974,7 +3975,7 @@ Body:
      Unlimitedhummingvoice: true
      Sircleofnature: true
  - Status: Deepsleep
-    Icon: EFST_DEEP_SLEEP
+    Icon: EFST_HANDICAPSTATE_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: 8000
+                Chance: 7000
              - Refine: 17
-                Chance: 8000
+                Chance: 7000
              - Refine: 18
-                Chance: 8000
+                Chance: 7000
              - Refine: 19
-                Chance: 8000
+                Chance: 7000
              - Refine: 20
-                Chance: 8000
+                Chance: 7000
            Bonus: 10
            Catalyst:
                Item: Blessed_Etel_Dust
@@ -116,15 +116,15 @@ Body:
              - Refine: 15
                Chance: 6000
              - Refine: 16
-                Chance: 7000
+                Chance: 6000
              - Refine: 17
-                Chance: 7000
+                Chance: 6000
              - Refine: 18
-                Chance: 7000
+                Chance: 6000
              - Refine: 19
-                Chance: 7000
+                Chance: 6000
              - Refine: 20
-                Chance: 7000
+                Chance: 6000
            Bonus: 30
            Catalyst:
                Item: Blessed_Etel_Dust
@@ -154,15 +154,15 @@ Body:
              - Refine: 15
                Chance: 5000
              - Refine: 16
-                Chance: 6000
+                Chance: 5000
              - Refine: 17
-                Chance: 6000
+                Chance: 5000
              - Refine: 18
-                Chance: 6000
+                Chance: 5000
              - Refine: 19
-                Chance: 6000
+                Chance: 5000
              - Refine: 20
-                Chance: 6000
+                Chance: 5000
            Bonus: 50
            AnnounceFail: true
            Catalyst:
@@ -193,15 +193,15 @@ Body:
              - Refine: 15
                Chance: 4000
              - Refine: 16
-                Chance: 5000
+                Chance: 4000
              - Refine: 17
-                Chance: 5000
+                Chance: 4000
              - Refine: 18
-                Chance: 5000
+                Chance: 4000
              - Refine: 19
-                Chance: 5000
+                Chance: 4000
              - Refine: 20
-                Chance: 5000
+                Chance: 4000
            Bonus: 100
            AnnounceFail: true
            Catalyst:
@@ -240,15 +240,15 @@ Body:
              - Refine: 15
                Chance: 7000
              - Refine: 16
-                Chance: 8000
+                Chance: 7000
              - Refine: 17
-                Chance: 8000
+                Chance: 7000
              - Refine: 18
-                Chance: 8000
+                Chance: 7000
              - Refine: 19
-                Chance: 8000
+                Chance: 7000
              - Refine: 20
-                Chance: 8000
+                Chance: 7000
            Bonus: 10
            Catalyst:
                Item: Blessed_Etel_Dust
@@ -280,15 +280,15 @@ Body:
              - Refine: 15
                Chance: 6000
              - Refine: 16
-                Chance: 7000
+                Chance: 6000
              - Refine: 17
-                Chance: 7000
+                Chance: 6000
              - Refine: 18
-                Chance: 7000
+                Chance: 6000
              - Refine: 19
-                Chance: 7000
+                Chance: 6000
              - Refine: 20
-                Chance: 7000
+                Chance: 6000
            Bonus: 30
            Catalyst:
                Item: Blessed_Etel_Dust
@@ -318,15 +318,15 @@ Body:
              - Refine: 15
                Chance: 5000
              - Refine: 16
-                Chance: 6000
+                Chance: 5000
              - Refine: 17
-                Chance: 6000
+                Chance: 5000
              - Refine: 18
-                Chance: 6000
+                Chance: 5000
              - Refine: 19
-                Chance: 6000
+                Chance: 5000
              - Refine: 20
-                Chance: 6000
+                Chance: 5000
            Bonus: 50
            AnnounceFail: true
            Catalyst:
@@ -357,15 +357,15 @@ Body:
              - Refine: 15
                Chance: 4000
              - Refine: 16
-                Chance: 5000
+                Chance: 4000
              - Refine: 17
-                Chance: 5000
+                Chance: 4000
              - Refine: 18
-                Chance: 5000
+                Chance: 4000
              - Refine: 19
-                Chance: 5000
+                Chance: 4000
              - Refine: 20
-                Chance: 5000
+                Chance: 4000
            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: Oz Labyrinth
+    Name: The Maze of Oz
    Enter:
      Map: 1@oz
      X: 284
      Y: 167
  - Id: 68
-    Name: Thor Military Base
+    Name: Thor Gunsu Base
    Enter:
      Map: 1@tcamp
      X: 103
      Y: 237
  - Id: 69
-    Name: Wolves Gathering Place
+    Name: A Gathering Place of Wolves
    Enter:
      Map: 1@nyr
      X: 194
@@ -529,7 +529,7 @@ Body:
    AdditionalMaps:
      2@nyr: true
  - Id: 71
-    Name: High Priest's Villa
+    Name: Villa of High Priest
    Enter:
      Map: 1@adv
      X: 123
--- a/db/re/item_combos.yml
+++ b/db/re/item_combos.yml
--- 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
--- a/db/re/item_db_usable.yml
+++ b/db/re/item_db_usable.yml
--- a/db/re/item_enchant.yml
+++ b/db/re/item_enchant.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2024 rAthena Development Team
+#   Copyright(C) 2022 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -31469,698 +31469,6 @@ Body:
 #                Chance: 500
 #              - Item: Signet_Of_Wis2
 #                Chance: 500
-  - Id: 143
-    TargetItems:
-      Gaebolg_Armor: true
-      Gaebolg_Robe: true
-    Order:
-      - Slot: 3
-      - Slot: 2
-      - Slot: 1
-    Slots:
-      - Slot: 3
-        PerfectEnchants:
-          - Item: Ep21_4_Def
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Mdef
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Warrior
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Archer
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Assassin
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Magician
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-      - Slot: 2
-        PerfectEnchants:
-          - Item: Ep21_3_Berserker
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_3_Marksman
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_3_Executioner
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_3_Wizard
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-      - Slot: 1
-        PerfectEnchants:
-          - Item: Ep21_2_P_Force
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_M_Force
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_G_Cooldown
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Armor_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-  - Id: 144
-    TargetItems:
-      Gaebolg_Manteau: true
-      Gaebolg_Muffler: true
-    Order:
-      - Slot: 3
-      - Slot: 2
-      - Slot: 1
-    Slots:
-      - Slot: 3
-        PerfectEnchants:
-          - Item: Ep21_4_Def
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Mdef
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-      - Slot: 2
-        PerfectEnchants:
-          - Item: Ep21_3_Speed
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_3_Caster
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-      - Slot: 1
-        PerfectEnchants:
-          - Item: Ep21_2_Melee
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_Range
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_Critical
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_Spell
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_Ab_All
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Robe_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-  - Id: 145
-    TargetItems:
-      Gaebolg_Boots: true
-      Gaebolg_Shoes: true
-    Order:
-      - Slot: 3
-      - Slot: 2
-      - Slot: 1
-    Slots:
-      - Slot: 3
-        PerfectEnchants:
-          - Item: Ep21_4_Hp
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Sp
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Phy_Force
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-          - Item: Ep21_4_Mag_Force
-            Price: 1000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone1
-                Amount: 50
-              - Material: EP19_S_F_1_Extract
-                Amount: 20
-              - Material: EP19_S_F_2_Extract
-                Amount: 20
-              - Material: EP19_Gla_Extract
-                Amount: 20
-              - Material: EP19_S_F_3_Extract
-                Amount: 10
-              - Material: EP20_D_P_Extract
-                Amount: 10
-      - Slot: 2
-        PerfectEnchants:
-          - Item: Ep21_3_Size_Atk
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_3_Size_Matk
-            Price: 2000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone2
-                Amount: 25
-              - Material: EP19_S_F_1_Extract
-                Amount: 30
-              - Material: EP19_S_F_2_Extract
-                Amount: 30
-              - Material: EP19_Gla_Extract
-                Amount: 30
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-      - Slot: 1
-        PerfectEnchants:
-          - Item: Ep21_2_Ov_Power
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_Fi_Shot
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_Luk_Strike
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-          - Item: Ep21_2_Spl_Buster
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Shoes_E_Stone3
-                Amount: 15
-              - Material: EP19_S_F_1_Extract
-                Amount: 40
-              - Material: EP19_S_F_2_Extract
-                Amount: 40
-              - Material: EP19_Gla_Extract
-                Amount: 40
-              - Material: EP19_S_F_3_Extract
-                Amount: 20
-              - Material: EP20_D_P_Extract
-                Amount: 20
-  - Id: 146
-    TargetItems:
-      Gaebolg_Ring: true
-      Gaebolg_Earring: true
-      Gaebolg_Glove: true
-      Gaebolg_Necklace: true
-    Order:
-      - Slot: 3
-      - Slot: 2
-      - Slot: 1
-    Slots:
-      - Slot: 3
-        PerfectEnchants:
-          - Item: Ep21_4_F_Spirit
-            Price: 1500000
-            Materials:
-              - Material: Ep21_Acc_E_Stone1
-                Amount: 70
-              - Material: EP19_S_F_1_Extract
-                Amount: 35
-              - Material: EP19_S_F_2_Extract
-                Amount: 35
-              - Material: EP19_Gla_Extract
-                Amount: 35
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_4_E_Archer
-            Price: 1500000
-            Materials:
-              - Material: Ep21_Acc_E_Stone1
-                Amount: 70
-              - Material: EP19_S_F_1_Extract
-                Amount: 35
-              - Material: EP19_S_F_2_Extract
-                Amount: 35
-              - Material: EP19_Gla_Extract
-                Amount: 35
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_4_Fatal
-            Price: 1500000
-            Materials:
-              - Material: Ep21_Acc_E_Stone1
-                Amount: 70
-              - Material: EP19_S_F_1_Extract
-                Amount: 35
-              - Material: EP19_S_F_2_Extract
-                Amount: 35
-              - Material: EP19_Gla_Extract
-                Amount: 35
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-          - Item: Ep21_4_Sp_Power
-            Price: 1500000
-            Materials:
-              - Material: Ep21_Acc_E_Stone1
-                Amount: 70
-              - Material: EP19_S_F_1_Extract
-                Amount: 35
-              - Material: EP19_S_F_2_Extract
-                Amount: 35
-              - Material: EP19_Gla_Extract
-                Amount: 35
-              - Material: EP19_S_F_3_Extract
-                Amount: 15
-              - Material: EP20_D_P_Extract
-                Amount: 15
-      - Slot: 2
-        PerfectEnchants:
-          - Item: Ep21_3_Tenacity
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Acc_E_Stone2
-                Amount: 35
-              - Material: EP19_S_F_1_Extract
-                Amount: 45
-              - Material: EP19_S_F_2_Extract
-                Amount: 45
-              - Material: EP19_Gla_Extract
-                Amount: 45
-              - Material: EP19_S_F_3_Extract
-                Amount: 25
-              - Material: EP20_D_P_Extract
-                Amount: 25
-          - Item: Ep21_3_M_Archer
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Acc_E_Stone2
-                Amount: 35
-              - Material: EP19_S_F_1_Extract
-                Amount: 45
-              - Material: EP19_S_F_2_Extract
-                Amount: 45
-              - Material: EP19_Gla_Extract
-                Amount: 45
-              - Material: EP19_S_F_3_Extract
-                Amount: 25
-              - Material: EP20_D_P_Extract
-                Amount: 25
-          - Item: Ep21_3_Acute
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Acc_E_Stone2
-                Amount: 35
-              - Material: EP19_S_F_1_Extract
-                Amount: 45
-              - Material: EP19_S_F_2_Extract
-                Amount: 45
-              - Material: EP19_Gla_Extract
-                Amount: 45
-              - Material: EP19_S_F_3_Extract
-                Amount: 25
-              - Material: EP20_D_P_Extract
-                Amount: 25
-          - Item: Ep21_3_M_Eessence
-            Price: 3000000
-            Materials:
-              - Material: Ep21_Acc_E_Stone2
-                Amount: 35
-              - Material: EP19_S_F_1_Extract
-                Amount: 45
-              - Material: EP19_S_F_2_Extract
-                Amount: 45
-              - Material: EP19_Gla_Extract
-                Amount: 45
-              - Material: EP19_S_F_3_Extract
-                Amount: 25
-              - Material: EP20_D_P_Extract
-                Amount: 25
-      - Slot: 1
-        PerfectEnchants:
-          - Item: Ep21_2_Phy_Power
-            Price: 4500000
-            Materials:
-              - Material: Ep21_Acc_E_Stone3
-                Amount: 20
-              - Material: EP19_S_F_1_Extract
-                Amount: 65
-              - Material: EP19_S_F_2_Extract
-                Amount: 65
-              - Material: EP19_Gla_Extract
-                Amount: 65
-              - Material: EP19_S_F_3_Extract
-                Amount: 35
-              - Material: EP20_D_P_Extract
-                Amount: 35
-          - Item: Ep21_2_Mag_Power
-            Price: 4500000
-            Materials:
-              - Material: Ep21_Acc_E_Stone3
-                Amount: 20
-              - Material: EP19_S_F_1_Extract
-                Amount: 65
-              - Material: EP19_S_F_2_Extract
-                Amount: 65
-              - Material: EP19_Gla_Extract
-                Amount: 65
-              - Material: EP19_S_F_3_Extract
-                Amount: 35
-              - Material: EP20_D_P_Extract
-                Amount: 35
  - Id: 147
    TargetItems:
      StormBow_Furious: true
@@ -32175,32 +31483,6 @@ Body:
      Demonsword_Furious: true
      Foxtail_Furious: true
      Setaria_Furious: true
-      OverSpear_Furious: true
-      Lance_Furious: true
-      Impact_Furious: true
-      RightShape_Furious: true
-      Humma_Furious: true
-      WheelHumma_Furious: true
-      GiganticAxe_Furious: true
-      Hammer_Furious: true
-      MasterSpellBook_Furious: true
-      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
@@ -32365,18 +31647,6 @@ Body:
      FuriousCirclet_DK: true
      FuriousCirclet_ABC: true
      FuriousCirclet_SH: true
-      FuriousCirclet_IG: true
-      FuriousCirclet_SHC: true
-      FuriousCirclet_SS: true
-      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
--- a/db/re/item_reform.yml
+++ b/db/re/item_reform.yml
--- 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: 275
+    MaxBaseLevel: 260
    BaseExp:
      - Level: 1
        Exp: 658
@@ -3886,36 +3886,6 @@ 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
@@ -3942,7 +3912,7 @@ Body:
      Night_Watch: true
      Hyper_Novice: true
      Spirit_Handler: true
-    MaxJobLevel: 60
+    MaxJobLevel: 55
    JobExp:
      - Level: 1
        Exp: 4700000
@@ -4053,14 +4023,4 @@ Body:
      - Level: 54
        Exp: 6559840847
      - Level: 55
-        Exp: 7543816974
-      - Level: 56
-        Exp: 8675389520
-      - Level: 57
-        Exp: 9976697948
-      - Level: 58
-        Exp: 11473202640
-      - Level: 59
-        Exp: 13194183036
-      - Level: 60
-        Exp: 99999999999
+        Exp: 9999999999
--- a/db/re/job_noenter_map.txt
+++ b/db/re/job_noenter_map.txt
@@ -0,0 +1,136 @@
+// 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,10 +8893,6 @@ Body:
        Crt: 1
      - Level: 55
        Sta: 1
-      - Level: 56
-        Sta: 1
-      - Level: 58
-        Con: 1
  - Jobs:
      Meister: true
      Meister2: true
@@ -9039,10 +9035,6 @@ Body:
        Wis: 1
      - Level: 55
        Pow: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Pow: 1
  - Jobs:
      Shadow_Cross: true
    MaxWeight: 32000
@@ -9184,10 +9176,6 @@ Body:
        Crt: 1
      - Level: 55
        Crt: 1
-      - Level: 57
-        Con: 1
-      - Level: 59
-        Crt: 1
  - Jobs:
      Arch_Mage: true
    MaxWeight: 30000
@@ -9225,7 +9213,7 @@ Body:
        Vit: 1
        Int: 1
      - Level: 13
-        Dex: 1
+        Agi: 1
        Spl: 1
      - Level: 14
        Sta: 1
@@ -9241,7 +9229,7 @@ Body:
        Int: 1
        Dex: 1
      - Level: 19
-        Int: 1
+        Dex: 1
      - Level: 20
        Vit: 1
        Int: 1
@@ -9329,10 +9317,6 @@ Body:
        Wis: 1
      - Level: 55
        Spl: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Spl: 1
  - Jobs:
      Cardinal: true
    MaxWeight: 30000
@@ -9475,10 +9459,6 @@ Body:
        Wis: 1
      - Level: 55
        Crt: 1
-      - Level: 56
-        Con: 1
-      - Level: 59
-        Spl: 1
  - Jobs:
      Windhawk: true
      Windhawk2: true
@@ -9621,10 +9601,6 @@ Body:
        Sta: 1
      - Level: 55
        Pow: 1
-      - Level: 57
-        Crt: 1
-      - Level: 59
-        Pow: 1
  - Jobs:
      Imperial_Guard: true
      Imperial_Guard2: true
@@ -9768,10 +9744,6 @@ Body:
      - Level: 55
        Wis: 1
        Con: 1
-      - Level: 57
-        Pow: 1
-      - Level: 59
-        Spl: 1
  - Jobs:
      Biolo: true
    MaxWeight: 32000
@@ -9913,10 +9885,6 @@ Body:
        Crt: 1
      - Level: 55
        Con: 1
-      - Level: 56
-        Sta: 1
-      - Level: 59
-        Pow: 1
  - Jobs:
      Abyss_Chaser: true
    MaxWeight: 28000
@@ -10058,10 +10026,6 @@ Body:
      - Level: 55
        Sta: 1
        Con: 1
-      - Level: 56
-        Spl: 1
-      - Level: 59
-        Pow: 1
  - Jobs:
      Elemental_Master: true
    MaxWeight: 30000
@@ -10204,10 +10168,6 @@ Body:
        Wis: 1
      - Level: 55
        Spl: 1
-      - Level: 56
-        Wis: 1
-      - Level: 59
-        Con: 1
  - Jobs:
      Inquisitor: true
    MaxWeight: 30000
@@ -10349,10 +10309,6 @@ Body:
      - Level: 55
        Pow: 1
        Wis: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Con: 1
  - Jobs:
      Troubadour: true
    MaxWeight: 32000
@@ -10494,10 +10450,6 @@ Body:
      - Level: 55
        Pow: 1
        Con: 1
-      - Level: 56
-        Spl: 1
-      - Level: 59
-        Pow: 1
  - Jobs:
      Trouvere: true
    MaxWeight: 32000
@@ -10640,10 +10592,6 @@ Body:
      - Level: 55
        Pow: 1
        Con: 1
-      - Level: 56
-        Spl: 1
-      - Level: 59
-        Pow: 1
  - Jobs:
      Sky_Emperor: true
    MaxWeight: 42000
@@ -10786,10 +10734,6 @@ Body:
      - Level: 55
        Pow: 1
        Con: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Con: 1
  - Jobs:
      Soul_Ascetic: true
    MaxWeight: 42000
@@ -10923,10 +10867,6 @@ Body:
        Sta: 1
      - Level: 55
        Spl: 1
-      - Level: 56
-        Wis: 1
-      - Level: 59
-        Con: 1
  - Jobs:
      Shinkiro: true
    MaxWeight: 45000
@@ -11070,14 +11010,6 @@ 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
@@ -11209,14 +11141,6 @@ 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
@@ -11230,6 +11154,7 @@ Body:
      - Level: 2
        Str: 1
        Agi: 1
+        Sta: 1
      - Level: 3
        Vit: 1
        Luk: 1
@@ -11265,7 +11190,6 @@ Body:
        Dex: 1
      - Level: 15
        Luk: 1
-        Sta: 1
      - Level: 16
        Vit: 1
        Int: 1
@@ -11306,13 +11230,13 @@ Body:
      - Level: 30
        Str: 1
        Int: 1
+        Sta: 1
      - Level: 31
        Dex: 1
        Con: 1
      - Level: 32
        Pow: 1
      - Level: 33
-        Sta: 1
        Crt: 1
      - Level: 34
        Crt: 1
@@ -11327,10 +11251,7 @@ Body:
      - Level: 40
        Pow: 1
      - Level: 41
-        Sta: 1
        Con: 1
-      - Level: 42
-        Sta: 1
      - Level: 43
        Crt: 1
      - Level: 44
@@ -11339,7 +11260,6 @@ Body:
        Con: 1
      - Level: 46
        Pow: 1
-        Sta: 1
      - Level: 47
        Con: 1
      - Level: 48
@@ -11357,10 +11277,6 @@ Body:
        Wis: 1
      - Level: 55
        Pow: 1
-      - Level: 56
-        Wis: 1
-      - Level: 59
-        Crt: 1
  - Jobs:
      Hyper_Novice: true
    MaxWeight: 40000
@@ -11506,12 +11422,6 @@ 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
@@ -11653,7 +11563,3 @@ 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
@@ -102,7 +102,7 @@
 1019,Peco Peco@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,6,,,,,,
 1019,Peco Peco@NPC_FIREATTACK,attack,186,1,2000,0,5000,yes,target,always,0,,,,,,,
 1019,Peco Peco@NPC_PROVOCATION,chase,194,1,200,0,5000,yes,target,always,0,,,,,,19,
-1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,,,,,,,
 1023,Orc Warrior@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,6,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -351,7 +351,7 @@
 1067,Cornutus@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
 1067,Cornutus@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1067,Cornutus@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,,
+1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1069,Swordfish@NPC_WATERATTACK,attack,184,1,2000,0,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,attack,86,3,500,1500,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,chase,86,3,500,1500,5000,yes,target,always,0,,,,,,,
@@ -603,9 +603,9 @@
 1117,Evil Druid@NPC_UNDEADATTACK,chase,347,3,500,500,5000,no,target,always,0,,,,,,9,
 1117,Evil Druid@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,0,,,,,,,
 1117,Evil Druid@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,0,,,,,,,
-1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1118,Flora@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
-1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,attack,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,,
@@ -1301,7 +1301,7 @@
 1276,Raydric Archer@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
-1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,target,always,0,,,,,,,
+1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
 1278,Stalactite Golem@NPC_STUNATTACK,attack,179,4,500,1500,5000,no,target,always,0,,,,,,6,
@@ -1584,7 +1584,7 @@
 1367,Blazer@WZ_SIGHTRASHER,attack,81,5,500,1000,5000,no,target,always,0,,,,,,6,
 1368,Geographer@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
 1368,Geographer@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
-1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1369,Grand Peco@AS_SONICBLOW,attack,136,5,500,800,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -2569,8 +2569,8 @@
 1510,Hylozoist@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,attack,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
@@ -2589,11 +2589,11 @@
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,skillused,83,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,longrangeattacked,,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,casttargeted,,,,,,,9,
-1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,always,0,,,,,,9,
+1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,attack,80,10,5000,0,2000,yes,around2,always,0,,,,,,,
-1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,,
+1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,randomtarget,always,0,,,,,,,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,5000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1511,Amon Ra@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -3405,18 +3405,18 @@
 1663,Laurell Weinder@NPC_EMOTION,idle,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,attack,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,chase,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,target,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1668,Archdam@NPC_PIERCINGATT,attack,158,5,1000,0,5000,yes,target,always,0,,,,,,,
 1668,Archdam@NPC_GUIDEDATTACK,attack,172,2,500,1000,20000,no,target,always,0,,,,,,29,
 1668,Archdam@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,,
@@ -3453,9 +3453,9 @@
 1673,Dimik@NPC_COMBOATTACK,attack,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_COMBOATTACK,chase,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_FIREATTACK,attack,186,3,500,0,5000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1675,Venatu@NPC_SILENCEATTACK,attack,178,3,500,700,5000,no,target,always,0,,,,,,,
 1675,Venatu@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
 1675,Venatu@NPC_STUNATTACK,attack,179,2,500,1500,5000,no,target,always,0,,,,,,11,
@@ -3531,11 +3531,11 @@
 1688,Lady Tany@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@AL_TELEPORT,attack,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,target,myhpltmaxrate,60,,,,,,,
-1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,target,always,0,,,,,,,
+1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,randomtarget,always,0,,,,,,,
 1688,Lady Tany@NPC_DEFENDER,attack,205,1,500,0,30000,yes,self,longrangeattacked,,,,,,,29,
 1688,Lady Tany@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
 1688,Lady Tany@NPC_SUMMONSLAVE,attack,196,5,10000,2000,5000,no,self,slavele,2,1691,,,,,,
@@ -4063,7 +4063,7 @@
 1764,Skeggiold@NPC_HOLYATTACK,chase,189,2,500,500,5000,no,target,always,0,,,,,,18,
 1764,Skeggiold@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1764,Skeggiold@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1765,Valkyrie@AL_HEAL,idle,28,11,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
+1765,Valkyrie@AL_HEAL,idle,28,10,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_HEAL,attack,28,11,10000,500,10000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1765,Valkyrie@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
@@ -4228,18 +4228,18 @@
 1779,Ktullanux@NPC_AGIUP,attack,350,5,2000,0,100000,yes,self,always,0,,,,,,,
 1779,Ktullanux@NPC_AGIUP,attack,350,5,10000,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 1779,Ktullanux@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,6,
-1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,randomtarget,always,0,,,,,,6,
+1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1780,Muscipular@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
 1780,Muscipular@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,target,always,0,,,,,,,
-1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1781,Drosera@RG_CLOSECONFINE,attack,1005,1,1000,0,30000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
-1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,randomtarget,always,0,,,,,,6,
+1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1782,Roween@NPC_WINDATTACK,attack,187,2,500,500,5000,no,target,always,0,,,,,,,
 1782,Roween@NPC_COMBOATTACK,attack,171,4,500,500,5000,no,target,always,0,,,,,,6,
 1782,Roween@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,22,0x308D,,,,,
@@ -5704,11 +5704,30 @@

 //****
 // NC Mechanic Summons
-2042,Silver Sniper@NPC_REVENGE,idle,333,1,10000,0,0,yes,self,masterattacked,0,,,,,,,
-2043,Magic Decoy Fire@MG_FIREBOLT,idle,19,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2044,Magic Decoy Water@MG_COLDBOLT,idle,14,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2045,Magic Decoy Earth@WZ_EARTHSPIKE,idle,90,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,idle,20,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
+2042,Silver Sniper@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@NPC_REVENGE,idle,333,1,10000,0,0,yes,self,always,0,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,attack,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,chase,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,attack,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,chase,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,attack,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,chase,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,attack,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,chase,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,

 //2053,Dimik@NPC_ATTRICHANGE,idle,161,1,500,2000,50000,no,self,always,0,,,,,,10,
 //2053,Dimik@NPC_EMOTION_ON,idle,474,1,100,0,60000,yes,self,always,0,20,0x81,,,,,
@@ -7961,8 +7980,8 @@
 2311,Manananggal@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 2311,Manananggal@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 2311,Manananggal@AL_TELEPORT,attack,26,1,100,0,30000,yes,self,always,0,,,,,,,
-2311,Manananggal@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
-2311,Manananggal@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
+2311,Manananggal@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
+2311,Manananggal@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
 2311,Manananggal@NPC_COMBOATTACK,chase,171,5,1000,0,5000,yes,target,always,0,,,,,,7,
 2311,Manananggal@NPC_COMBOATTACK,attack,171,5,1000,0,5000,yes,target,always,0,,,,,,7,
 2312,Mangkukulam@AL_TELEPORT,idle,26,1,500,0,30000,yes,self,always,0,,,,,,,
@@ -7990,8 +8009,8 @@
 2315,Wakwak@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 2315,Wakwak@AL_TELEPORT,idle,26,1,500,0,30000,yes,self,always,0,,,,,,,
 2315,Wakwak@AL_TELEPORT,attack,26,1,50,0,30000,yes,self,always,0,,,,,,,
-2315,Wakwak@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
-2315,Wakwak@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
+2315,Wakwak@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
+2315,Wakwak@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
 2315,Wakwak@NPC_DARKTHUNDER,chase,341,3,1000,500,5000,yes,target,always,0,,,,,,29,
 2315,Wakwak@NPC_DARKTHUNDER,attack,341,3,1000,500,5000,yes,target,always,0,,,,,,29,
 2315,Wakwak@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,0,
@@ -8094,7 +8113,7 @@
 2331,Seaweed@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,100,,,,,,2,
 2337,Hidden Mob@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,0,,,,,,,
 2337,Hidden Mob@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,0,,,,,,,
-2337,Hidden Mob@WZ_METEOR,attack,83,5,10000,0,1000,yes,target,always,0,,,,,,,
+2337,Hidden Mob@WZ_METEOR,attack,83,5,10000,0,1000,yes,randomtarget,always,0,,,,,,,
 2338,Bangungot Manananggal@AL_TELEPORT,idle,26,1,500,0,5000,yes,self,always,0,,,,,,,
 2338,Bangungot Manananggal@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,no,target,always,0,,,,,,3,
 2338,Bangungot Manananggal@NPC_COMBOATTACK,attack,171,5,500,700,5000,no,target,always,0,,,,,,1,
@@ -8110,11 +8129,11 @@
 2339,Bangungot Mangkukulam@NPC_DARKSTRIKE,chase,340,9,500,700,5000,no,target,always,0,,,,,,29,
 2339,Bangungot Mangkukulam@NPC_MENTALBREAKER,attack,159,3,500,800,5000,no,target,always,0,,,,,,14,
 2339,Bangungot Mangkukulam@NPC_MENTALBREAKER,chase,159,3,500,800,5000,no,target,always,0,,,,,,14,
-2340,Tiyanak@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,2,
+2340,Tiyanak@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,randomtarget,always,0,,,,,,2,
 2340,Tiyanak@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,29,,,,,,
 2340,Tiyanak@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
 2340,Tiyanak@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
-2340,Tiyanak@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
+2340,Tiyanak@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6,
 2340,Tiyanak@NPC_REBIRTH,dead,208,3,2000,0,10000,yes,self,always,0,,,,,,,
 2341,RWC Boss@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
 2341,RWC Boss@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
@@ -8143,7 +8162,7 @@
 2341,RWC Boss@NPC_CRITICALWOUND,attack,673,4,2000,0,5000,yes,target,always,0,,,,,,,
 2343,Hidden Mob@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,0,,,,,,,
 2343,Hidden Mob@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,0,,,,,,,
-2343,Hidden Mob@WZ_STORMGUST,attack,89,5,10000,0,1000,yes,target,always,0,,,,,,,
+2343,Hidden Mob@WZ_STORMGUST,attack,89,5,10000,0,1000,yes,randomtarget,always,0,,,,,,,

 // Nightmare Pyramids
 2353,Nightmare Minorous@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
@@ -8179,8 +8198,8 @@
 2360,Nightmare Ancient Mummy@NPC_DARKBREATH,attack,202,4,500,800,5000,no,target,always,0,,,,,,7,
 2362,Nightmare Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 2362,Nightmare Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
-2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
-2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
+2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
+2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 2362,Nightmare Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,longrangeattacked,0,2357,2359,2361,,,9,
 2362,Nightmare Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9,
 2362,Nightmare Amon Ra@NPC_SUMMONMONSTER,attack,209,5,5000,0,10000,no,self,longrangeattacked,0,2357,2359,2361,,,9,
@@ -8199,11 +8218,11 @@
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,skillused,83,,,,,,9,
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,longrangeattacked,,,,,,,9,
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,casttargeted,,,,,,,9,
-2362,Nightmare Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,always,0,,,,,,9,
+2362,Nightmare Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,randomtarget,always,0,,,,,,9,
 2362,Nightmare Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 2362,Nightmare Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 2362,Nightmare Amon Ra@WZ_FIREPILLAR,attack,80,10,5000,0,2000,yes,around2,always,0,,,,,,,
-2362,Nightmare Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,,
+2362,Nightmare Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,randomtarget,always,0,,,,,,,
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,5000,yes,randomtarget,always,0,,,,,,9,
 2362,Nightmare Amon Ra@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2362,Nightmare Amon Ra@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -8837,11 +8856,11 @@
 2481,Wraith Dead (Nightmare)@NPC_ENERGYDRAIN,attack,200,1,500,0,5000,yes,target,always,,,,,,,9,
 2483,Baphomet (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2483,Baphomet (Nightmare)@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-2483,Baphomet (Nightmare)@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
+2483,Baphomet (Nightmare)@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
 2483,Baphomet (Nightmare)@KN_BRANDISHSPEAR,attack,57,10,2000,500,5000,no,target,always,,,,,,,29,
-2483,Baphomet (Nightmare)@WZ_VERMILION,attack,85,21,2000,500,2000,no,target,always,,,,,,,29,
-2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,21,2000,500,2000,no,target,always,,,,,,,29,
-2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,21,5000,500,2000,no,target,skillused,18,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,attack,85,10,2000,500,2000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,10,2000,500,2000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,10,5000,500,2000,no,target,skillused,18,,,,,,29,
 2483,Baphomet (Nightmare)@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,,,,,,,,
 2483,Baphomet (Nightmare)@NPC_DARKBREATH,attack,202,5,2000,800,5000,no,target,always,,,,,,,29,
 2483,Baphomet (Nightmare)@MO_BODYRELOCATION,chase,264,1,2000,200,1000,yes,target,always,,,,,,,,
@@ -8929,15 +8948,15 @@
 2534,Blue Faceworm Queen@WZ_STORMGUST,chase,89,10,2000,1000,5000,no,target,always,,,,,,,,
 2534,Blue Faceworm Queen@WZ_STORMGUST,attack,89,10,2000,1000,5000,no,target,always,,,,,,,,
 2534,Blue Faceworm Queen@NPC_WATERATTACK,attack,184,9,3000,500,5000,no,target,always,,,,,,,,
-2534,Blue Faceworm Queen@MG_FROSTDIVER,chase,15,40,10000,500,5000,yes,target,always,,,,,,,,
-2535,Yellow Faceworm Queen@WZ_VERMILION,attack,85,21,2000,1000,10000,no,target,always,,,,,,,,
-2535,Yellow Faceworm Queen@WZ_VERMILION,chase,85,21,5000,1000,10000,no,target,always,,,,,,,,
+2534,Blue Faceworm Queen@MG_FROSTDIVER,chase,15,10,10000,500,5000,yes,target,always,,,,,,,,
+2535,Yellow Faceworm Queen@WZ_VERMILION,attack,85,10,2000,1000,10000,no,target,always,,,,,,,,
+2535,Yellow Faceworm Queen@WZ_VERMILION,chase,85,10,5000,1000,10000,no,target,always,,,,,,,,
 2535,Yellow Faceworm Queen@NPC_WIDEBLEEDING,chase,665,3,10000,2000,30000,no,self,always,,,,,,,36,
 2535,Yellow Faceworm Queen@NPC_WIDEBLEEDING,attack,665,3,10000,2000,30000,no,self,always,,,,,,,36,
 2535,Yellow Faceworm Queen@WZ_JUPITEL,attack,84,9,1000,500,5000,yes,target,always,,,,,,,,
 2535,Yellow Faceworm Queen@WZ_JUPITEL,chase,84,9,1000,500,5000,yes,target,always,,,,,,,,
 2535,Yellow Faceworm Queen@NPC_WINDATTACK,attack,187,9,3000,500,5000,no,target,always,,,,,,,,
-2535,Yellow Faceworm Queen@MG_THUNDERSTORM,attack,21,20,2000,1000,5000,no,target,always,,,,,,,,
+2535,Yellow Faceworm Queen@MG_THUNDERSTORM,attack,21,10,2000,1000,5000,no,target,always,,,,,,,,
 2536,Monster 3@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,,,,,,,,
 2536,Monster 3@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,,,,,,,,
 2536,Monster 3@NPC_VENOMFOG,idle,706,1,10000,0,3000,yes,self,always,,,,,,,,
@@ -9821,7 +9840,7 @@
 2741,Muka Ringleader@NPC_PIERCINGATT,attack,158,2,500,0,5000,yes,target,always,,,,,,,6,
 2741,Muka Ringleader@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
 2741,Muka Ringleader@NPC_SUMMONSLAVE,idle,196,2,10000,700,30000,no,self,slavele,0,1055,,,,,,
-2742,Furious Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2742,Furious Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
 2742,Furious Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
 2742,Furious Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2742,Furious Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -9834,7 +9853,7 @@
 2742,Furious Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,,
 2742,Furious Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,,
 2742,Furious Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,,
-2743,Elusive Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2743,Elusive Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
 2743,Elusive Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
 2743,Elusive Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2743,Elusive Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -9850,7 +9869,7 @@
 2744,Swift Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2744,Swift Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 2744,Swift Incarnation of Morocc@AL_TELEPORT,attack,26,1,500,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
-2744,Swift Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2744,Swift Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
 2744,Swift Incarnation of Morocc@AL_HEAL,attack,28,5,10000,500,5000,yes,self,myhpltmaxrate,50,,,,,,,
 2744,Swift Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
 2744,Swift Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
@@ -11368,7 +11387,7 @@
 3209,V_MAGALETA@AL_HEAL,idle,28,9,300,0,2000,yes,self,myhpltmaxrate,99,,,,,,3,
 3209,V_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,self,myhpltmaxrate,99,,,,,,,
 3209,V_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,friend,friendhpltmaxrate,99,,,,,,,
-3209,V_MAGALETA@AL_DECAGI,chase,30,48,200,0,10000,yes,target,always,,,,,,,,
+3209,V_MAGALETA@AL_DECAGI,chase,30,10,200,0,10000,yes,target,always,,,,,,,,
 3209,V_MAGALETA@NPC_MAXPAIN,chase,716,5,1000,1000,60000,no,self,longrangeattacked,,,,,,,19,
 3209,V_MAGALETA@PR_LEXDIVINA,chase,76,10,500,0,10000,yes,target,casttargeted,,,,,,,18,
 3209,V_MAGALETA@PR_LEXAETERNA,chase,78,1,100,0,10000,yes,target,always,,,,,,,29,
@@ -11386,11 +11405,11 @@
 3209,V_MAGALETA@NPC_WIDESILENCE,attack,663,2,300,500,5000,no,self,always,,,,,,,,
 3210,V_KATRINN@MG_SIGHT,idle,10,1,200,0,10000,yes,self,always,,,,,,,,
 3210,V_KATRINN@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3210,V_KATRINN@WZ_JUPITEL,chase,84,28,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@WZ_JUPITEL,chase,84,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WZ_WATERBALL,chase,86,5,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@NPC_DARKSTRIKE,chase,340,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@MG_FIREWALL,chase,18,10,300,0,10000,yes,target,always,,,,,,,,
-3210,V_KATRINN@MG_FROSTDIVER,chase,15,40,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@MG_FROSTDIVER,chase,15,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@HW_NAPALMVULCAN,chase,400,5,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WZ_FROSTNOVA,chase,88,10,300,0,10000,yes,target,longrangeattacked,,,,,,,,
 3210,V_KATRINN@WL_EARTHSTRAIN,chase,2216,5,300,0,10000,yes,target,always,,,,,,,,
@@ -11401,7 +11420,7 @@
 3210,V_KATRINN@NPC_WIDEFREEZE,attack,664,3,300,500,10000,no,self,always,,,,,,,,
 3210,V_KATRINN@NPC_DARKSTRIKE,attack,340,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WL_TETRAVORTEX,attack,2217,2,300,500,10000,no,target,always,,,,,,,,
-3210,V_KATRINN@WZ_JUPITEL,attack,84,28,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@WZ_JUPITEL,attack,84,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WL_EARTHSTRAIN,attack,2216,3,300,500,10000,no,target,always,,,,,,,,
 3210,V_KATRINN@WZ_SIGHTRASHER,attack,81,10,300,0,10000,yes,self,always,,,,,,,,
 3210,V_KATRINN@NPC_SUMMONSLAVE,attack,196,1,50,0,600000,yes,self,slavele,0,1641,,,,,,
@@ -11470,11 +11489,11 @@
 3215,V_G_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,self,myhpltmaxrate,99,,,,,,,
 3215,V_G_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,friend,friendhpltmaxrate,99,,,,,,,
 3215,V_G_MAGALETA@AL_INCAGI,chase,29,10,200,0,240000,yes,self,always,,,,,,,2,
-3215,V_G_MAGALETA@AL_DECAGI,chase,30,48,200,0,10000,yes,target,always,,,,,,,,
+3215,V_G_MAGALETA@AL_DECAGI,chase,30,10,200,0,10000,yes,target,always,,,,,,,,
 3215,V_G_MAGALETA@NPC_WIDESILENCE,chase,663,2,500,0,10000,yes,target,casttargeted,,,,,,,18,
 3215,V_G_MAGALETA@AL_PNEUMA,chase,25,1,500,0,10000,yes,self,longrangeattacked,,,,,,,19,
-3215,V_G_MAGALETA@AL_HEAL,chase,28,11,300,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3,
-3215,V_G_MAGALETA@AL_HEAL,chase,28,11,300,0,1500,yes,self,myhpltmaxrate,99,,,,,,3,
+3215,V_G_MAGALETA@AL_HEAL,chase,28,10,300,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3,
+3215,V_G_MAGALETA@AL_HEAL,chase,28,10,300,0,1500,yes,self,myhpltmaxrate,99,,,,,,3,
 3215,V_G_MAGALETA@AL_INCAGI,attack,29,10,200,0,240000,yes,self,always,,,,,,,2,
 3215,V_G_MAGALETA@MG_SAFETYWALL,attack,12,10,100,0,10000,yes,self,always,,,,,,,,
 3215,V_G_MAGALETA@AL_PNEUMA,attack,25,1,500,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -11491,14 +11510,14 @@
 3216,V_G_KATRINN@NPC_WIDEFREEZE,chase,664,5,300,3000,10000,no,self,always,,,,,,,,
 3216,V_G_KATRINN@HW_NAPALMVULCAN,chase,400,5,200,1000,2000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_STORMGUST2,chase,723,3,300,1000,10000,no,target,always,,,,,,,,
-3216,V_G_KATRINN@WZ_VERMILION,chase,85,21,300,1000,10000,no,target,always,,,,,,,,
-3216,V_G_KATRINN@WZ_METEOR,chase,83,11,300,1000,10000,no,target,always,,,,,,,,
+3216,V_G_KATRINN@WZ_VERMILION,chase,85,10,300,1000,10000,no,target,always,,,,,,,,
+3216,V_G_KATRINN@WZ_METEOR,chase,83,10,300,1000,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_COMET,attack,708,5,300,1000,7000,no,self,always,,,,,,,,
 3216,V_G_KATRINN@NPC_STORMGUST2,attack,723,3,200,1000,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_WIDESTONE,attack,666,1,200,1000,10000,no,self,always,,,,,,,,
 3216,V_G_KATRINN@HW_GANBANTEIN,attack,483,1,300,500,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@WL_EARTHSTRAIN,attack,2216,5,300,1000,7000,no,target,always,,,,,,,,
-3216,V_G_KATRINN@WZ_JUPITEL,attack,84,28,200,1000,10000,no,target,always,,,,,,,,
+3216,V_G_KATRINN@WZ_JUPITEL,attack,84,10,200,1000,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@WL_TETRAVORTEX,attack,2217,5,300,1000,7000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_WIDEFREEZE,attack,664,5,200,1000,10000,no,self,always,,,,,,,,
 3217,V_G_SHECIL@NPC_AGIUP,idle,350,1,1000,0,600000,yes,self,always,,,,,,,,
@@ -11515,7 +11534,7 @@
 3218,V_G_HARWORD@NPC_SELFDESTRUCTION,attack,173,1,200,2000,0,no,self,myhpltmaxrate,10,,,,,,,
 3218,V_G_HARWORD@BS_ADRENALINE,attack,111,10,200,0,150000,yes,self,always,,,,,,,,
 3218,V_G_HARWORD@BS_MAXIMIZE,attack,114,1,100,0,60000,yes,self,always,,,,,,,,
-3218,V_G_HARWORD@MC_MAMMONITE,attack,42,22,200,0,10000,yes,target,always,,,,,,,23,
+3218,V_G_HARWORD@MC_MAMMONITE,attack,42,10,200,0,10000,yes,target,always,,,,,,,23,
 3218,V_G_HARWORD@BS_HAMMERFALL,attack,110,10,200,0,30000,yes,target,always,,,,,,,,
 3218,V_G_HARWORD@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
 3218,V_G_HARWORD@NPC_SPLASHATTACK,attack,174,1,100,0,0,yes,target,attackpcge,2,,,,,,,
@@ -11529,7 +11548,7 @@
 3219,V_G_SEYREN@SM_PROVOKE,chase,6,10,100,0,10000,yes,target,always,,,,,,,29,
 3219,V_G_SEYREN@SM_ENDURE,chase,8,10,500,0,30000,yes,self,longrangeattacked,,,,,,,6,
 3219,V_G_SEYREN@NPC_DARKPIERCING,chase,715,1,100,0,10000,yes,target,always,,,,,,,,
-3219,V_G_SEYREN@KN_TWOHANDQUICKEN,attack,60,30,1000,0,300000,yes,self,always,,,,,,,2,
+3219,V_G_SEYREN@KN_TWOHANDQUICKEN,attack,60,10,1000,0,300000,yes,self,always,,,,,,,2,
 3219,V_G_SEYREN@LK_SPIRALPIERCE,attack,397,5,200,0,10000,yes,target,always,,,,,,,,
 3219,V_G_SEYREN@NPC_POWERUP,attack,349,5,200,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 3219,V_G_SEYREN@NPC_DRAGONBREATH,attack,731,5,300,500,10000,no,target,always,,,,,,,,
@@ -11620,7 +11639,7 @@
 3223,V_B_HARWORD@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,yes,self,myhpltmaxrate,30,3219,3214,3215,3216,3217,,
 3223,V_B_HARWORD@BS_ADRENALINE,attack,111,10,200,0,150000,yes,self,always,,,,,,,,
 3223,V_B_HARWORD@BS_MAXIMIZE,attack,114,1,100,0,60000,yes,self,always,,,,,,,,
-3223,V_B_HARWORD@MC_MAMMONITE,attack,42,22,200,0,10000,yes,target,always,,,,,,,23,
+3223,V_B_HARWORD@MC_MAMMONITE,attack,42,10,200,0,10000,yes,target,always,,,,,,,23,
 3223,V_B_HARWORD@BS_HAMMERFALL,attack,110,10,200,0,10000,yes,target,always,,,,,,,,
 3223,V_B_HARWORD@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
 3223,V_B_HARWORD@NPC_MAXPAIN,attack,716,10,500,1000,10000,no,self,always,,,,,,,19,
@@ -11642,7 +11661,7 @@
 3224,V_B_KATRINN@NPC_WIDESTONE,attack,666,1,200,1000,10000,no,self,always,,,,,,,,
 3224,V_B_KATRINN@HW_GANBANTEIN,attack,483,1,300,500,10000,no,target,always,,,,,,,,
 3224,V_B_KATRINN@WL_EARTHSTRAIN,attack,2216,5,300,1000,7000,no,target,always,,,,,,,,
-3224,V_B_KATRINN@WZ_JUPITEL,attack,84,28,200,1000,10000,no,target,always,,,,,,,,
+3224,V_B_KATRINN@WZ_JUPITEL,attack,84,10,200,1000,10000,no,target,always,,,,,,,,
 3224,V_B_KATRINN@WL_TETRAVORTEX,attack,2217,5,300,1000,7000,no,target,always,,,,,,,,
 3224,V_B_KATRINN@NPC_WIDEFREEZE,attack,664,5,200,1000,10000,no,self,always,,,,,,,,
 3224,V_B_KATRINN@NPC_WIDESILENCE,attack,663,5,200,1000,10000,no,self,always,,,,,,,,
@@ -11656,7 +11675,7 @@
 3225,V_B_SEYREN@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3225,V_B_SEYREN@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3225,V_B_SEYREN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3214,3218,3215,3216,3217,,
-3225,V_B_SEYREN@KN_TWOHANDQUICKEN,attack,60,30,1000,0,300000,yes,self,always,,,,,,,2,
+3225,V_B_SEYREN@KN_TWOHANDQUICKEN,attack,60,10,1000,0,300000,yes,self,always,,,,,,,2,
 3225,V_B_SEYREN@LK_SPIRALPIERCE,attack,397,5,200,0,10000,yes,target,always,,,,,,,,
 3225,V_B_SEYREN@NPC_DRAGONBREATH,attack,731,10,300,500,10000,no,target,always,,,,,,,,
 3225,V_B_SEYREN@NPC_DRAGONBREATH,attack,731,5,300,500,10000,no,target,always,,,,,,,,
@@ -11705,7 +11724,7 @@
 3228,V_CELIA@NPC_WIDEWEB,chase,721,1,500,1000,10000,no,self,always,,,,,,,,
 3228,V_CELIA@NPC_PSYCHIC_WAVE,chase,736,1,500,0,10000,no,target,always,,,,,,,,
 3228,V_CELIA@SA_DISPELL,chase,289,5,50,0,10000,yes,target,always,,,,,,,,
-3228,V_CELIA@MG_THUNDERSTORM,chase,21,20,300,500,10000,no,target,always,,,,,,,,
+3228,V_CELIA@MG_THUNDERSTORM,chase,21,10,300,500,10000,no,target,always,,,,,,,,
 3228,V_CELIA@NPC_WIDESOULDRAIN,chase,680,4,300,0,10000,no,self,always,,,,,,,,
 3228,V_CELIA@NPC_MENTALBREAKER,attack,159,3,50,800,10000,no,target,always,,,,,,,,
 3228,V_CELIA@SA_DISPELL,attack,289,5,300,0,10000,yes,target,always,,,,,,,,
@@ -11718,7 +11737,7 @@
 3229,V_CHEN@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3229,V_CHEN@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3229,V_CHEN@MO_BODYRELOCATION,chase,264,1,200,500,5000,no,target,always,,,,,,,28,
-3229,V_CHEN@AL_DECAGI,chase,30,48,200,0,10000,yes,target,always,,,,,,,,
+3229,V_CHEN@AL_DECAGI,chase,30,10,200,0,10000,yes,target,always,,,,,,,,
 3229,V_CHEN@MO_BALKYOUNG,attack,1016,1,10,0,10000,no,target,always,,,,,,,19,
 3229,V_CHEN@MO_EXTREMITYFIST,attack,271,1,500,1000,6000,no,target,always,,,,,,,,
 3229,V_CHEN@NPC_CRITICALSLASH,attack,170,1,100,0,10000,yes,target,always,,,,,,,,
@@ -12740,7 +12759,7 @@
 3756,Bomi@NPC_SUMMONSLAVE,idle,196,1,10000,200,10000,no,self,slavele,2,3751,,,,,,
 3756,Bomi@NPC_WIDESUCK,idle,722,1,10000,500,30000,no,self,always,0,,,,,,,
 3757,Dracula of Rage@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-3757,Dracula of Rage@AL_DECAGI,chase,30,48,2000,0,5000,no,target,always,0,,,,,,,
+3757,Dracula of Rage@AL_DECAGI,chase,30,10,2000,0,5000,no,target,always,0,,,,,,,
 3757,Dracula of Rage@AS_GRIMTOOTH,chase,137,5,2000,0,5000,yes,target,always,0,,,,,,,
 3757,Dracula of Rage@NPC_CRITICALWOUND,chase,673,5,2000,500,12000,no,target,myhpltmaxrate,50,,,,,,,
 3757,Dracula of Rage@NPC_HELLJUDGEMENT,attack,662,10,10000,500,20000,no,self,myhpltmaxrate,80,,,,,,36,
@@ -12828,12 +12847,12 @@
 3763,Resentful Soldier@NPC_UNDEADATTACK,attack,347,5,500,500,5000,no,target,always,0,,,,,,,
 3763,Resentful Soldier@AC_CHARGEARROW,attack,148,1,500,0,15000,yes,target,always,0,,,,,,,
 3764,Wizard of Truth@NPC_TALK,idle,682,10,2500,0,60000,yes,self,always,0,,,,,,,55
-3764,Wizard of Truth@WZ_VERMILION,idle,85,21,10000,1000,25000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,idle,85,10,10000,1000,25000,no,target,always,0,,,,,,,
 3764,Wizard of Truth@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 3764,Wizard of Truth@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-3764,Wizard of Truth@WZ_VERMILION,chase,85,21,10000,500,27000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,chase,85,10,10000,500,27000,no,target,always,0,,,,,,,
 3764,Wizard of Truth@WZ_STORMGUST,attack,89,9,10000,1000,26000,no,target,always,0,,,,,,,
-3764,Wizard of Truth@WZ_VERMILION,attack,85,21,10000,1000,25000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,attack,85,10,10000,1000,25000,no,target,always,0,,,,,,,
 3764,Wizard of Truth@MG_FIREWALL,attack,18,9,2000,200,19000,yes,target,always,0,,,,,,,
 3764,Wizard of Truth@WZ_METEOR,attack,83,9,10000,1000,29000,no,target,always,,,,,,,,
 3764,Wizard of Truth@WZ_HEAVENDRIVE,attack,91,5,2000,1000,22000,no,target,always,0,,,,,,,
@@ -13105,108 +13124,6 @@
 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,
@@ -13606,7 +13523,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,self,myhpltmaxrate,10,,,,,,,
+20811,ILL_KRAKEN@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
 20811,ILL_KRAKEN@NPC_PHANTOMTHRUST,chase,741,5,1000,0,5000,no,self,always,0,,,,,,,
 20811,ILL_KRAKEN@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 20843,ILL_ABYSMAL_WITCH@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
@@ -13638,7 +13555,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,self,myhpltmaxrate,10,,,,,,,
+20843,ILL_ABYSMAL_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
 20843,ILL_ABYSMAL_WITCH@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,

 // Episode 17.2 - Sage's Legacy
@@ -14239,7 +14156,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,self,myhpltmaxrate,20,,,,,,,
+// 20934,R001_BESTIA@NPC_DAMAGE_HEAL,attack,753,1,3000,1500,40000,no,target,myhpltmaxrate,20,,,,,,,

 // nif_dun
 20935,GAN_CEANN@NPC_CRITICALSLASH,attack,170,1,1000,500,5000,no,target,always,0,,,,,,,
@@ -14339,7 +14256,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,self,myhpltmaxrate,10,,,,,,,
+// 20943,DEATH_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
 20943,DEATH_WITCH@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 20943,DEATH_WITCH@NPC_CALLSLAVE,attack,352,1,5000,0,30000,yes,self,always,0,,,,,,,

@@ -14570,7 +14487,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,self,myhpltmaxrate,50,,,,,,32,
+21395,ILL_MAYA@NPC_DAMAGE_HEAL,attack,753,1,500,1500,120000,no,target,myhpltmaxrate,50,,,,,,32,
 21395,ILL_MAYA@NPC_ALL_STAT_DOWN,attack,751,5,5000,1500,45000,no,target,always,0,,,,,,18,

 // Episode 18
@@ -14775,7 +14692,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,,,,,,,
@@ -14800,6 +14717,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 Skuain
+    Title: Conversation with Squain
  - Id: 3497
    Title: Conversation with Senado
  - Id: 3498
    Title: Conversation with Japer
  - Id: 3499
-    Title: Conversation with Shiroan
+    Title: Conversation with Shirouan
  - Id: 3500
-    Title: Conversation with Isira
+    Title: Conversation with Ishira
  - Id: 3501
-    Title: Conversation with Dina
+    Title: Conversation with Gina
  - Id: 3502
    Title: Conversation with Hari
  - Id: 3503
-    Title: "[Daily] Opinion Gathering"
+    Title: Examine the Sky
  - Id: 3504
-    Title: "[Cooldown] Opinion Gathering"
-    TimeLimit: 4h
+    Title: Look at the Sky - Standby
  - Id: 3505
-    Title: Completed Opinion Gathering
+    Title: Report to Junok
+    TimeLimit: 4h
  - Id: 3507
    Title: Illusion Investigation Team - Sheshin
  - Id: 3508
@@ -3234,28 +3234,26 @@ Body:
    Title: "[Standby] Subjugation-Yanggeochon"
    TimeLimit: 4h
  - Id: 5932
-    Title: Abused Child
+    Title: The Abused Child
  - Id: 5933
-    Title: Business Plan
+    Title: Business Plan Presentation
  - Id: 5934
-    Title: Foraging Practice (1)
+    Title: Gathering Training (1)
  - Id: 5935
-    Title: Foraging Practice (2)
+    Title: Gathering Training (2)
  - Id: 5936
-    Title: Foraging Practice (3)
+    Title: Gathering Training (3)
  - Id: 5937
-    Title: "[Cooldown] Half Flower Gathering"
+    Title: "[Standby] Flower Room's work"
    TimeLimit: 4h
  - Id: 5938
-    Title: "[Daily] Half Flower Gathering"
+    Title: Gathering Half Flower
  - Id: 5939
-    Title: "[Daily] Half Flower Gathering"
+    Title: Gathering Half Flower
  - Id: 5940
-    Title: "[Daily] Half Flower Gathering"
+    Title: Gathering Half Flower
  - Id: 5941
-    Title: "[Daily] Half Flower Gathering"
-  - Id: 5942
-    Title: Flower Room Opening Ceremony
+    Title: Gathering Half Flower
  - Id: 6000
    Title: Job Change to Taekwon
  - Id: 6001
@@ -6318,55 +6316,55 @@ Body:
          DROSERA: true
          MUSCIPULAR: true
  - Id: 8681
-    Title: Towards Rachel (1)
+    Title: To Rachel (1)
  - Id: 8682
-    Title: Towards Rachel (2)
+    Title: To Rachel (2)
  - Id: 8683
-    Title: Heated Argument
+    Title: Please stop fighting
  - Id: 8684
-    Title: State of Conflict
+    Title: It's over
  - Id: 8685
-    Title: Suspicious Movement
+    Title: A suspicious movement detected in the temple
  - Id: 8686
-    Title: Intruder of the Temple
+    Title: The Intruder of the Temple
  - Id: 8687
-    Title: Staged Plot
+    Title: Did you break it?
  - Id: 8688
-    Title: Today's Daily Bread
+    Title: Thanks for today's daily food
  - Id: 8689
-    Title: "[Cooldown] Today's Daily Bread"
+    Title: Today's Daily food - Standby
    TimeLimit: 4h
  - Id: 8690
-    Title: "[Daily] Today's Daily Bread"
+    Title: Thanks for today's daily food
  - Id: 8691
-    Title: Water Purification (1)
+    Title: Sacred Relics for Essence (1)
  - Id: 8692
-    Title: Water Purification (2)
+    Title: Sacred Relics for Essence (2)
  - Id: 8693
-    Title: Water Purification (3)
+    Title: Sacred Relics for Essence (3)
  - Id: 8694
-    Title: "[Cooldown] Water Purification"
+    Title: Clean Water Procurement - Standby
    TimeLimit: 4h
  - Id: 8695
-    Title: "[Daily] Water Purification (1)"
+    Title: Procurement of clean water (1)
  - Id: 8696
-    Title: "[Daily] Water Purification (2)"
+    Title: Procurement of clean water (2)
  - Id: 8697
-    Title: "[Daily] Water Purification (3)"
+    Title: Procurement of clean water (3)
  - Id: 8698
-    Title: Horim's Bizarre Adventure (1)
+    Title: Late migration
  - Id: 8699
-    Title: Horim's Bizarre Adventure (2)
+    Title: First Step Out of the City
  - Id: 8700
-    Title: Horim's Bizarre Adventure (3)
+    Title: I couldn't even come halfway
  - Id: 8701
-    Title: Horim's Bizarre Adventure (4)
+    Title: Scenery I've Seen for the First Time
  - Id: 8702
-    Title: Horim's Bizarre Adventure (5)
+    Title: Smell of Volcanic Ash
  - Id: 8703
-    Title: Horim's Bizarre Adventure (6)
+    Title: The easy way to go
  - Id: 8718
-    Title: Greetings from a Friend
+    Title: My friend's regards
  - Id: 8719
    Title: A new area somewhere in the anthill
  - Id: 8720
@@ -8040,74 +8038,14 @@ 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: RUN! - Pending
+    Title: Escape!!!! - Wait
    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: Things That Shouldn't Exist - Pending
+    Title: Present not to exist-wait
    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 Devour the Darkness - Pending
+    Title: Let the light consume the darkness - Wait
    TimeLimit: 4h
  - Id: 11596
    Title: Old Memories
@@ -8198,104 +8136,104 @@ Body:
    Title: Squirrels are rats, too? Standby
    TimeLimit: 4h
  - Id: 11696
-    Title: Niren's Request (1)
+    Title: Niren's Request
  - Id: 11697
-    Title: Niren's Request (2)
+    Title: Niren's Request
  - Id: 11698
-    Title: Niren's Request (3)
+    Title: Niren's Request
  - Id: 11699
-    Title: Niren's Request (4)
+    Title: Niren's Request
  - Id: 11700
-    Title: Niren's Request (5)
+    Title: Niren's Request
  - Id: 11701
-    Title: Niren's Request (6)
+    Title: Niren's Request
  - Id: 11702
-    Title: Niren's Request (7)
+    Title: Niren's Request
  - Id: 11703
-    Title: Niren's Request (8)
+    Title: Niren's Request
  - Id: 11704
-    Title: Gray Children (1)
+    Title: Niren's Request
  - Id: 11705
-    Title: Gray Children (2)
+    Title: Children of Grey
  - Id: 11706
-    Title: Gray Children (3)
+    Title: Children of Grey
  - Id: 11707
-    Title: Gray Children (4)
+    Title: Children of Grey
  - Id: 11708
-    Title: Gray Children (5)
+    Title: Children of Grey
  - Id: 11709
-    Title: Gray Children (6)
+    Title: Children of Grey
  - Id: 11710
-    Title: Gray Children (7)
+    Title: Children of Grey
  - Id: 11711
-    Title: Gray Children (8)
+    Title: Children of Grey
  - Id: 11712
-    Title: Gray Children (9)
+    Title: Children of Grey
  - Id: 11713
-    Title: Gray Children (10)
+    Title: Children of Grey
  - Id: 11714
-    Title: Gray Children (11)
+    Title: Children of Grey
  - Id: 11715
-    Title: Gray Children (12)
+    Title: Children of Grey
  - Id: 11716
-    Title: Gray Children (13)
+    Title: Children of Grey
  - Id: 11717
-    Title: Gray Children (14)
+    Title: Children of Grey
  - Id: 11718
-    Title: Gray Children (15)
+    Title: Children of Grey
  - Id: 11719
-    Title: Gray Children (16)
+    Title: Children of Grey
  - Id: 11720
-    Title: Gray Children (17)
+    Title: Children of Grey
  - Id: 11721
-    Title: Gray Children (18)
+    Title: Children of Grey
  - Id: 11722
-    Title: Gray Children (19)
+    Title: Children of Grey
  - Id: 11723
-    Title: Gray Children (20)
+    Title: Children of Grey
  - Id: 11724
-    Title: Gray Children (21)
+    Title: Children of Grey
  - Id: 11725
-    Title: The Labyrinth and the Merchant (1)
+    Title: Investigation of Oz Labyrinth
  - Id: 11726
-    Title: The Labyrinth and the Merchant (2)
+    Title: Investigation of Oz Labyrinth
  - Id: 11727
-    Title: The Labyrinth and the Merchant (3)
+    Title: Investigation of Oz Labyrinth
  - Id: 11728
-    Title: The Labyrinth and the Merchant (4)
+    Title: Investigation of Oz Labyrinth
  - Id: 11729
-    Title: The Labyrinth and the Merchant (5)
+    Title: Investigation of Oz Labyrinth
  - Id: 11730
-    Title: The Labyrinth and the Merchant (6)
+    Title: Investigation of Oz Labyrinth
    Targets:
      - Id: 1
        Location: oz_dun01
        Count: 10
  - Id: 11731
-    Title: The Labyrinth and the Merchant (7)
+    Title: Investigation of Oz Labyrinth
  - Id: 11732
-    Title: The Labyrinth and the Merchant (8)
+    Title: Investigation of Oz Labyrinth
  - Id: 11733
-    Title: The Labyrinth and the Merchant (9)
+    Title: Investigation of Oz Labyrinth
  - Id: 11734
-    Title: The Labyrinth and the Merchant (10)
+    Title: Investigation of Oz Labyrinth
  - Id: 11735
-    Title: The Labyrinth and the Merchant (11)
+    Title: Investigation of Oz Labyrinth
  - Id: 11736
-    Title: Oz Labyrinth 1F (170lv)
+    Title: Maze of Oz 1st Floor (170lv)
    Targets:
      - Mob: EP18_ASH_TOAD
        Count: 20
  - Id: 11737
-    Title: "[Cooldown] Oz Labyrinth 1F"
+    Title: Maze of Oz Level 1 - Standby
    TimeLimit: 4h
  - Id: 11738
-    Title: Oz Labyrinth 2F (200lv)
+    Title: Maze of Oz Level 2 (200lv)
    Targets:
      - Mob: EP18_HOT_MOLAR
        Count: 20
  - Id: 11739
-    Title: "[Cooldown] Oz Labyrinth 2F"
+    Title: Maze of Oz Level 2 (200lv)
    TimeLimit: 4h
  - Id: 12000
    Title: An old friend
@@ -9337,30 +9275,30 @@ Body:
    Title: Let's try again to seal the crack
    TimeLimit: 4h
  - Id: 12520
-    Title: "[Normal] Villa of Deception"
+    Title: Villa of Deception
  - Id: 12521
-    Title: "[Hard] Villa of Deception"
+    Title: Villa of Deception Hard
  - Id: 12522
-    Title: "[Cooldown] Villa of Deception"
+    Title: Cooldown: Villa of Deception
    TimeLimit: 4h
  - Id: 12531
-    Title: Transporting Goods
+    Title: Future General Candidate
  - Id: 12532
-    Title: Broken Wagon
+    Title: Trouble at the Top
  - Id: 12533
-    Title: Hidden Helper
+    Title: The Hidden Helper
  - Id: 12534
-    Title: Missing Camille
+    Title: The Missing Camille
  - Id: 12535
-    Title: Chief Decision
+    Title: The Governor's Decision
  - Id: 12536
-    Title: Scattered Goods (North)
+    Title: The Scattered Luggage (North)
  - Id: 12537
-    Title: Scattered Goods (West)
+    Title: Scattered Luggage (West)
  - Id: 12538
-    Title: Scattered Goods (East)
+    Title: The Scattered Luggage (East)
  - Id: 12539
-    Title: Scattered Goods (South)
+    Title: Scattered Luggage (South)
  - Id: 13000
    Title: RWC2011Card Gathering
  - Id: 13001
@@ -11514,84 +11452,84 @@ Body:
      - Mob: EP18_FIREWIND_KITE
        Count: 30
  - Id: 16549
-    Title: "[Daily] I can't sleep"
+    Title: I can't sleep
    Targets:
      - Mob: EP18_FIREWIND_KITE
        Count: 30
  - Id: 16550
-    Title: "[Cooldown] I can't sleep"
+    Title: I Can't Sleep - Wait
    TimeLimit: 4h
  - Id: 16551
-    Title: Collecting Folklore (1)
+    Title: The Story of Dinar
  - Id: 16552
-    Title: Collecting Folklore (2)
+    Title: Amira's Story
  - Id: 16553
-    Title: Collecting Folklore (3)
+    Title: Shanina's Grandma's Story
  - Id: 16554
-    Title: Collecting Folklore (4)
+    Title: Please collect the stories
  - Id: 16555
-    Title: "[Daily] Dinar's Story"
+    Title: The Story of Dinar
  - Id: 16556
-    Title: "[Daily] Amira's Story"
+    Title: Amira's Story
  - Id: 16557
-    Title: "[Daily] Shanina's Story"
+    Title: Shanina's Grandma's Story
  - Id: 16558
-    Title: "[Daily] Collecting Folklore"
+    Title: Please collect the stories
  - Id: 16559
-    Title: "[Cooldown] Collecting Folklore"
+    Title: Please collect the stories - Standby
    TimeLimit: 4h
  - Id: 16560
-    Title: Ahab's Gossip (1)
+    Title: This is not the place
  - Id: 16561
-    Title: Ahab's Gossip (2)
+    Title: This is not the place
  - Id: 16562
-    Title: Ahab's Gossip (3)
+    Title: This is not the place
  - Id: 16563
-    Title: Ahab's Gossip (4)
+    Title: This is not the place
  - Id: 16564
-    Title: Ahab's Gossip (5)
+    Title: This is not the place
  - Id: 16565
-    Title: Ahab's Gossip (6)
+    Title: This is not the place
  - Id: 16566
-    Title: Ahab's Gossip (7)
+    Title: This is not the place
  - Id: 16567
-    Title: Gray Wolf Forest Tournament (1)
+    Title: The Contest of the Grey Wolf Forest
  - Id: 16568
-    Title: People's Opinion (1)
+    Title: Everyone's Opinion
  - Id: 16569
-    Title: People's Opinion (2)
+    Title: Everyone's Opinion
  - Id: 16570
-    Title: People's Opinion (3)
+    Title: Everyone's Opinion
  - Id: 16571
-    Title: People's Opinion (4)
+    Title: Everyone's Opinion
  - Id: 16572
-    Title: Gray Wolf Forest Tournament (2)
+    Title: The Contest of the Grey Wolf Forest
  - Id: 16573
-    Title: Source of Weapons (1)
+    Title: Source of Weapon
  - Id: 16574
-    Title: Source of Weapons (2)
+    Title: Source of Weapon
  - Id: 16575
-    Title: Source of Weapons (3)
+    Title: Source of Weapon
  - Id: 16576
-    Title: Source of Weapons (4)
+    Title: Source of Weapon
  - Id: 16577
-    Title: Source of Weapons (5)
+    Title: Source of Weapon
  - Id: 16578
-    Title: Source of Weapons (6)
+    Title: Source of Weapon
  - Id: 16579
-    Title: Source of Weapons (7)
+    Title: Source of Weapon
  - Id: 16580
-    Title: Source of Weapons (8)
+    Title: Source of Weapon
  - Id: 16581
-    Title: Even children know (1)
+    Title: Children Know It
  - Id: 16582
-    Title: Even children know (2)
+    Title: Children Know It
  - Id: 16583
-    Title: Even children know (3)
+    Title: Children Know It
  - Id: 16584
-    Title: The Price of Labor (1)
+    Title: The Price of Labor
  - Id: 16585
-    Title: The Price of Labor (2)
+    Title: The Price of Labor
  - Id: 17000
    Title: Meet with Father Bamph
  - Id: 17001
@@ -11854,62 +11792,62 @@ Body:
    Title: (Standby) Thanatos Tower, 12th floor
    TimeLimit: 4h
  - Id: 17504
-    Title: Where is My Home (1)
+    Title: Where's My Home
  - Id: 17505
-    Title: Where is My Home (2)
+    Title: Where's My Home
  - Id: 17506
-    Title: Where is My Home (3)
+    Title: Where's My Home
  - Id: 17507
-    Title: Where is My Home (4)
+    Title: Where's My Home
  - Id: 17508
-    Title: "[Daily] Shortage of Supplies"
+    Title: Lack of Supplies
    Drops:
      - Mob: EP18_GREY_WOLF
        Item: Ep18_Very_Ddan_Crystal
        Rate: 5000
  - Id: 17509
-    Title: "[Cooldown] Shortage of Supplies"
+    Title: (Standby) Lack of supplies
    TimeLimit: 4h
  - Id: 17510
-    Title: There are no evil beasts in this world (1)
+    Title: There are no bad beasts in the world
  - Id: 17511
-    Title: There are no evil beasts in this world (2)
+    Title: There are no bad beasts in the world
  - Id: 17512
-    Title: There are no evil beasts in this world (3)
+    Title: There are no bad beasts in the world
  - Id: 17513
-    Title: An Unexpected Shepherd (1)
+    Title: The Unexpected Shepherd
  - Id: 17514
-    Title: An Unexpected Shepherd (2)
+    Title: The Unexpected Shepherd
    Targets:
      - Mob: EP18_ASHRING
        Count: 20
  - Id: 17515
-    Title: An Unexpected Shepherd (3)
+    Title: The Unexpected Shepherd
  - Id: 17516
-    Title: "[Cooldown] An Unexpected Shepherd"
+    Title: (Standby) Unexpected shepherd
    TimeLimit: 4h
  - Id: 17517
-    Title: Rebellion (1)
+    Title: The Rebels
  - Id: 17518
-    Title: Rebellion (2)
+    Title: The Rebels
  - Id: 17519
-    Title: Rebellion (3)
+    Title: The Rebels
  - Id: 17520
-    Title: Wolf Among Sheep (1)
+    Title: Wolf in the Sheep
  - Id: 17521
-    Title: Wolf Among Sheep (2)
+    Title: When you need a conversation
  - Id: 17522
-    Title: Wolf Among Sheep (3)
+    Title: Cleaning the Traitors
  - Id: 17523
-    Title: Sanctuary Purification
+    Title: Purification of the Sanctuary
  - Id: 17524
-    Title: "[Completed] Renegade Cleaning"
+    Title: Cleaning the Traitors
  - Id: 17525
-    Title: Aftermath
+    Title: When you need a conversation
  - Id: 17526
-    Title: "[Completed] Sanctuary Purification"
+    Title: Purification of the Sanctuary
  - Id: 17527
-    Title: "[Cooldown] Sanctuary Purification"
+    Title: (Standby) Cleaning strategy
    TimeLimit: 4h
  - Id: 17566
    Title: (Standby) Code name! Is it a star button?
@@ -12037,21 +11975,21 @@ Body:
    Title: Goseong dungeon 1st floor attack
    TimeLimit: 4h
  - Id: 18082
-    Title: Eligibility to attend the competition
+    Title: Eligibility to Participate in the Competition
  - Id: 18083
-    Title: High Priest's Villa
+    Title: Investigation of Daishinkan's Villa
  - Id: 18084
-    Title: Fact Finding
+    Title: Fact Investigation
  - Id: 18085
-    Title: Direction of Prayer
+    Title: The Direction of Prayer
  - Id: 18086
-    Title: "[Daily] Gray Wolf Forest Hunting"
+    Title: Make the Grey Wolf Forest Safer
    Targets:
      - Id: 1
        Location: gw_fild01
        Count: 30
  - Id: 18087
-    Title: "[Cooldown] Gray Wolf Forest Hunting"
+    Title: Safer in the Gray Wolf Forest - Standby
    TimeLimit: 4h
  - Id: 18100
    Title: Legends from Moscovia
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
@@ -7234,9 +7234,9 @@ Body:
    Type: Magic
    TargetType: Self
    DamageFlags:
-      IgnoreDefense: true
-      SimpleDefense: true
-    Range: 9
+      IgnoreAtkCard: true
+      IgnoreFlee: true
+    Range: 5
    Hit: Single
    HitCount: 1
    Element: Holy
@@ -7664,8 +7664,8 @@ Body:
    Type: Weapon
    TargetType: Attack
    DamageFlags:
+      IgnoreDefense: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: -2
@@ -7699,6 +7699,7 @@ Body:
      - Level: 5
        Time: 1000
    Duration1: 3000
+    Duration2: 300000
    FixedCastTime:
      - Level: 1
        Time: 2000
@@ -8878,7 +8879,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 300
-    Duration1: 15000
    Duration2: 27000
    Cooldown: 4000
    Requires:
@@ -9136,7 +9136,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 300
-    Duration1: 4500
    Duration2: 4500
    Cooldown: 4000
    Requires:
@@ -9455,7 +9454,6 @@ Body:
    DamageFlags:
      IgnoreAtkCard: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      IsNpc: true
      TargetSelf: true
@@ -10252,15 +10250,15 @@ Body:
    Element: Weapon
    Duration1:
      - Level: 1
-        Time: 2000
-      - Level: 2
        Time: 4000
-      - Level: 3
-        Time: 6000
-      - Level: 4
+      - Level: 2
        Time: 8000
+      - Level: 3
+        Time: 12000
+      - Level: 4
+        Time: 16000
      - Level: 5
-        Time: 10000
+        Time: 24000
    CastDelayFlags:
      IgnoreStatus: true
    Requires:
@@ -10276,7 +10274,7 @@ Body:
        - Level: 5
          Amount: 12
      SpiritSphereCost: 1
-    Status: Ankle
+    Status: Stop
  - Id: 372
    Name: CH_CHAINCRUSH
    Description: Chain Crush Combo
@@ -11050,7 +11048,7 @@ Body:
    TargetType: Attack
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -11105,7 +11103,7 @@ Body:
        2hSword: true
        1hSpear: true
        2hSpear: true
-    Status: Ankle
+    Status: Stop
  - Id: 398
    Name: LK_HEADCRUSH
    Description: Traumatic Blow
@@ -11315,7 +11313,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      NoDamage: true
-    Range: 9
+    Range: 7
    Hit: Single
    HitCount: 1
    ActiveInstance: 3
@@ -16711,7 +16709,7 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 300000
+    Duration1: -1
    Status: Invincible
  - Id: 686
    Name: NPC_INVINCIBLEOFF
@@ -16723,6 +16721,8 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
+    Duration1: 60000
+    Status: InvincibleOff
  - Id: 687
    Name: NPC_ALLHEAL
    Description: Full Heal
@@ -18364,43 +18364,6 @@ 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
@@ -19151,7 +19114,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: 9
@@ -22697,7 +22659,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      AllowOnMado: true
    Range: 9
@@ -24562,7 +24523,7 @@ Body:
    TargetType: Attack
    Range: 1
    Hit: Single
-    HitCount: -5
+    HitCount: 5
    CopyFlags:
      Skill:
        Reproduce: true
@@ -28832,7 +28793,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Range:
      - Level: 1
        Size: 7
@@ -29731,19 +29691,6 @@ 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
@@ -33202,7 +33149,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: 9
@@ -43018,10 +42964,10 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Flags:
-      IgnoreGtb: true
-    AfterCastWalkDelay: 1000
-    Cooldown: 20000
+    Range: 9
+    Hit: Single
+    HitCount: 1
+    AfterCastActDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@@ -43044,7 +42990,11 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+      Splash: true
+    Hit: Single
+    HitCount: 1
+    SplashArea: -1
+    AfterCastActDelay: 35000
    Duration1:
      - Level: 1
        Time: 40000
@@ -43056,7 +43006,6 @@ Body:
        Time: 25000
      - Level: 5
        Time: 20000
-    Cooldown: 35000
    Requires:
      SpCost:
        - Level: 1
@@ -43074,6 +43023,7 @@ Body:
    Name: HLIF_BRAIN
    Description: Brain Surgery
    MaxLevel: 5
+    SplashArea: 1
  - Id: 8004
    Name: HLIF_CHANGE
    Description: Change
@@ -43081,7 +43031,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@@ -43089,7 +43039,7 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 600000
      - Level: 2
@@ -43106,8 +43056,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
-    Cooldown: 1000
+    Hit: Single
+    Duration2: 1000
    Requires:
      SpCost: 10
  - Id: 8006
@@ -43117,7 +43067,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
+    AfterCastActDelay: 30000
    Duration1:
      - Level: 1
        Time: 40000
@@ -43129,7 +43080,6 @@ Body:
        Time: 25000
      - Level: 5
        Time: 20000
-    Cooldown: 30000
    Requires:
      SpCost:
        - Level: 1
@@ -43147,6 +43097,8 @@ Body:
    Name: HAMI_SKIN
    Description: Adamantium Skin
    MaxLevel: 5
+    DamageFlags:
+      NoDamage: true
  - Id: 8008
    Name: HAMI_BLOODLUST
    Description: Bloodlust
@@ -43154,7 +43106,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@@ -43162,7 +43114,7 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 300000
      - Level: 2
@@ -43191,7 +43143,7 @@ Body:
        Count: -2
      - Level: 5
        Count: -3
-    Cooldown: 2000
+    AfterCastWalkDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@@ -43212,7 +43164,6 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -43224,7 +43175,7 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 60000
      - Level: 2
@@ -43258,7 +43209,6 @@ Body:
      NoDamage: true
    Hit: Single
    CastCancel: true
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -43270,7 +43220,7 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 60000
      - Level: 2
@@ -43303,7 +43253,7 @@ Body:
    Range: 15
    Hit: Single
    HitCount: 1
-    Cooldown: 1000
+    AfterCastActDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8013
@@ -43325,7 +43275,7 @@ Body:
        Count: 4
      - Level: 5
        Count: 5
-    Cooldown:
+    AfterCastActDelay:
      - Level: 1
        Time: 2000
      - Level: 2
@@ -43356,8 +43306,8 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastWalkDelay: 1500
-    Cooldown: 3000
+    AfterCastActDelay: 3000
+    AfterCastWalkDelay: 3000
    Requires:
      SpCost: 40
  - Id: 8015
@@ -43381,8 +43331,7 @@ Body:
    HitCount: 1
    Element: Weapon
    SplashArea: 4
-    AfterCastActDelay: 5000
-    CoolDown: 1000
+    AfterCastWalkDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8018
@@ -46275,7 +46224,7 @@ Body:
    TargetType: Attack
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -46319,7 +46268,7 @@ Body:
          Amount: 27
        - Level: 5
          Amount: 30
-    Status: Ankle
+    Status: Stop
  - Id: 8219
    Name: ML_DEFENDER
    Description: Defending_Aura
@@ -47010,7 +46959,9 @@ Body:
    Range: 2
    Hit: Single
    HitCount: 1
+    Duration1: 10000
    Cooldown: 30000
+    Status: InvincibleOff
  - Id: 8401
    Name: EL_CIRCLE_OF_FIRE
    Description: Circle of Fire
--- a/db/re/skill_nocast_db.txt
+++ b/db/re/skill_nocast_db.txt
@@ -0,0 +1,249 @@
+// 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,48 +612,3 @@ 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,7 +72,6 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
-      Protection: true
    EndOnStart:
      Aeterna: true
    EndReturn:
@@ -86,7 +85,7 @@ Body:
    Opt1: StoneWait
    Flags:
      SendOption: true
-      BossResist: true
+      BossResist: true      
      StopAttacking: true
    Fail:
      Whiteimprison: true
@@ -126,7 +125,6 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
-      Protection: true
    EndOnStart:
      Aeterna: true
  - Status: Stun
@@ -146,7 +144,6 @@ Body:
      Inspiration: true
      Gvg_Stun: true
      Stun: true
-      Protection: true
  - Status: Sleep
    DurationLookup: NPC_SLEEPATTACK
    States:
@@ -165,7 +162,6 @@ Body:
      Inspiration: true
      Gvg_Sleep: true
      Sleep: true
-      Protection: true
  - Status: Poison
    DurationLookup: NPC_POISON
    CalcFlags:
@@ -184,7 +180,6 @@ Body:
      Inspiration: true
      Poison: true
      Dpoison: true
-      Protection: true
  - Status: Curse
    DurationLookup: NPC_WIDECURSE
    CalcFlags:
@@ -203,7 +198,6 @@ Body:
      Inspiration: true
      Gvg_Curse: true
      Curse: true
-      Protection: true
  - Status: Silence
    DurationLookup: NPC_SILENCEATTACK
    States:
@@ -220,7 +214,6 @@ Body:
      Inspiration: true
      Gvg_Silence: true
      Silence: true
-      Protection: true
  - Status: Confusion
    DurationLookup: NPC_WIDECONFUSE
    Flags:
@@ -230,7 +223,6 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
-      Protection: true
    EndReturn:
      Confusion: true
  - Status: Blind
@@ -250,7 +242,6 @@ Body:
      Fear: true
      Gvg_Blind: true
      Blind: true
-      Protection: true
  - Status: Bleeding
    Icon: EFST_BLOODING
    DurationLookup: NPC_BLEEDING
@@ -268,7 +259,6 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
-      Protection: true
  - Status: Dpoison
    DurationLookup: NPC_POISON
    CalcFlags:
@@ -796,6 +786,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
      RemoveOnChangeMap: true
+    MinDuration: 5000
  - Status: Keeping
    DurationLookup: NPC_KEEPING
    CalcFlags:
@@ -1009,7 +1000,6 @@ Body:
    Flags:
      SendOption: true
  - Status: Extremityfist
-    Icon: EFST_EXTREMITYFIST
    DurationLookup: MO_EXTREMITYFIST
    CalcFlags:
      Regen: true
@@ -1822,7 +1812,6 @@ Body:
    Icon: EFST_ETERNALCHAOS
    DurationLookup: BD_ETERNALCHAOS
    CalcFlags:
-      Def: true
      Def2: true
    Flags:
      NoDispell: true
@@ -2601,17 +2590,13 @@ Body:
    DurationLookup: HLIF_AVOID
    CalcFlags:
      Speed: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
  - Status: Change
    DurationLookup: HLIF_CHANGE
    CalcFlags:
      Vit: true
      Int: true
    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
+      RemoveOnChangeMap: true
    Fail:
      Change: true
  - Status: Bloodlust
@@ -2619,9 +2604,6 @@ Body:
    CalcFlags:
      Batk: true
      Watk: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
  - Status: Fleet
    DurationLookup: HFLI_FLEET
    CalcFlags:
@@ -2635,11 +2617,7 @@ Body:
  - Status: Defence
    DurationLookup: HAMI_DEFENCE
    CalcFlags:
-      Def: true
      Vit: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
  - Status: Incaspdrate
    CalcFlags:
      Aspd: true
@@ -2950,12 +2928,23 @@ Body:
    Icon: EFST_INVINCIBLE
    DurationLookup: NPC_INVINCIBLE
    CalcFlags:
-      Aspd: true
      Speed: true
    Flags:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
+    EndOnStart:
+      Invincibleoff: true
+  - Status: Invincibleoff
+    DurationLookup: NPC_INVINCIBLEOFF
+    CalcFlags:
+      Speed: true
+    Flags:
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    EndOnStart:
+      Invincible: true
  - Status: Manu_Atk
    Icon: EFST_MANU_ATK
    Flags:
@@ -4138,7 +4127,7 @@ Body:
      Unlimitedhummingvoice: true
      Sircleofnature: true
  - Status: Deepsleep
-    Icon: EFST_DEEP_SLEEP
+    Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
    DurationLookup: WM_LULLABY_DEEPSLEEP
    States:
      NoCast: true
@@ -6130,6 +6119,14 @@ 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:
@@ -7022,9 +7019,7 @@ Body:
    CalcFlags:
      Regen: true
  - Status: Earthshaker
-    Icon: EFST_EARTHSHAKER
    Flags:
-      BlEffect: true
      NoWarning: true
  - Status: Weaponblock_On
    Icon: EFST_WEAPONBLOCK_ON
@@ -7039,7 +7034,6 @@ Body:
    Icon: EFST_SPORE_EXPLOSION_DEBUFF
    DurationLookup: GN_SPORE_EXPLOSION
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -7461,7 +7455,7 @@ Body:
      NoClearance: true
      NoClearbuff: true
  - Status: Madogear
-    Icon: EFST_MADOGEAR_TYPE
+    Icon: EFST_MADOGEAR
    CalcFlags:
      Speed: true
    Flags:
@@ -7975,8 +7969,6 @@ 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
@@ -8028,23 +8020,17 @@ 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
@@ -8058,8 +8044,6 @@ Body:
      Powerful_Faith: true
      Firm_Faith: true
      Sincere_Faith: true
-    Flags:
-      DisplayPc: true
  - Status: Sincere_Faith
    Icon: EFST_SINCERE_FAITH
    DurationLookup: IQ_SINCERE_FAITH
@@ -8951,21 +8935,3 @@ 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
@@ -0,0 +1,505 @@
+// 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,11 +1250,6 @@ 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,12 +63,11 @@ The eA Job System:
 	EAJL_2		0x300

 - The third category is type. Classes can either be normal, rebirth/advanced,
-  adopted, third class or fourth class.
+  adopted, or third 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.
@@ -144,11 +143,6 @@ 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
@@ -175,19 +169,13 @@ 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/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -31,7 +31,7 @@ This list contains all available constants referenced in the 'bonus' commands.
 	RC2_Bio5_Swordman_Thief, RC2_Bio5_Acolyte_Merchant, RC2_Bio5_Mage_Archer, RC2_Bio5_MVP,
 	RC2_Clocktower, RC2_Thanatos, RC2_Faceworm, RC2_Hearthunter, RC2_Rockridge, RC2_Werner_Lab,
 	RC2_Temple_Demon, RC2_Illusion_Vampire, RC2_Malangdo, RC2_EP172ALPHA, RC2_EP172BETA, RC2_EP172BATH,
-	RC2_Illusion_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda, RC2_Illusion_Frozen, RC2_Illusion_Moonlight
+	RC2_Illusion_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda

 * Class (c)
 	Class_Normal, Class_Boss, Class_Guardian, Class_All
--- a/doc/map_zones.txt
+++ b/doc/map_zones.txt
@@ -1,76 +0,0 @@
-//===== 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,6 +174,24 @@ 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.
@@ -282,16 +300,6 @@ Disable RODex on a map.

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

-*nobonusitemdrop
-
-Disable the following item bonuses on a map.
- - bAddMonsterDropItem
- - bAddClassDropItem
- - bAddMonsterDropItemGroup
- - bAddClassDropItemGroup
-
---------------------------------------
-
 =====================
 | 2. Battle-related |
 =====================
@@ -388,69 +396,6 @@ 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 |
 ==================
@@ -479,6 +424,12 @@ 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).
@@ -523,9 +474,3 @@ 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/mob_db.txt
+++ b/doc/mob_db.txt
@@ -204,18 +204,6 @@ AttackMotion: Attack animation motion. Low value means monster's attack will be

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

-ClientAttackMotion: The time from the start of a normal attack until the damage frame shows on client. At the same time you also get stopped on the client.
-This value is only needed if you use the "synchronize_damage" feature (battle/battle.conf).
-
-If you created a custom sprite, you want to set this value to the timing of the damage frame in your *.act file.
-In Act Editor you can set the damage frame by setting the frame sound to "atk". If you don't define a damage frame, it will default to the second to last
-frame. Also keep in mind that the Act Editor displays slightly inaccurate speed. Every 25ms in Act Editor is 24ms in reality.
-
-Example: Drops has a animation speed of 24ms per frame and the 13th frame (frame #12) is the damage frame. This means the damage shows after 12 frames.
-That's why Drops has a ClientAttackMotion of 24*12 = 288.
-
---------------------------------------
-
 DamageMotion: Damage animation motion, same as aMotion but used to display the "I am hit" animation. Coincidentally, this same value is used to determine how long it is before the monster/player can move again. Endure is dMotion = 0, obviously.

 ---------------------------------------
--- a/doc/mob_skill_db_powerskill.txt
+++ b/doc/mob_skill_db_powerskill.txt
@@ -10,8 +10,8 @@

 When a monster uses a level 10 skill on Aegis, it will be much stronger than the 
 normal player version. On rAthena we reflect this by giving the monster a skill
-level above the maximum player skill level.
-The following list explains the skill specialities and the corresponding level
+level above the maximum player level.
+The following lists explains the skill specialities and the corresponding level
 which needs to be put for these skills in the mob_skill_db.

 Note: The "SkillDatabase::parseNode" template has a linear determination feature
--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20240414
+//= 20130613
 //===== Description: =========================================
 //= List of available permissions and their functions.
 //============================================================
@@ -11,12 +11,6 @@
 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
@@ -28,20 +22,20 @@ The format of this file is as follows:
 ========================
 ---------------------------------------

-*can_trade (PC_PERM_TRADE)
+*can_trade

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

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

-*can_party (PC_PERM_PARTY)
+*can_party

 Allows player to create and join parties.

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

-*attendance (PC_PERM_ATTENDANCE)
+*attendance

 Allows player to use the daily attendance system.

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

-*all_skill (PC_PERM_ALL_SKILL)
+*all_skill

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

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

-*all_equipment (PC_PERM_USE_ALL_EQUIPMENT)
+*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 (PC_PERM_SKILL_UNCONDITIONAL)
+*skill_unconditional

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

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

-*join_chat (PC_PERM_JOIN_ALL_CHAT)
+*join_chat

 Allows player to join password-protected chatrooms.

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

-*kick_chat (PC_PERM_NO_CHAT_KICK)
+*kick_chat

 Prevents player from being kicked from a chatroom.

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

-*view_hpmeter (PC_PERM_VIEW_HPMETER)
+*view_hpmeter

 Allows player to see the HP bar of every player.

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

-*view_equipment (PC_PERM_VIEW_EQUIPMENT)
+*view_equipment

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

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

-*hack_info (PC_PERM_RECEIVE_HACK_INFO)
+*hack_info

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

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

-*disable_pvm (PC_PERM_DISABLE_PVM)
+*disable_pvm

 Prevents player from attacking monsters.

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

-*disable_pvp (PC_PERM_DISABLE_PVP)
+*disable_pvp

 Prevents player from attacking other players.

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

-*can_trade_bounded (PC_PERM_TRADE_BOUNDED)
+*can_trade_bounded

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

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

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

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

-*trade_unconditional (PC_PERM_TRADE_UNCONDITIONAL)
+*trade_unconditional

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

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

-*all_commands (PC_PERM_USE_ALL_COMMANDS)
+*all_commands

 Allows usage of all atcommands and charcommands.

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

-*disable_commands_when_dead (PC_PERM_DISABLE_CMD_DEAD)
+*disable_commands_when_dead

 Disables usage of atcommands when player is dead.

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

-*hide_session (PC_PERM_HIDE_SESSION)
+*hide_session

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

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

-*who_display_aid (PC_PERM_WHO_DISPLAY_AID)
+*who_display_aid

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

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

-*any_warp (PC_PERM_WARP_ANYWHERE)
+*any_warp

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

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

-*receive_requests (PC_PERM_RECEIVE_REQUESTS)
+*receive_requests

 Allows player to receive requests through the @requests command.

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

-*show_bossmobs (PC_PERM_SHOW_BOSS)
+*show_bossmobs

 Displays boss mobs in the @showmobs command.

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

-*channel_admin (PC_PERM_CHANNEL_ADMIN)
+*channel_admin

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

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

-*use_check (PC_PERM_USE_CHECK)
+*use_check

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

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

-*use_changemaptype (PC_PERM_USE_CHANGEMAPTYPE)
+*use_changemaptype

 Allows player to use the client command /changemaptype.

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

-*command_enable (PC_PERM_ENABLE_COMMAND)
+*command_enable

 Enable to use atcommand while talking with NPC.

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

-*bypass_stat_onclone (PC_PERM_BYPASS_STAT_ONCLONE)
+*bypass_stat_onclone

 Bypass max parameter limit while using @clonestat

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

-*bypass_max_stat (PC_PERM_BYPASS_MAX_STAT)
+*bypass_max_stat

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

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

-*macro_detect (PC_PERM_MACRO_DETECT)
+*macro_detect

 Allows player to use the client command /macro_detector.

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

-*macro_register (PC_PERM_MACRO_REGISTER)
+*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).
+Allows player to use the client commands /maco_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
@@ -1,4 +1,4 @@
-//===== rAthena Documentation================================
+//===== rAthena Documentation================================
 //= rAthena Script Commands
 //===== By:==================================================
 //= rAthena Dev Team
@@ -135,26 +135,11 @@ and 'doc/mapflags.txt'.
 <map name>{,<x>{,<y>{,<xs>{,<ys>}}}}%TAB%monster%TAB%<monster name>{,<monster level>}%TAB%<mob id>,<amount>{,<delay1>{,<delay2>{,<event>{,<mob size>{,<mob ai>}}}}}

 Map name is the name of the map the monsters will spawn on. x,y are the
-coordinates where the mob should spawn. Putting zeros instead of these
-coordinates will spawn the monsters randomly.
-
-If the coordinates are non-zero and xs and ys are above 1, each monster will
-spawn in a radius around x,y. At server start, each monster will get assigned
-its own center cell adding or substracting up to (xs-1),(ys-1) from the given
-x,y coordinates. Each time a monster respawns, it will spawn in a radius around
-its personal center cell by adding or substracting up to (xs-1),(ys-1) again.
-This results in a total possible spawn area over all monsters of the spawn line
-of (xs,ys)*4-3, but with a strong bias towards the center of that area:
-2,2 - 5x5
-3,3 - 9x9
-4,4 - 13x13
-5,5 - 17x17
-etc.
-
+coordinates where the mob should spawn. If xs and ys are non-zero, they
+specify the 'radius' of a spawn-rectangle area centered at x,y.
+Putting zeros instead of these coordinates will spawn the monsters randomly.
 Note this is only the initial spawn zone, as mobs random-walk, they are free
 to move away from their specified spawn region.
-You can disable the picking of a random center cell for each monster in the
-battle config. (See /conf/battle/monster.conf::randomize_center_cell.)

 Monster name is the name the monsters will have on screen, and has no relation
 whatsoever to their names anywhere else. It's the mob id that counts, which
@@ -203,8 +188,6 @@ Natural enemies for AI monsters are normal monsters.

 Alternately, a monster spawned using 'boss_monster' instead of 'monster' is able
 to be detected on the map with the SC_BOSSMAPINFO status (used by Convex Mirror).
-A boss monster spawn with fixed coordinates will always spawn at the given 
-coordinates, even if they are blocked (e.g. by Icewall).

 ** NPC names

@@ -5694,35 +5677,22 @@ Example:

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

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

 Invokes the store search window, which allows to search for both vending
-and buying stores.
+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:

-Parameter <uses> indicates how many searches can be started
-before the window has to be reopened.
+	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 <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";
+Example:
+	// Item Universal_Catalog_Gold (10 uses, effect: open shop)
+	searchstores 10,1;

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

@@ -6124,12 +6094,11 @@ will always return 0.

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

-*skilleffect <skill id>,<number>{,<game ID>};
-*skilleffect "<skill name>",<number>{,<game ID>};
+*skilleffect <skill id>,<number>;
+*skilleffect "<skill name>",<number>;

 This command displays visual and aural effects of given skill on currently
-attached character or, when defined, on any unit with the given ID.
-The number parameter is for skill whose visual effect
+attached character. 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
@@ -6622,8 +6591,7 @@ Available <type>:
 	PCBLOCK_COMMANDS			Prevent the player from using atcommands/charcommands.
 	PCBLOCK_NPCCLICK			Prevent the player from clicking/touching any NPC/shop/warp.
 	PCBLOCK_EMOTION				Prevent the player from using emotions.
-	PCBLOCK_EQUIP				Prevent the player from replacing equipment.
-	PCBLOCK_NPC				Simulate NPC interaction. Useful for NPC with no mes window. Sum of PCBLOCK_MOVE|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_COMMANDS|PCBLOCK_NPCCLICK|PCBLOCK_EQUIP.
+	PCBLOCK_NPC				Simulate NPC interaction. Useful for NPC with no mes window. Sum of PCBLOCK_MOVE|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_COMMANDS|PCBLOCK_NPCCLICK.
 	PCBLOCK_ALL				Sum of all the flags.

 Examples:
@@ -6652,8 +6620,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>.

@@ -6674,46 +6642,6 @@ 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.|
 ==================================
@@ -8016,15 +7944,17 @@ Return values:
 //
 ---------------------------------------

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

-These commands will make the NPC object in question move around the map.
+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.

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

 '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
@@ -8032,17 +7962,10 @@ 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.
+computed based on the speed and motion coordinates. The effect is rather
+unnerving.

 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
@@ -8509,15 +8432,6 @@ 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
@@ -9866,7 +9780,6 @@ 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).
@@ -10691,7 +10604,6 @@ 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,7 +58,6 @@ 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.

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

@@ -81,7 +80,6 @@ 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,9 +254,6 @@ 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,23 +1001,17 @@ SC_FLING	()
 	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_AVOID	()
+	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_CHANGE	()
+	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_BLOODLUST	()
+	desc:
+	val1:

 SC_FLEET	()
 	desc:
@@ -1027,10 +1021,10 @@ SC_SPEED	()
 	desc:
 	val1:

-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_DEFENCE	()
+	desc: Increase Defense, HAMI_DEFENCE effect
+	val1: (none)
+	val2: + Def(Pre-renewal) or VIT (Renewal)

 SC_INCASPDRATE	()
 	desc: Increase ASPD
--- a/doc/yaml/db/license.yml
+++ b/doc/yaml/db/license.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2024 rAthena Development Team
+#   Copyright(C) 2023 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/doc/yaml/db/mob_db.yml
+++ b/doc/yaml/db/mob_db.yml
@@ -39,7 +39,6 @@
 #   WalkSpeed               Walk speed. (Default: DEFAULT_WALK_SPEED)
 #   AttackDelay             Attack speed. (Default: 0)
 #   AttackMotion            Attack animation speed. (Default: 0)
-#   ClientAttackMotion      Client attack speed. (Default: AttackMotion)
 #   DamageMotion            Damage animation speed. (Default: 0)
 #   DamageTaken             Rate at which the monster will receive incoming damage. (Default: 100)
 #   Ai                      Aegis monster type AI behavior. (Default: 06)
--- a/doc/yaml/sql/mob_db.sql
+++ b/doc/yaml/sql/mob_db.sql
@@ -60,9 +60,6 @@ CREATE TABLE `mob_db` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/doc/yaml/sql/mob_db2.sql
+++ b/doc/yaml/sql/mob_db2.sql
@@ -60,9 +60,6 @@ CREATE TABLE `mob_db2` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/doc/yaml/sql/mob_db2_re.sql
+++ b/doc/yaml/sql/mob_db2_re.sql
@@ -62,9 +62,6 @@ CREATE TABLE `mob_db2_re` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/doc/yaml/sql/mob_db_re.sql
+++ b/doc/yaml/sql/mob_db_re.sql
@@ -62,9 +62,6 @@ CREATE TABLE `mob_db_re` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/npc/custom/battleground/bg_pvp.txt
+++ b/npc/custom/battleground/bg_pvp.txt
@@ -14,19 +14,6 @@
 //= 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)
@@ -120,3 +107,15 @@ 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daegaladh	8291fce243	Leftovers	2024-04-15 10:41:53 +02:00
Daegaladh	873600fd8b	Small mistake	2024-04-15 10:32:00 +02:00
Daegaladh	999daa6e47	Copypaste fail	2024-04-15 10:24:04 +02:00
Daegaladh	e83252bc69	Optimized a big chunk of repetitive code	2024-04-15 10:09:36 +02:00
Daegaladh	e00e97c401	Optimizations	2024-04-13 17:35:47 +02:00
Daegaladh	347e138687	Fix check in Swordsman tutorial quest	2024-04-13 17:04:43 +02:00