Updated jobs 4th Hp and Sp

2023-11-04 22:35:56 +01:00
423 changed files with 59730 additions and 229977 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/3rdparty/httplib/httplib.vcxproj
+++ b/3rdparty/httplib/httplib.vcxproj
@@ -98,7 +98,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -113,7 +112,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -130,7 +128,6 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -149,7 +146,6 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
--- a/3rdparty/libconfig/libconfig.vcxproj
+++ b/3rdparty/libconfig/libconfig.vcxproj
@@ -108,7 +108,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -123,7 +122,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -140,7 +138,6 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -159,7 +156,6 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
--- a/3rdparty/libconfig/scanner.c
+++ b/3rdparty/libconfig/scanner.c
@@ -2,11 +2,6 @@

 #line 4 "scanner.c"

-#ifdef _MSC_VER
-	#pragma warning( push )
-	#pragma warning( disable : 4267 )
-#endif
-
 #define  YY_INT_ALIGNED short int

 /* A lexical scanner generated by flex */
@@ -2370,7 +2365,3 @@ void libconfig_yyfree (void * ptr , yyscan_t yyscanner)
 #define YYTABLES_NAME "yytables"

 #line 192 "scanner.l"
-
-#ifdef _MSC_VER
-	#pragma warning( pop )
-#endif
--- a/3rdparty/rapidyaml/ryml.vcxproj
+++ b/3rdparty/rapidyaml/ryml.vcxproj
@@ -103,7 +103,6 @@
      <PreprocessorDefinitions>WIN32;_WINDOWS;CMAKE_INTDIR="Debug";_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <LanguageStandard>stdcpp17</LanguageStandard>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -139,7 +138,6 @@
      <PreprocessorDefinitions>WIN32;_WINDOWS;CMAKE_INTDIR="Debug";_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <LanguageStandard>stdcpp17</LanguageStandard>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -175,7 +173,6 @@
      <DebugInformationFormat>
      </DebugInformationFormat>
      <LanguageStandard>stdcpp17</LanguageStandard>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -211,7 +208,6 @@
      <DebugInformationFormat>
      </DebugInformationFormat>
      <LanguageStandard>stdcpp17</LanguageStandard>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/3rdparty/yaml-cpp/yaml-cpp.vcxproj
+++ b/3rdparty/yaml-cpp/yaml-cpp.vcxproj
@@ -97,7 +97,6 @@
      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>YAML_CPP_STATIC_DEFINE;WIN32;_WINDOWS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -110,7 +109,6 @@
      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
      <PreprocessorDefinitions>YAML_CPP_STATIC_DEFINE;WIN32;_WINDOWS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -124,7 +122,6 @@
      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>YAML_CPP_STATIC_DEFINE;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -142,7 +139,6 @@
      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>YAML_CPP_STATIC_DEFINE;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,7 @@ option( ENABLE_WEB_SERVER "Build web-server (default=ON)" ON )
 #
 TEST_BIG_ENDIAN( BIG_ENDIAN )
 if( NOT DEFINED BIG_ENDIAN )
-	message( WARNING "unable to determine endianness, only LITTLE ENDIAN is supported" )
+	message( WARNING "unable to determine endianess, only LITTLE ENDIAN is supported" )
 elseif( BIG_ENDIAN )
 	message( FATAL_ERROR "bigendian is not supported" )
 endif()
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
@@ -365,10 +365,6 @@ Body:
    Help: |
      Params: [<item type>]
      Throws all your possession on the ground. No type specified will drop all items.
-  - Command: stockall
-    Help: |
-      Params: [<item type>]
-      Transfer items from cart to your inventory. No type specified will transfer all items.
  - Command: storeall
    Help: |
      Puts all your possessions in storage.
@@ -689,20 +685,20 @@ Body:
      Gives you the desired item.
  - Command: pvpon
    Help: |
-      Enables PvP on the current map
+      Turns pvp on on the current map
  - Command: pvpoff
    Help: |
-      Disables PvP on the current map
+      Turns pvp off on the current map
  - Command: gvgon
    Aliases:
      - gpvpon
    Help: |
-      Enables GvG on the current map
+      Turns gvg on on the current map
  - Command: gvgoff
    Aliases:
      - gpvpoff
    Help: |
-      Disables GvG on the current map
+      Turns gvg off on the current map
  - Command: agitstart
    Help: |
      Starts War of Emperium
@@ -918,11 +914,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 +952,6 @@ Body:
      atcommand       battleconf     statusdb
      pcdb                    motd             script
      questdb              msgconf       packetdb
-      cashdb
  - Command: langtype
    Help: |
      Params: <language>
--- 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/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/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
@@ -136,9 +134,3 @@ min_shop_buy: 1
 // Minimum sell price of items at a normal shop
 // Officially items can be sold for 0 Zeny
 min_shop_sell: 0
-
-// Should items that reduce damage from element/race count all monster damage as physical? (Note 1)
-// Officially "Asprika" (god item) reduces all monsters damage rather than just physical damage
-// Shaman Hat on the other hand doesn't reduce monster damage at all (reduces magical damage in PVP)
-// This only affects items with bonus3 bSubEle and bonus3 bSubRace.
-cardfix_monster_physical: yes
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -183,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
@@ -298,9 +298,12 @@ trait_points_job_change: 7
 // 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/groups.yml
+++ b/conf/groups.yml
@@ -240,7 +240,6 @@ Body:
      bypass_stat_onclone: true
      bypass_max_stat: true
      macro_register: true
-      trade_unconditional: true
      #all_permission: true

 Footer:
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -30,6 +30,10 @@ emblem_transparency_limit: 80
 // "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"
 // and you have localhost, switch it to 127.0.0.1

+// Global SQL settings
+// overridden by local settings when the hostname is defined there
+// (currently only the login-server reads/obeys these settings)
+
 // MySQL Login server
 login_server_ip: 127.0.0.1
 login_server_port: 3306
--- 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
@@ -1592,7 +1592,7 @@ map: jor_sanct
 map: jor_twice
 map: jor_twig

-// Depth biosphere 1st floor
+// Biosphere 1st floor
 map: bl_depth1

 // Garden of Time
@@ -1602,40 +1602,5 @@ map: for_dun01
 map: for_dun02
 map: t_garden

-// Fantasy Series - Rainbow Lake
-map: 1@vrpop
-map: 2@vrpop
-map: 3@vrpop
-
-// Depth biosphere 2nd floor
-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,10 +933,7 @@
 // NoBank Mapflag
 831: You cannot use the Bank on this map.

-// @reloadcashdb
-832: Cash shop database has been reloaded.
-
-//833-899 free
+//832-899 free

 //------------------------------------
 // More atcommands message
@@ -1818,10 +1815,5 @@
 1531: Invalid position.
 1532: Invalid slot number.

-//@stockall
-1533: You do not have a cart.
-1534: Usage: @stockall {<type>}
-1535: %d items are transferred (%d skipped)!
-
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt
--- 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

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

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

--- a/4
+++ b/4
@@ -4761,8 +4761,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h

     ;; #(
   *)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to determine endianness, only little endian is supported" >&5
-$as_echo "$as_me: WARNING: unable to determine endianness, only little endian is supported" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to determine endianess, only little endian is supported" >&5
+$as_echo "$as_me: WARNING: unable to determine endianess, only little endian is supported" >&2;}
 ;;
 esac

--- a/configure.ac
+++ b/configure.ac
@@ -490,7 +490,7 @@ CXXFLAG_CLEARS="-std=c++17"
 AC_C_BIGENDIAN(
 	[AC_MSG_ERROR([[bigendian is not supported... stopping]])],
 	,
-	[AC_MSG_WARN([[unable to determine endianness, only little endian is supported]])]
+	[AC_MSG_WARN([[unable to determine endianess, only little endian is supported]])]
 )


--- a/db/const.yml
+++ b/db/const.yml
@@ -45,10 +45,6 @@ Body:
    Value: 4
  - Name: JUMPINGCLAN
    Value: 5
-  - Name: REPUTATION_EP18
-    Value: 3
-  - Name: REPUTATION_EP19
-    Value: 4

 Footer:
  Imports:
--- 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/map_cache.dat
+++ b/db/map_cache.dat
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1236,31 +1236,6 @@ bl_depth1
 for_dun01
 for_dun02
 t_garden
-1@vrpop
-2@vrpop
-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/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_equip.yml
+++ b/db/pre-re/item_db_equip.yml
@@ -20587,7 +20587,16 @@ Body:
    EquipLevelMin: 94
    Script: |
      bonus bMdef,5;
-      bonus3 bSubEle,Ele_All,30,BF_WEAPON;
+      bonus3 bSubEle,Ele_Neutral,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Water,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Earth,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Fire,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Wind,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Poison,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Holy,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Dark,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Ghost,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Undead,30,BF_SHORT;
      bonus bFlee,30;
      skill "AL_TELEPORT",1;
      bonus bUnbreakableGarment;
--- 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/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,7 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
+      IgnoreFlee: true
    Flags:
      IsTrap: true
      AlterRangeResearchTrap: true
@@ -5008,7 +4999,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      NoDamage: true
-      IgnoreAtkCard: true
+      IgnoreElement: true
      IgnoreFlee: true
    Range: 1
    Hit: Single
@@ -5023,47 +5014,26 @@ Body:
    CastTime: 1000
    Duration1:
      - Level: 1
-        Time: 11000
+        Time: 5000
      - Level: 2
-        Time: 10000
+        Time: 5500
      - Level: 3
-        Time: 9000
+        Time: 6000
      - Level: 4
-        Time: 8000
+        Time: 6500
      - Level: 5
        Time: 7000
      - Level: 6
-        Time: 6000
-      - Level: 7
-        Time: 5000
-      - Level: 8
-        Time: 4000
-      - Level: 9
-        Time: 3000
-      - Level: 10
-        Time: 2000
-    Duration2: 60000
-    Cooldown:
-      - Level: 1
        Time: 7500
-      - Level: 2
-        Time: 8000
-      - Level: 3
-        Time: 8500
-      - Level: 4
-        Time: 9000
-      - Level: 5
-        Time: 9500
-      - Level: 6
-        Time: 10000
      - Level: 7
-        Time: 10500
+        Time: 8000
      - Level: 8
-        Time: 11000
+        Time: 8500
      - Level: 9
-        Time: 11500
+        Time: 9000
      - Level: 10
-        Time: 12000
+        Time: 9500
+    Duration2: 60000
    Requires:
      SpCost:
        - Level: 1
@@ -5194,8 +5164,6 @@ Body:
    MaxLevel: 1
    Type: Weapon
    TargetType: Attack
-    DamageFlags:
-      IgnoreAtkCard: true
    Flags:
      IsQuest: true
    Range: 1
@@ -5838,8 +5806,8 @@ Body:
  - Id: 192
    Name: NPC_MAGICALATTACK
    Description: Demon Shock Attack
-    MaxLevel: 1
-    Type: Magic
+    MaxLevel: 10
+    Type: Weapon
    TargetType: Attack
    Flags:
      IsNpc: true
@@ -5945,13 +5913,34 @@ Body:
    Name: NPC_KEEPING
    Description: Keeping
    MaxLevel: 1
+    Type: Weapon
    TargetType: Self
    DamageFlags:
      NoDamage: true
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 30000
+    Duration1:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 100000
+      - Level: 6
+        Time: 110000
+      - Level: 7
+        Time: 120000
+      - Level: 8
+        Time: 130000
+      - Level: 9
+        Time: 140000
+      - Level: 10
+        Time: 150000
    Status: Keeping
  - Id: 202
    Name: NPC_DARKBREATH
@@ -5991,19 +5980,60 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 15000
+    Duration1:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 100000
+      - Level: 6
+        Time: 110000
+      - Level: 7
+        Time: 120000
+      - Level: 8
+        Time: 130000
+      - Level: 9
+        Time: 140000
+      - Level: 10
+        Time: 150000
    Status: Barrier
  - Id: 205
    Name: NPC_DEFENDER
    Description: Defender
    MaxLevel: 1
+    Type: Weapon
    TargetType: Self
    DamageFlags:
      NoDamage: true
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 15000
+    Duration1:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 100000
+      - Level: 6
+        Time: 110000
+      - Level: 7
+        Time: 120000
+      - Level: 8
+        Time: 130000
+      - Level: 9
+        Time: 140000
+      - Level: 10
+        Time: 150000
    Status: Armor
  - Id: 206
    Name: NPC_LICK
@@ -6431,7 +6461,6 @@ Body:
    TargetType: Attack
    DamageFlags:
      IgnoreAtkCard: true
-      IgnoreDefense: true
      IgnoreFlee: true
    Flags:
      IgnoreAutoGuard: true
@@ -6897,9 +6926,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 +7401,7 @@ Body:
        Time: 1500
      - Level: 5
        Time: 1000
-    Duration1: 300000
+    Duration2: 300000
    Requires:
      SpCost: 1
      Weapon:
@@ -8548,7 +8580,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
-    Duration1: 15000
    Duration2: 12000
    Requires:
      SpCost:
@@ -8840,7 +8871,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
-    Duration1: 5000
    Duration2: 5000
    Requires:
      SpCost:
@@ -9368,7 +9398,8 @@ Body:
  - Id: 349
    Name: NPC_POWERUP
    Description: Power Up
-    MaxLevel: 5
+    MaxLevel: 10
+    Type: Weapon
    TargetType: Self
    DamageFlags:
      NoDamage: true
@@ -9377,19 +9408,19 @@ Body:
    Hit: Single
    Duration1:
      - Level: 1
-        Time: 5000
-      - Level: 2
        Time: 10000
-      - Level: 3
+      - Level: 2
        Time: 15000
-      - Level: 4
+      - Level: 3
        Time: 20000
-      - Level: 5
+      - Level: 4
        Time: 25000
-    Status: Powerup
+      - Level: 5
+        Time: 30000
+    Status: IncHitRate
  - Id: 350
    Name: NPC_AGIUP
-    Description: Agility Up
+    Description: Agility UP
    MaxLevel: 10
    TargetType: Self
    DamageFlags:
@@ -9401,24 +9432,14 @@ Body:
      - Level: 1
        Time: 10000
      - Level: 2
-        Time: 20000
+        Time: 15000
      - Level: 3
-        Time: 30000
+        Time: 20000
      - Level: 4
-        Time: 40000
+        Time: 25000
      - Level: 5
-        Time: 50000
-      - Level: 6
-        Time: 60000
-      - Level: 7
-        Time: 70000
-      - Level: 8
-        Time: 80000
-      - Level: 9
-        Time: 90000
-      - Level: 10
-        Time: 100000
-    Status: Agiup
+        Time: 30000
+    Status: IncFleeRate
  - Id: 351
    Name: NPC_SIEGEMODE
    Description: Siege Mode
@@ -9620,7 +9641,7 @@ Body:
    Hit: Single
    HitCount: 1
    Duration1: 300000
-    Duration2: 10000
+    Duration2: 15000
    Requires:
      SpCost: 200
    Status: Berserk
@@ -10010,15 +10031,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 +10055,7 @@ Body:
        - Level: 5
          Amount: 12
      SpiritSphereCost: 1
-    Status: Ankle
+    Status: Stop
  - Id: 372
    Name: CH_CHAINCRUSH
    Description: Chain Crush Combo
@@ -10212,7 +10233,17 @@ Body:
        Time: 55000
      - Level: 5
        Time: 60000
-    Duration2: 60000
+    Duration2:
+      - Level: 1
+        Time: 20000
+      - Level: 2
+        Time: 30000
+      - Level: 3
+        Time: 40000
+      - Level: 4
+        Time: 50000
+      - Level: 5
+        Time: 60000
    Requires:
      SpCost:
        - Level: 1
@@ -10813,7 +10844,7 @@ Body:
      IgnoreDefense: true
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -10855,7 +10886,7 @@ Body:
      Weapon:
        1hSpear: true
        2hSpear: true
-    Status: Ankle
+    Status: Stop
  - Id: 398
    Name: LK_HEADCRUSH
    Description: Traumatic Blow
@@ -11074,7 +11105,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      NoDamage: true
-    Range: 9
+    Range: 7
    Hit: Single
    HitCount: 1
    ActiveInstance: 3
@@ -13835,6 +13866,8 @@ Body:
    Description: Chain Action
    MaxLevel: 10
    Type: Weapon
+    DamageFlags:
+      Critical: true
    Range: -9
    Hit: Multi_Hit
    HitCount: 2
@@ -14306,7 +14339,6 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
      IgnoreFlee: true
    Flags:
      AlterRangeSnakeEye: true
@@ -14392,7 +14424,7 @@ Body:
    Type: Weapon
    TargetType: Attack
    DamageFlags:
-      IgnoreAtkCard: true
+      IgnoreFlee: true
    Range: 9
    Hit: Single
    HitCount: 1
@@ -14410,6 +14442,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      IgnoreAtkCard: true
+      IgnoreFlee: true
    Range: 9
    Hit: Multi_Hit
    HitCount: 3
@@ -14485,7 +14518,7 @@ Body:
    Flags:
      IgnoreBgReduction: true
      IgnoreGvgReduction: true
-    Range: 7
+    Range: 9
    Hit: Single
    HitCount: 1
    CopyFlags:
@@ -14522,8 +14555,6 @@ Body:
    MaxLevel: 5
    Type: Weapon
    TargetType: Self
-    DamageFlags:
-      IgnoreAtkCard: true
    Hit: Single
    HitCount: 1
    Element: Weapon
@@ -16344,7 +16375,7 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 300000
+    Duration1: -1
    Status: Invincible
  - Id: 686
    Name: NPC_INVINCIBLEOFF
@@ -16356,6 +16387,8 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
+    Duration1: 60000
+    Status: InvincibleOff
  - Id: 687
    Name: NPC_ALLHEAL
    Description: Full Heal
@@ -16974,13 +17007,32 @@ Body:
      Skill:
        Plagiarism: true
        Reproduce: true
-    Duration2: 60000
+    Duration2:
+      - Level: 1
+        Time: 15000
+      - Level: 2
+        Time: 20000
+      - Level: 3
+        Time: 25000
+      - Level: 4
+        Time: 30000
+      - Level: 5
+        Time: 35000
+      - Level: 6
+        Time: 40000
+      - Level: 7
+        Time: 45000
+      - Level: 8
+        Time: 50000
+      - Level: 9
+        Time: 55000
+      - Level: 10
+        Time: 60000
    Requires:
      SpCost: 15
      Ammo:
        Dagger: true
      AmmoAmount: 1
-    Status: Poison
  - Id: 1005
    Name: RG_CLOSECONFINE
    Description: Close Confine
@@ -17192,7 +17244,6 @@ Body:
    TargetType: Attack
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
    Flags:
      IsQuest: true
    Range: -1
@@ -30736,8 +30787,10 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
+    Range: 9
+    Hit: Single
+    HitCount: 1
    AfterCastActDelay: 2000
-    AfterCastWalkDelay: 1000
    Requires:
      SpCost:
        - Level: 1
@@ -30760,8 +30813,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 +30846,7 @@ Body:
    Name: HLIF_BRAIN
    Description: Brain Surgery
    MaxLevel: 5
+    SplashArea: 1
  - Id: 8004
    Name: HLIF_CHANGE
    Description: Change
@@ -30797,14 +30854,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 +30862,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
@@ -30823,8 +30880,7 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastActDelay: 1000
-    AfterCastWalkDelay: 1000
+    Duration2: 1000
    Requires:
      SpCost: 10
  - Id: 8006
@@ -30836,7 +30892,6 @@ Body:
      NoDamage: true
    Hit: Single
    AfterCastActDelay: 30000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@@ -30875,14 +30930,6 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastActDelay:
-      - Level: 1
-        Time: 300000
-      - Level: 2
-        Time: 600000
-      - Level: 3
-        Time: 900000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@@ -30890,6 +30937,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
@@ -30912,6 +30966,7 @@ Body:
        Count: -2
      - Level: 5
        Count: -3
+    AfterCastWalkDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@@ -30932,18 +30987,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
@@ -30955,6 +30998,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
@@ -30978,18 +31032,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
@@ -31001,6 +31043,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
@@ -31023,6 +31076,7 @@ Body:
    Range: 15
    Hit: Single
    HitCount: 1
+    AfterCastActDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8013
@@ -31044,6 +31098,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
@@ -31064,7 +31129,8 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastWalkDelay: 1500
+    AfterCastActDelay: 3000
+    AfterCastWalkDelay: 3000
    Requires:
      SpCost: 40
  - Id: 8015
@@ -31088,6 +31154,7 @@ Body:
    HitCount: 1
    Element: Weapon
    SplashArea: 4
+    AfterCastWalkDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8018
@@ -32400,9 +32467,9 @@ Body:
    Hit: Single
    HitCount: 1
    Duration1: 300000
-    Duration2: 10000
+    Duration2: 15000
    Requires:
-      SpCost: 200
+      SpCost: 100
    Status: Berserk
  - Id: 8207
    Name: MA_DOUBLE
@@ -32581,7 +32648,7 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
+      IgnoreFlee: true
    Flags:
      IsTrap: true
      AlterRangeResearchTrap: true
@@ -32748,7 +32815,7 @@ Body:
      IgnoreDefense: true
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -32791,7 +32858,7 @@ Body:
          Amount: 27
        - Level: 5
          Amount: 30
-    Status: Ankle
+    Status: Stop
  - Id: 8219
    Name: ML_DEFENDER
    Description: Defending_Aura
@@ -33001,10 +33068,9 @@ Body:
    Type: Weapon
    TargetType: Attack
    Range: 1
-    Hit: Single
-    HitCount: 1
+    Hit: Multi_Hit
+    HitCount: 3
    Element: Weapon
-    CastCancel: true
    CastTime: 1000
    AfterCastActDelay: 2000
    Duration2: 5000
--- a/db/pre-re/statpoint.yml
+++ b/db/pre-re/statpoint.yml
@@ -532,23 +532,3 @@ Body:
    Points: 4545
  - Level: 250
    Points: 4545
-  - Level: 251
-    Points: 4545
-  - Level: 252
-    Points: 4545
-  - Level: 253
-    Points: 4545
-  - Level: 254
-    Points: 4545
-  - Level: 255
-    Points: 4545
-  - Level: 256
-    Points: 4545
-  - Level: 257
-    Points: 4545
-  - Level: 258
-    Points: 4545
-  - Level: 259
-    Points: 4545
-  - Level: 260
-    Points: 4545
--- a/db/pre-re/status.yml
+++ b/db/pre-re/status.yml
@@ -162,7 +162,6 @@ Body:
  - Status: Poison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -253,7 +252,6 @@ Body:
  - Status: Dpoison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -769,6 +767,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
      RemoveOnChangeMap: true
+    MinDuration: 5000
  - Status: Keeping
    DurationLookup: NPC_KEEPING
    CalcFlags:
@@ -1099,7 +1098,6 @@ Body:
    Icon: EFST_GROUNDMAGIC
    DurationLookup: SA_VOLCANO
    CalcFlags:
-      Batk: true
      Watk: true
    Flags:
      NoSave: true
@@ -1123,14 +1121,8 @@ Body:
      NoClearance: true
  - Status: Watk_Element
    DurationLookup: MS_MAGNUM
-    Flags:
-      NoSave: true
-    EndOnStart:
-      Watk_Element: true
  - Status: Armor
    DurationLookup: NPC_DEFENDER
-    CalcFlags:
-      Speed: true
  - Status: Armor_Element_Water
    Icon: EFST_RESIST_PROPERTY_WATER
    CalcFlags:
@@ -2058,6 +2050,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Inchitrate
+    DurationLookup: NPC_POWERUP
    CalcFlags:
      Hit: true
    Flags:
@@ -2076,6 +2069,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Incfleerate
+    DurationLookup: NPC_AGIUP
    CalcFlags:
      Flee: true
    Flags:
@@ -2478,17 +2472,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
@@ -2722,7 +2712,6 @@ Body:
    CalcFlags:
      Flee: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2731,7 +2720,6 @@ Body:
    CalcFlags:
      Watk: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2740,7 +2728,6 @@ Body:
    CalcFlags:
      MaxHp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2749,7 +2736,6 @@ Body:
    CalcFlags:
      MaxSp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2758,7 +2744,6 @@ Body:
    CalcFlags:
      Hit: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2827,12 +2812,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:
@@ -7052,25 +7048,3 @@ Body:
      NoClearbuff: true
  - Status: WeaponBreaker
    DurationLookup: NPC_WEAPONBRAKER
-  - Status: Powerup
-    Icon: EFST_POWERUP
-    DurationLookup: NPC_POWERUP
-    CalcFlags:
-      Hit: true
-    Flags:
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-  - Status: Agiup
-    Icon: EFST_AGIUP
-    DurationLookup: NPC_AGIUP
-    CalcFlags:
-      Speed: true
-      Flee: true
-    Flags:
-      NoClearbuff: true
-      NoBanishingBuster: true
-      NoClearance: true
-    EndOnStart:
-      Decreaseagi: true
--- a/db/re/achievement_db.yml
+++ b/db/re/achievement_db.yml
@@ -2049,21 +2049,21 @@ Body:
  - Id: 200032
    Group: Goal_Level
    Name: The start of another adventure!
-    Condition: " BaseLevel >= 100 "
+    Condition: " BaseLevel == 100 "
    Rewards:
      Item: Rebeginer_Box_100
    Score: 10
  - Id: 200033
    Group: Goal_Level
    Name: With a new mind!(1)
-    Condition: " BaseLevel >= 170 && (Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS_T) "
+    Condition: " BaseLevel == 170 && (Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS_T) "
    Rewards:
      Item: Costume_Ticket
    Score: 50
  - Id: 200034
    Group: Goal_Level
    Name: With a new mind!(2)
-    Condition: " BaseLevel >= 170 && (Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER_T) "
+    Condition: " BaseLevel == 170 && (Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER_T) "
    Rewards:
      Item: Costume_Ticket
    Score: 50
--- 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
--- a/db/re/item_group_db.yml
+++ b/db/re/item_group_db.yml
--- a/db/re/item_packages.yml
+++ b/db/re/item_packages.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
@@ -159,153 +159,77 @@ Body:
            RentalHours: 1
      - Group: 9
        Items:
+          - Item: Red_Potion
+            Amount: 10
+          - Item: Red_Potion
+            Amount: 5
+          - Item: Red_Potion
          - Item: Red_Potion
            Amount: 3
            RentalHours: 1
      - Group: 10
        Items:
          - Item: Guard_
+          - Item: Guard_
+          - Item: Guard_
      - Group: 11
        Items:
          - Item: Orange_Potion
            Amount: 800
-  - Item: Minus_Status_Box_
+  - Item: Boost_Armor_Box
    Groups:
      - Group: 0
        Items:
-          - Item: Minus_Str
-            Amount: 6
+          - Item: Atker_Plate
+          - Item: Atker_Manteau
+          - Item: Atker_Greave
+          - Item: Atker_Ring
+          - Item: Boost_Up_1
+            Amount: 3
      - Group: 1
        Items:
-          - Item: Minus_Agi
-            Amount: 6
+          - Item: Ran_Suits
+          - Item: Ran_Manteau
+          - Item: Ran_Boots
+          - Item: Ran_Brooch
+          - Item: Boost_Up_1
+            Amount: 3
      - Group: 2
        Items:
-          - Item: Minus_Vit
-            Amount: 6
+          - Item: Ele_Robe
+          - Item: Ele_Muffler
+          - Item: Ele_Shoes
+          - Item: Ele_Earing
+          - Item: Boost_Up_1
+            Amount: 3
      - Group: 3
        Items:
-          - Item: Minus_Int
-            Amount: 6
-      - Group: 4
-        Items:
-          - Item: Minus_Dex
-            Amount: 6
-      - Group: 5
-        Items:
-          - Item: Minus_Luk
-            Amount: 6
-      - Group: 6
-        Items:
-          - Item: Minus_Str
-          - Item: Minus_Agi
-          - Item: Minus_Vit
-          - Item: Minus_Int
-          - Item: Minus_Dex
-          - Item: Minus_Luk
-  - Item: Alchemist_Box_
+          - Item: Defn_Robe
+          - Item: Defn_Muffler
+          - Item: Defn_Shoes
+          - Item: Defn_Earing
+          - Item: Boost_Up_1
+            Amount: 3
+  - Item: Special_Coin_Pack
    Groups:
      - Group: 0
        Items:
-          - Item: Fire_Bottle
-            Amount: 50
+          - Item: EP17_1_EVT39
+            Amount: 3
+          - Item: EP17_1_EVT02
+            Amount: 18
      - Group: 1
        Items:
-          - Item: Acid_Bottle
-            Amount: 50
+          - Item: BarMealTicket
+            Amount: 20
      - Group: 2
        Items:
-          - Item: MenEater_Plant_Bottle
-            Amount: 50
+          - Item: Ep18_Amethyst_Fragment
+            Amount: 20
      - Group: 3
        Items:
-          - Item: Coating_Bottle
-            Amount: 50
-      - Group: 4
-        Items:
-          - Item: Mini_Bottle
-            Amount: 50
-  - Item: FullPene_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: FullPene_Earring_Box
-      - Group: 1
-        Items:
-          - Item: FullPene_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: FullPene_Armor_Box
-      - Group: 3
-        Items:
-          - Item: FullPene_Shoes_Box
-  - Item: FullTemp_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: FullTemp_Earring_Box
-      - Group: 1
-        Items:
-          - Item: FullTemp_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: FullTemp_Armor_Box
-      - Group: 3
-        Items:
-          - Item: FullTemp_Shoes_Box
-  - Item: Durable_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Durable_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Durable_Shield_Box
-  - Item: Clever_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Clever_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Clever_Shield_Box
-  - Item: OS_Helm_Box_
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Ignis_CapK
-      - Group: 1
-        Items:
-          - Item: Phantom_Cap
-      - Group: 2
-        Items:
-          - Item: Stripe_Hat
-      - Group: 3
-        Items:
-          - Item: Clock_Casket_RD
-      - Group: 4
-        Items:
-          - Item: Large_Sorcerer_Crown
-      - Group: 5
-        Items:
-          - Item: Scorpio_Diadem_K
-      - Group: 6
-        Items:
-          - Item: Sagittarius_DiademK
-  - Item: Shadow_R_M_Box_
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Class_Sha_R_M_Melee
-      - Group: 1
-        Items:
-          - Item: Class_Sha_R_M_Magic
-      - Group: 2
-        Items:
-          - Item: Skill_Sha_R_M_Melee
-      - Group: 3
-        Items:
-          - Item: Skill_Sha_R_M_Magic
+          - Item: Ep19_Snow_Flower
+            Amount: 20
  - Item: Metal_W_Box
    Groups:
      - Group: 0
@@ -402,581 +326,206 @@ Body:
      - Group: 3
        Items:
          - Item: C_School_Bag_PU
-  - Item: Special_Coin_Pack
+  - Item: aegis_101470
    Groups:
      - Group: 0
        Items:
-          - Item: EP17_1_EVT39
-            Amount: 3
-          - Item: EP17_1_EVT02
-            Amount: 18
+          - Item: Minus_Str
+            Amount: 6
      - Group: 1
        Items:
-          - Item: BarMealTicket
-            Amount: 20
+          - Item: Minus_Agi
+            Amount: 6
      - Group: 2
        Items:
-          - Item: Ep18_Amethyst_Fragment
-            Amount: 20
+          - Item: Minus_Vit
+            Amount: 6
      - Group: 3
        Items:
-          - Item: Ep19_Snow_Flower
-            Amount: 20
-  - Item: Boost_Armor_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Atker_Plate
-          - Item: Atker_Manteau
-          - Item: Atker_Greave
-          - Item: Atker_Ring
-          - Item: Boost_Up_1
-            Amount: 3
-      - Group: 1
-        Items:
-          - Item: Ran_Suits
-          - Item: Ran_Manteau
-          - Item: Ran_Boots
-          - Item: Ran_Brooch
-          - Item: Boost_Up_1
-            Amount: 3
-      - Group: 2
-        Items:
-          - Item: Ele_Robe
-          - Item: Ele_Muffler
-          - Item: Ele_Shoes
-          - Item: Ele_Earing
-          - Item: Boost_Up_1
-            Amount: 3
-      - Group: 3
-        Items:
-          - Item: Defn_Robe
-          - Item: Defn_Muffler
-          - Item: Defn_Shoes
-          - Item: Defn_Earing
-          - Item: Boost_Up_1
-            Amount: 3
-  - Item: AllMighty_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: AllMighty_Earring_Box
-      - Group: 1
-        Items:
-          - Item: AllMighty_Pendant_Box
-  - Item: TrueGem_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: TrueGem_Earring_Box
-      - Group: 1
-        Items:
-          - Item: TrueGem_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: TrueGem_Shoes_Box
-      - Group: 3
-        Items:
-          - Item: TrueGem_Armor_Box
-  - Item: PerfectSize_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: PerfectSize_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: PerfectSize_Armor_Box
-  - Item: Mammoth_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Mammoth_Earring_Box
-      - Group: 1
-        Items:
-          - Item: Mammoth_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: Mammoth_Armor_Box
-      - Group: 3
-        Items:
-          - Item: Mammoth_Shoes_Box
-  - Item: SpellCaster_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: SpellCaster_Earring_Box
-      - Group: 1
-        Items:
-          - Item: SpellCaster_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: SpellCaster_Armor_Box
-      - Group: 3
-        Items:
-          - Item: SpellCaster_Shoes_Box
-  - Item: Absorb_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Absorb_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Absorb_Shield_Box
-  - Item: R_Bearers_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: R_Bearers_Earring_Box
-      - Group: 1
-        Items:
-          - Item: R_Bearers_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: R_Bearers_Armor_Box
-      - Group: 3
-        Items:
-          - Item: R_Bearers_Shoes_Box
-  - Item: Hasty_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Hasty_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Hasty_Shield_Box
-  - Item: MAutoSpell_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: MAutoSpell_Earring_Box
-      - Group: 1
-        Items:
-          - Item: MAutoSpell_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: MAutoSpell_Armor_Box
-      - Group: 3
-        Items:
-          - Item: MAutoSpell_Shoes_Box
-  - Item: Infinity_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Infinity_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Infinity_Shield_Box
-  - Item: EXP_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: EXP_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: EXP_Shield_Box
-  - Item: M_Blitz_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: M_Blitz_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: M_Blitz_Shield_Box
-  - Item: GoodnEvil_Circlet_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: GoodnEvil_Circlet_NW
-      - Group: 1
-        Items:
-          - Item: GoodnEvil_Circlet_NW2
-      - Group: 2
-        Items:
-          - Item: GoodnEvil_Circlet_NW3
-      - Group: 3
-        Items:
-          - Item: GoodnEvil_Circlet_NW4
+          - Item: Minus_Int
+            Amount: 6
      - Group: 4
        Items:
-          - Item: GoodnEvil_Circlet_NW5
-  - Item: Hero_Weapon_Up_S_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Hero_Weapon_Up_Box_1
-      - Group: 1
-        Items:
-          - Item: Hero_Weapon_Up_Box_2
-      - Group: 2
-        Items:
-          - Item: Hero_Weapon_Up_Box_3
-      - Group: 3
-        Items:
-          - Item: Hero_Weapon_Up_Box_4
-      - Group: 4
-        Items:
-          - Item: Hero_Weapon_Up_Box_5
+          - Item: Minus_Dex
+            Amount: 6
      - Group: 5
        Items:
-          - Item: Hero_Weapon_Up_Box_6
-  - Item: Hero_Weapon_Hammer_S
+          - Item: Minus_Luk
+            Amount: 6
+      - Group: 6
+        Items:
+          - Item: Minus_Str
+          - Item: Minus_Agi
+          - Item: Minus_Vit
+          - Item: Minus_Int
+          - Item: Minus_Dex
+          - Item: Minus_Luk
+  - Item: aegis_101471
    Groups:
      - Group: 0
        Items:
-          - Item: Hero_Weapon_Hammer_1
+          - Item: Fire_Bottle
+            Amount: 50
      - Group: 1
        Items:
-          - Item: Hero_Weapon_Hammer_2
+          - Item: Acid_Bottle
+            Amount: 50
      - Group: 2
        Items:
-          - Item: Hero_Weapon_Hammer_3
+          - Item: MenEater_Plant_Bottle
+            Amount: 50
      - Group: 3
        Items:
-          - Item: Hero_Weapon_Hammer_4
+          - Item: Coating_Bottle
+            Amount: 50
      - Group: 4
        Items:
-          - Item: Hero_Weapon_Hammer_5
+          - Item: Mini_Bottle
+            Amount: 50
+  - Item: aegis_101542
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101543
+      - Group: 1
+        Items:
+          - Item: aegis_101544
+      - Group: 2
+        Items:
+          - Item: aegis_101545
+      - Group: 3
+        Items:
+          - Item: aegis_101546
+  - Item: aegis_101547
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101548
+      - Group: 1
+        Items:
+          - Item: aegis_101549
+      - Group: 2
+        Items:
+          - Item: aegis_101550
+      - Group: 3
+        Items:
+          - Item: aegis_101551
+  - Item: aegis_101552
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101553
+      - Group: 1
+        Items:
+          - Item: aegis_101554
+  - Item: aegis_101555
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101556
+      - Group: 1
+        Items:
+          - Item: aegis_101557
+  - Item: aegis_101563
+    Groups:
+      - Group: 0
+        Items:
+          - Item: Ignis_CapK
+      - Group: 1
+        Items:
+          - Item: Phantom_Cap
+      - Group: 2
+        Items:
+          - Item: Stripe_Hat
+      - Group: 3
+        Items:
+          - Item: Clock_Casket_RD
+      - Group: 4
+        Items:
+          - Item: Large_Sorcerer_Crown
      - Group: 5
        Items:
-          - Item: Hero_Weapon_Hammer_6
-  - Item: aegis_102215
+          - Item: Scorpio_Diadem_K
+      - Group: 6
+        Items:
+          - Item: Sagittarius_DiademK
+  - Item: aegis_101565
    Groups:
      - Group: 0
        Items:
-          - Item: Bio_Weapon_Refine_Cube
+          - Item: Class_Sha_R_M_Melee
      - Group: 1
        Items:
-          - Item: Old_Refine_Cube
+          - Item: Class_Sha_R_M_Magic
      - Group: 2
        Items:
-          - Item: Geffen_Refine_Cube
-  - Item: aegis_102216
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Bio_Helm_Refine_Cube
-      - Group: 1
-        Items:
-          - Item: Circlet_Refine_Cube
-      - Group: 2
-        Items:
-          - Item: Auto_Armor_Refine_Cube
+          - Item: Skill_Sha_R_M_Melee
      - Group: 3
        Items:
-          - Item: Racecap_Refine_Cube
-      - Group: 4
-        Items:
-          - Item: OS_Weapon_Refine_Cube
-      - Group: 5
-        Items:
-          - Item: Temporal_Refine_Cube
-  - Item: Hero_Weapon_S_Box_1
+          - Item: Skill_Sha_R_M_Magic
+  - Item: aegis_101654
    Groups:
      - Group: 0
        Items:
-          - Item: Royal_Bow_K
-            Refine: 11
+          - Item: aegis_101655
      - Group: 1
        Items:
-          - Item: Shadow_Staff_K
-            Refine: 11
+          - Item: aegis_101656
+  - Item: aegis_101657
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101658
+      - Group: 1
+        Items:
+          - Item: aegis_101659
      - Group: 2
        Items:
-          - Item: Iron_Nail_K
-            Refine: 11
+          - Item: aegis_101660
      - Group: 3
        Items:
-          - Item: Blue_Crystal_Staff
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Freezing_Rod
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Ancient_Hero_Boots
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_2
+          - Item: aegis_101661
+  - Item: aegis_101662
    Groups:
      - Group: 0
        Items:
-          - Item: Sword_Of_Bluefire
-            Refine: 11
+          - Item: aegis_101663
      - Group: 1
        Items:
-          - Item: Iron_Staff
-            Refine: 11
+          - Item: aegis_101664
+  - Item: aegis_101727
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101717
+      - Group: 1
+        Items:
+          - Item: aegis_101718
      - Group: 2
        Items:
-          - Item: Oriental_Sword
-            Refine: 11
+          - Item: aegis_101719
      - Group: 3
        Items:
-          - Item: Fog_Dew_Sword
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Sharp_Wind_Sword
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Humma_Clear
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_3
+          - Item: aegis_101720
+  - Item: aegis_101728
    Groups:
      - Group: 0
        Items:
-          - Item: Narcis_Bow
-            Refine: 11
+          - Item: aegis_101721
      - Group: 1
        Items:
-          - Item: Magic_Sword
-            Refine: 11
+          - Item: aegis_101722
      - Group: 2
        Items:
-          - Item: Avenger
-            Refine: 11
+          - Item: aegis_101723
      - Group: 3
        Items:
-          - Item: Undine_Spear_K
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Demon_Hunting_Bible_K
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Shiver_Katar_K
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_4
+          - Item: aegis_101724
+  - Item: aegis_101729
    Groups:
      - Group: 0
        Items:
-          - Item: OneSkyOneSun
-            Refine: 11
+          - Item: aegis_101725
      - Group: 1
        Items:
-          - Item: SoulWeight
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: MeawFoxtail
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Freedom_Stick
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Blessed_Knife
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_5
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Dragonic_Slayer
-            Refine: 11
-      - Group: 1
-        Items:
-          - Item: Light_Blade
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: Slate_Sword
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Trumpet_Shell_K
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Barb_Wire_K
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Meteor_Striker
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_6
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Saint_Hall
-            Refine: 11
-      - Group: 1
-        Items:
-          - Item: Ray_Knuckle
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: Blade_Katar
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Fatalist
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Scalet_Dragon_L_Bow
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_7
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Crimson_Rose
-            Refine: 11
-      - Group: 1
-        Items:
-          - Item: Master_Soul_Rifle
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: Demon_S_Shot
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Golden_L_Launcher
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: The_Black_Gatling
-            Refine: 11
-  - Item: 2023_Spring_Select
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Lop_Bunny_Cloak
-      - Group: 1
-        Items:
-          - Item: C_Heart_Chiffon_Rabbit
-      - Group: 2
-        Items:
-          - Item: C_Teaparty_Wonderland
-      - Group: 3
-        Items:
-          - Item: C_Chocolat_Rabbit_Hair
-  - Item: RO_Concert_Scroll2
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Headset_OST
-      - Group: 1
-        Items:
-          - Item: C_Music_Decoration
-      - Group: 2
-        Items:
-          - Item: C_Whistle
-  - Item: 21th_Costume_Select
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Ocean_Color_Long
-      - Group: 1
-        Items:
-          - Item: C_Aqua_Fin_Decoration
-      - Group: 2
-        Items:
-          - Item: C_Sailor_Cap
-  - Item: Cinnamon_Costume_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Cinnamon2
-      - Group: 1
-        Items:
-          - Item: C_Cinnamon
-      - Group: 2
-        Items:
-          - Item: C_JP_EV16
-      - Group: 3
-        Items:
-          - Item: C_JP_EV17
-  - Item: IsgardCrown_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Glacier_Helm_1
-      - Group: 1
-        Items:
-          - Item: Glacier_Helm_2
-      - Group: 2
-        Items:
-          - Item: Glacier_Helm_3
-  - Item: AceCard_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Heart_Ace_Melee
-      - Group: 1
-        Items:
-          - Item: Spade_Ace_Melee
-      - Group: 2
-        Items:
-          - Item: Diamond_Ace_Range
-      - Group: 3
-        Items:
-          - Item: Clover_Ace_Defense
-  - Item: Loki_Coin_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Loki_Coin
-            Amount: 10
-      - Group: 1
-        Items:
-          - Item: Loki_Coin_2
-            Amount: 10
-      - Group: 2
-        Items:
-          - Item: Loki_Coin_3
-            Amount: 10
-      - Group: 3
-        Items:
-          - Item: Loki_Coin_4
-            Amount: 10
-  - Item: Loki_Advice_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Loki_Advice
-            Amount: 10
-      - Group: 1
-        Items:
-          - Item: Loki_Advice_2
-            Amount: 10
-      - Group: 2
-        Items:
-          - Item: Loki_Advice_3
-            Amount: 10
-      - Group: 3
-        Items:
-          - Item: Loki_Advice_4
-            Amount: 10
-  - Item: 2023_Xmas_Costume
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_SnowmanHat
-      - Group: 1
-        Items:
-          - Item: C_WinterNightBells
-      - Group: 2
-        Items:
-          - Item: C_SantaTeddyBear
-  - Item: 10AllMighty_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: S_AllMighty_Earring
-            Refine: 10
-      - Group: 1
-        Items:
-          - Item: S_AllMighty_Pendant
-            Refine: 10
-  - Item: Sonic_Costume_Pack
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Super_Sonic_Mini
-      - Group: 1
-        Items:
-          - Item: C_Chaos_Emerald
+          - Item: aegis_101726
--- a/db/re/item_randomopt_group.yml
+++ b/db/re/item_randomopt_group.yml
@@ -15318,663 +15318,3 @@ Body:
            MinValue: 1
            MaxValue: 7
            Chance: 400
-  - Id: 168
-    Group: PONTIFEX_COURAGE
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 200
-            MaxValue: 1000
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 50
-            MaxValue: 250
-            Chance: 10000
-          - Option: VAR_ATKPERCENT
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-          - Option: VAR_ATTPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 5
-            MaxValue: 25
-            Chance: 10000
-          - Option: VAR_HITSUCCESSVALUE
-            MinValue: 5
-            MaxValue: 25
-            Chance: 10000
-          - Option: RACE_DAMAGE_HUMAN
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANIMAL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_DEVIL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_DRAGON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_PLANT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANGEL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_UNDEAD
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_INSECT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_FISHS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: DAMAGE_PROPERTY_FIRE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_SAINT_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_DARKNESS_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_POISON_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_NOTHING_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_TELEKINESIS_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_SIZE_SMALL_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_SIZE_LARGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-  - Id: 169
-    Group: PONTIFEX_WISDOM
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 200
-            MaxValue: 1000
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 50
-            MaxValue: 250
-            Chance: 10000
-          - Option: VAR_MAGICATKPERCENT
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-          - Option: VAR_ATTMPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 5
-            MaxValue: 25
-            Chance: 10000
-          - Option: DEC_SPELL_CAST_TIME
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: RACE_MDAMAGE_HUMAN
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANIMAL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DEVIL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DRAGON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_PLANT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANGEL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_UNDEAD
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_INSECT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_FISHS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: MDAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_SMALL_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_LARGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-  - Id: 170
-    Group: PONTIFEX_TENACITY
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 250
-            MaxValue: 1250
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 75
-            MaxValue: 375
-            Chance: 10000
-          - Option: VAR_ATKPERCENT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: VAR_ATTPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 6
-            MaxValue: 30
-            Chance: 10000
-          - Option: VAR_HITSUCCESSVALUE
-            MinValue: 6
-            MaxValue: 30
-            Chance: 10000
-          - Option: RACE_DAMAGE_HUMAN
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANIMAL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_DEVIL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_DRAGON
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_PLANT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_NOTHING
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANGEL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_UNDEAD
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_INSECT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_FISHS
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: DAMAGE_PROPERTY_WATER_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_WIND_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_GROUND_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_FIRE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_SAINT_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_DARKNESS_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_POISON_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_NOTHING_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_TELEKINESIS_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_SIZE_SMALL_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_SIZE_LARGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-  - Id: 171
-    Group: PONTIFEX_BELIEF
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 250
-            MaxValue: 1250
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 75
-            MaxValue: 375
-            Chance: 10000
-          - Option: VAR_MAGICATKPERCENT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: VAR_ATTMPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 6
-            MaxValue: 30
-            Chance: 10000
-          - Option: DEC_SPELL_CAST_TIME
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_HUMAN
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANIMAL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DEVIL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DRAGON
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_PLANT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_NOTHING
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANGEL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_UNDEAD
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_INSECT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_FISHS
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: MDAMAGE_PROPERTY_POISON_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_PROPERTY_NOTHING_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_PROPERTY_TELEKINESIS_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_SMALL_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_LARGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
--- 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
--- a/db/re/job_stats.yml
+++ b/db/re/job_stats.yml
@@ -8884,15 +8884,6 @@ Body:
      - Level: 50
        Vit: 1
        Pow: 1
-      - Level: 51
-        Crt: 1
-      - Level: 52
-        Pow: 1
-      - Level: 54
-        Pow: 1
-        Crt: 1
-      - Level: 55
-        Sta: 1
  - Jobs:
      Meister: true
      Meister2: true
@@ -9026,15 +9017,6 @@ Body:
      - Level: 50
        Pow: 1
        Wis: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Con: 1
-      - Level: 53
-        Sta: 1
-        Wis: 1
-      - Level: 55
-        Pow: 1
  - Jobs:
      Shadow_Cross: true
    MaxWeight: 32000
@@ -9167,15 +9149,6 @@ Body:
      - Level: 50
        Pow: 1
        Crt: 1
-      - Level: 51
-        Pow: 1
-      - Level: 53
-        Con: 1
-      - Level: 54
-        Sta: 1
-        Crt: 1
-      - Level: 55
-        Crt: 1
  - Jobs:
      Arch_Mage: true
    MaxWeight: 30000
@@ -9213,7 +9186,7 @@ Body:
        Vit: 1
        Int: 1
      - Level: 13
-        Dex: 1
+        Agi: 1
        Spl: 1
      - Level: 14
        Sta: 1
@@ -9229,7 +9202,7 @@ Body:
        Int: 1
        Dex: 1
      - Level: 19
-        Int: 1
+        Dex: 1
      - Level: 20
        Vit: 1
        Int: 1
@@ -9308,15 +9281,6 @@ Body:
      - Level: 50
        Sta: 1
        Wis: 1
-      - Level: 52
-        Spl: 1
-      - Level: 53
-        Con: 1
-      - Level: 54
-        Sta: 1
-        Wis: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Cardinal: true
    MaxWeight: 30000
@@ -9449,16 +9413,6 @@ Body:
      - Level: 50
        Spl: 1
        Crt: 1
-      - Level: 51
-        Spl: 1
-      - Level: 52
-        Pow: 1
-      - Level: 53
-        Sta: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Crt: 1
  - Jobs:
      Windhawk: true
      Windhawk2: true
@@ -9592,15 +9546,6 @@ Body:
      - Level: 50
        Dex: 1
        Con: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Pow: 1
-        Con: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
  - Jobs:
      Imperial_Guard: true
      Imperial_Guard2: true
@@ -9735,15 +9680,6 @@ Body:
      - Level: 50
        Pow: 1
        Sta: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Wis: 1
-        Con: 1
  - Jobs:
      Biolo: true
    MaxWeight: 32000
@@ -9876,15 +9812,6 @@ Body:
      - Level: 50
        Str: 1
        Crt: 1
-      - Level: 51
-        Crt: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Pow: 1
-        Crt: 1
-      - Level: 55
-        Con: 1
  - Jobs:
      Abyss_Chaser: true
    MaxWeight: 28000
@@ -10017,15 +9944,6 @@ Body:
      - Level: 50
        Pow: 1
        Spl: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Crt: 1
-      - Level: 54
-        Sta: 1
-      - Level: 55
-        Sta: 1
-        Con: 1
  - Jobs:
      Elemental_Master: true
    MaxWeight: 30000
@@ -10158,16 +10076,6 @@ Body:
      - Level: 50
        Wis: 1
        Spl: 1
-      - Level: 51
-        Spl: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Sta: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Inquisitor: true
    MaxWeight: 30000
@@ -10300,15 +10208,6 @@ Body:
      - Level: 50
        Pow: 1
        Wis: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
-        Wis: 1
  - Jobs:
      Troubadour: true
    MaxWeight: 32000
@@ -10441,15 +10340,6 @@ Body:
        Con: 1
      - Level: 50
        Dex: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Spl: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
-        Con: 1
  - Jobs:
      Trouvere: true
    MaxWeight: 32000
@@ -10583,15 +10473,6 @@ Body:
        Con: 1
      - Level: 50
        Agi: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Spl: 1
-      - Level: 55
-        Pow: 1
-        Con: 1
  - Jobs:
      Sky_Emperor: true
    MaxWeight: 42000
@@ -10726,14 +10607,6 @@ Body:
      - Level: 50
        Pow: 1
        Crt: 1
-      - Level: 51
-        Sta: 1
-        Con: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
-        Con: 1
  - Jobs:
      Soul_Ascetic: true
    MaxWeight: 42000
@@ -10857,16 +10730,6 @@ Body:
      - Level: 50
        Wis: 1
        Spl: 1
-      - Level: 51
-        Spl: 1
-      - Level: 52
-        Con: 1
-      - Level: 53
-        Wis: 1
-      - Level: 54
-        Sta: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Shinkiro: true
    MaxWeight: 45000
@@ -11000,16 +10863,6 @@ Body:
      - Level: 50
        Pow: 1
        Crt: 1
-      - Level: 51
-        Crt: 1
-      - Level: 52
-        Con: 1
-      - Level: 53
-        Wis: 1
-      - Level: 54
-        Sta: 1
-      - Level: 55
-        Sta: 1
  - Jobs:
      Shiranui: true
    MaxWeight: 45000
@@ -11132,15 +10985,6 @@ Body:
      - Level: 50
        Wis: 1
        Spl: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Spl: 1
-      - Level: 54
-        Spl: 1
-      - Level: 55
-        Spl: 1
-        Con: 1
  - Jobs:
      Night_Watch: true
    MaxWeight: 48000
@@ -11154,6 +10998,7 @@ Body:
      - Level: 2
        Str: 1
        Agi: 1
+        Sta: 1
      - Level: 3
        Vit: 1
        Luk: 1
@@ -11189,7 +11034,6 @@ Body:
        Dex: 1
      - Level: 15
        Luk: 1
-        Sta: 1
      - Level: 16
        Vit: 1
        Int: 1
@@ -11230,13 +11074,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
@@ -11251,10 +11095,7 @@ Body:
      - Level: 40
        Pow: 1
      - Level: 41
-        Sta: 1
        Con: 1
-      - Level: 42
-        Sta: 1
      - Level: 43
        Crt: 1
      - Level: 44
@@ -11263,7 +11104,6 @@ Body:
        Con: 1
      - Level: 46
        Pow: 1
-        Sta: 1
      - Level: 47
        Con: 1
      - Level: 48
@@ -11272,15 +11112,6 @@ Body:
        Con: 1
      - Level: 50
        Pow: 1
-      - Level: 51
-        Con: 1
-      - Level: 53
-        Pow: 1
-        Con: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Pow: 1
  - Jobs:
      Hyper_Novice: true
    MaxWeight: 40000
@@ -11417,15 +11248,6 @@ Body:
      - Level: 50
        Agi: 1
        Dex: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Pow: 1
-        Con: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Spirit_Handler: true
    MaxWeight: 42000
@@ -11557,13 +11379,3 @@ Body:
        Crt: 1
      - Level: 50
        Pow: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Pow: 1
-      - Level: 53
-        Spl: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Sta: 1
--- a/db/re/laphine_synthesis.yml
+++ b/db/re/laphine_synthesis.yml
@@ -4359,110 +4359,110 @@ Body:
      - Item: S_Caster_Weapon
      - Item: S_Caster_earring
      - Item: S_Caster_Pendant
-  - Item: Ice_F_Stone_Box2
-    RewardGroup: ICE_F_STONE_BOX
-    RequiredRequirementsCount: 3
-    Requirements:
-      - Item: Ice_F_Stone_Str
-      - Item: Ice_F_Stone_Dex
-      - Item: Ice_F_Stone_Agi
-      - Item: Ice_F_Stone_Int
-      - Item: Ice_F_Stone_Vit
-      - Item: Ice_F_Stone_luk
-      - Item: Ice_F_Stone_Def
-      - Item: Ice_F_Stone_Mdef
-      - Item: Ice_F_Stone_Ran
-      - Item: Ice_F_Stone_War
-      - Item: Ice_F_Stone_Mag
-      - Item: Ice_F_Stone_R_Reject
-      - Item: Ice_F_Stone_Force
-      - Item: Ice_F_Stone_S_Delay
-      - Item: Ice_F_Stone_Skill_1
-      - Item: Ice_F_Stone_Skill_2
-      - Item: Ice_F_Stone_Skill_3
-      - Item: Ice_F_Stone_Skill_4
-      - Item: Ice_F_Stone_Skill_5
-      - Item: Ice_F_Stone_Skill_6
-      - Item: Ice_F_Stone_Skill_7
-      - Item: Ice_F_Stone_Skill_8
-      - Item: Ice_F_Stone_Skill_9
-      - Item: Ice_F_Stone_Skill_10
-      - Item: Ice_F_Stone_Skill_11
-      - Item: Ice_F_Stone_Skill_12
-      - Item: Ice_F_Stone_Skill_13
-      - Item: Ice_F_Stone_Skill_14
-      - Item: Ice_F_Stone_Skill_15
-      - Item: Ice_F_Stone_Skill_16
-      - Item: Ice_F_Stone_Skill_17
-      - Item: Ice_F_Stone_Skill_18
-      - Item: Ice_F_Stone_Skill_19
-      - Item: Ice_F_Stone_Skill_20
-      - Item: Ice_F_Stone_Skill_21
-      - Item: Ice_F_Stone_Skill_22
-      - Item: Ice_F_Stone_Skill_23
-      - Item: Ice_F_Stone_Skill_24
-      - Item: Ice_F_Stone_Skill_25
-      - Item: Ice_F_Stone_Skill_26
-      - Item: Ice_F_Stone_Skill_27
-      - Item: Ice_F_Stone_Skill_28
-      - Item: Ice_F_Stone_Skill_29
-      - Item: Ice_F_Stone_Skill_30
-      - Item: Ice_F_Stone_Skill_31
-      - Item: Ice_F_Stone_Skill_32
-      - Item: Ice_F_Stone_Skill_33
-      - Item: Ice_F_Stone_Skill_34
-      - Item: Ice_F_Stone_Skill_35
-      - Item: Ice_F_Stone_Skill_36
-      - Item: Ice_F_Stone_Skill_37
-      - Item: Ice_F_Stone_Skill_38
-      - Item: Ice_F_Stone_Skill_39
-      - Item: Ice_F_Stone_Skill_40
-      - Item: Ice_F_Stone_Skill_41
-      - Item: Ice_F_Stone_Skill_42
-      - Item: Ice_F_Stone_Skill_43
-      - Item: Ice_F_Stone_Skill_44
-      - Item: Ice_F_Stone_Skill_45
-      - Item: Ice_F_Stone_Skill_46
-      - Item: Ice_F_Stone_Skill_47
-      - Item: Ice_F_Stone_Skill_48
-      - Item: Ice_F_Stone_Skill_49
-      - Item: Ice_F_Stone_Skill_50
-      - Item: Ice_F_Stone_Skill_51
-      - Item: Ice_F_Stone_Skill_52
-      - Item: Ice_F_Stone_Skill_53
-      - Item: Ice_F_Stone_Skill_54
-      - Item: Ice_F_Stone_Speed
-      - Item: Ice_F_Stone_Caster
-      - Item: Ice_F_Stone_Critical
-      - Item: Ice_F_Stone_Guide
-      - Item: Ice_F_Stone_Above
-      - Item: Ice_F_Stone_P_Full
-      - Item: Ice_F_Stone_M_Counter
-      - Item: Ice_F_Stone_Hp
-      - Item: Ice_F_Stone_Sp
-      - Item: Ice_F_Stone_Heal
-      - Item: Ice_F_Stone_Robust
-      - Item: Ice_F_Stone_F_Cast
-      - Item: Ice_F_Stone_M_F
-      - Item: Ice_F_Stone_P_F
-      - Item: Ice_F_Stone_Un_Vit
-      - Item: Ice_F_Stone_Sp_Int
-      - Item: Ice_F_Stone_Fi_Dex
-      - Item: Ice_F_Stone_Ov_Str
-      - Item: Ice_F_Stone_Fa_Agi
-      - Item: Ice_F_Stone_Lu_Luk
-      - Item: Ice_F_Stone_A_Delay
-      - Item: Ice_F_Stone_E_Archer
-      - Item: Ice_F_Stone_Fatal
-      - Item: Ice_F_Stone_F_Spirit
-      - Item: Ice_F_Stone_Spell
-      - Item: Ice_F_Stone_HealHP
-      - Item: Ice_F_Stone_HealSP
-      - Item: Ice_F_Stone_Life
-      - Item: Ice_F_Stone_Soul
-      - Item: Ice_F_Stone_M_Heal
-      - Item: Ice_F_Stone_M_Soul
-      - Item: Ice_F_Stone_A_Force
+#  - Item: Ice_F_Stone_Box2
+#    RewardGroup: ICE_F_STONE_BOX2
+#    RequiredRequirementsCount: 3
+#    Requirements:
+#      - Item: Ice_F_Stone_Str
+#      - Item: Ice_F_Stone_Dex
+#      - Item: Ice_F_Stone_Agi
+#      - Item: Ice_F_Stone_Int
+#      - Item: Ice_F_Stone_Vit
+#      - Item: Ice_F_Stone_luk
+#      - Item: Ice_F_Stone_Def
+#      - Item: Ice_F_Stone_Mdef
+#      - Item: Ice_F_Stone_Ran
+#      - Item: Ice_F_Stone_War
+#      - Item: Ice_F_Stone_Mag
+#      - Item: Ice_F_Stone_R_Reject
+#      - Item: Ice_F_Stone_Force
+#      - Item: Ice_F_Stone_S_Delay
+#      - Item: Ice_F_Stone_Skill_1
+#      - Item: Ice_F_Stone_Skill_2
+#      - Item: Ice_F_Stone_Skill_3
+#      - Item: Ice_F_Stone_Skill_4
+#      - Item: Ice_F_Stone_Skill_5
+#      - Item: Ice_F_Stone_Skill_6
+#      - Item: Ice_F_Stone_Skill_7
+#      - Item: Ice_F_Stone_Skill_8
+#      - Item: Ice_F_Stone_Skill_9
+#      - Item: Ice_F_Stone_Skill_10
+#      - Item: Ice_F_Stone_Skill_11
+#      - Item: Ice_F_Stone_Skill_12
+#      - Item: Ice_F_Stone_Skill_13
+#      - Item: Ice_F_Stone_Skill_14
+#      - Item: Ice_F_Stone_Skill_15
+#      - Item: Ice_F_Stone_Skill_16
+#      - Item: Ice_F_Stone_Skill_17
+#      - Item: Ice_F_Stone_Skill_18
+#      - Item: Ice_F_Stone_Skill_19
+#      - Item: Ice_F_Stone_Skill_20
+#      - Item: Ice_F_Stone_Skill_21
+#      - Item: Ice_F_Stone_Skill_22
+#      - Item: Ice_F_Stone_Skill_23
+#      - Item: Ice_F_Stone_Skill_24
+#      - Item: Ice_F_Stone_Skill_25
+#      - Item: Ice_F_Stone_Skill_26
+#      - Item: Ice_F_Stone_Skill_27
+#      - Item: Ice_F_Stone_Skill_28
+#      - Item: Ice_F_Stone_Skill_29
+#      - Item: Ice_F_Stone_Skill_30
+#      - Item: Ice_F_Stone_Skill_31
+#      - Item: Ice_F_Stone_Skill_32
+#      - Item: Ice_F_Stone_Skill_33
+#      - Item: Ice_F_Stone_Skill_34
+#      - Item: Ice_F_Stone_Skill_35
+#      - Item: Ice_F_Stone_Skill_36
+#      - Item: Ice_F_Stone_Skill_37
+#      - Item: Ice_F_Stone_Skill_38
+#      - Item: Ice_F_Stone_Skill_39
+#      - Item: Ice_F_Stone_Skill_40
+#      - Item: Ice_F_Stone_Skill_41
+#      - Item: Ice_F_Stone_Skill_42
+#      - Item: Ice_F_Stone_Skill_43
+#      - Item: Ice_F_Stone_Skill_44
+#      - Item: Ice_F_Stone_Skill_45
+#      - Item: Ice_F_Stone_Skill_46
+#      - Item: Ice_F_Stone_Skill_47
+#      - Item: Ice_F_Stone_Skill_48
+#      - Item: Ice_F_Stone_Skill_49
+#      - Item: Ice_F_Stone_Skill_50
+#      - Item: Ice_F_Stone_Skill_51
+#      - Item: Ice_F_Stone_Skill_52
+#      - Item: Ice_F_Stone_Skill_53
+#      - Item: Ice_F_Stone_Skill_54
+#      - Item: Ice_F_Stone_Speed
+#      - Item: Ice_F_Stone_Caster
+#      - Item: Ice_F_Stone_Critical
+#      - Item: Ice_F_Stone_Guide
+#      - Item: Ice_F_Stone_Above
+#      - Item: Ice_F_Stone_P_Full
+#      - Item: Ice_F_Stone_M_Counter
+#      - Item: Ice_F_Stone_Hp
+#      - Item: Ice_F_Stone_Sp
+#      - Item: Ice_F_Stone_Heal
+#      - Item: Ice_F_Stone_Robust
+#      - Item: Ice_F_Stone_F_Cast
+#      - Item: Ice_F_Stone_M_F
+#      - Item: Ice_F_Stone_P_F
+#      - Item: Ice_F_Stone_Un_Vit
+#      - Item: Ice_F_Stone_Sp_Int
+#      - Item: Ice_F_Stone_Fi_Dex
+#      - Item: Ice_F_Stone_Ov_Str
+#      - Item: Ice_F_Stone_Fa_Agi
+#      - Item: Ice_F_Stone_Lu_Luk
+#      - Item: Ice_F_Stone_A_Delay
+#      - Item: Ice_F_Stone_E_Archer
+#      - Item: Ice_F_Stone_Fatal
+#      - Item: Ice_F_Stone_F_Spirit
+#      - Item: Ice_F_Stone_Spell
+#      - Item: Ice_F_Stone_HealHP
+#      - Item: Ice_F_Stone_HealSP
+#      - Item: Ice_F_Stone_Life
+#      - Item: Ice_F_Stone_Soul
+#      - Item: Ice_F_Stone_M_Heal
+#      - Item: Ice_F_Stone_M_Soul
+#      - Item: Ice_F_Stone_A_Force
  - Item: R_BearersShadow_Mix
    RewardGroup: R_BEARERSSHADOW_MIX
    RequiredRequirementsCount: 6
@@ -4812,33 +4812,3 @@ Body:
 #        Amount: 100
 #      - Item: Crystal_Of_Pollution
 #        Amount: 100
-  - Item: D_Gw_Extractor
-    RewardGroup: D_GW_EXTRACTOR
-    RequiredRequirementsCount: 3
-    Requirements:
-      - Item: D_Glacier_T_Sword
-      - Item: D_Glacier_Lance
-      - Item: D_Glacier_Sword
-      - Item: D_Glacier_B_Sword
-      - Item: D_Glacier_Spear
-      - Item: D_Glacier_T_Axe
-      - Item: D_Glacier_Axe
-      - Item: D_Glacier_Mace
-      - Item: D_Glacier_M_Mace
-      - Item: D_Glacier_R_Knife
-      - Item: D_Glacier_B_Knife
-      - Item: D_Glacier_Bow
-      - Item: D_Glacier_Knuckle
-      - Item: D_Glacier_Book
-      - Item: D_Glacier_Katar
-      - Item: D_Glacier_Wand
-      - Item: D_Glacier_Staff
-      - Item: D_Glacier_Foxtail
-      - Item: D_Glacier_Violin
-      - Item: D_Glacier_Whip
-      - Item: D_Glacier_Humma
-      - Item: D_Glacier_Revolver
-      - Item: D_Glacier_Rifle
-      - Item: D_Glacier_Shotgun
-      - Item: D_Glacier_Gatling
-      - Item: D_Glacier_Launcher
--- a/db/re/laphine_upgrade.yml
+++ b/db/re/laphine_upgrade.yml
@@ -4727,174 +4727,170 @@ Body:
      - Item: Gray_W_Muffler
      - Item: Gray_W_Boots
      - Item: Gray_W_Shoes
-  - Item: Pontifex_Courage
-    RandomOptionGroup: PONTIFEX_COURAGE
-    TargetItems:
-      - Item: Adulter_F_T_Sword
-      - Item: Adulter_F_Cakram
-      - Item: Adulter_F_Katar
-      - Item: Adulter_F_Lance
-      - Item: Adulter_F_T_Staff
-      - Item: Adulter_F_Rod
-      - Item: Adulter_F_Humma
-      - Item: Adulter_F_C_Humma
-      - Item: Adulter_F_C_Bow
-      - Item: Adulter_F_Ballista
-      - Item: Adulter_F_A_Bow
-      - Item: Adulter_F_Revolver
-      - Item: Adulter_F_Rifle
-      - Item: Adulter_F_Shotgun
-      - Item: Adulter_F_Gatling
-      - Item: Adulter_F_Launcher
-      - Item: Adulter_F_G_Sword
-      - Item: Adulter_F_Lapier
-      - Item: Adulter_F_Dagger
-      - Item: Adulter_F_Axe
-      - Item: Adulter_F_G_Spear
-      - Item: Adulter_F_M_Book
-      - Item: Adulter_F_P_Book
-      - Item: Adulter_F_Bible
-      - Item: Adulter_F_Moon_B
-      - Item: Adulter_F_Star_B
-      - Item: Adulter_F_Wand
-      - Item: Adulter_F_S_Stick
-      - Item: Adulter_F_D_Wand
-      - Item: Adulter_F_F_Wand
-      - Item: Adulter_F_F_model
-      - Item: Adulter_F_Knuckle
-      - Item: Adulter_F_Claw
-      - Item: Adulter_F_Violin
-      - Item: Adulter_F_Harp
-      - Item: Adulter_F_C_Rope
-      - Item: Adulter_F_Ribbon
-      - Item: Adulter_F_Mace
-      - Item: Adulter_F_Hall
-  - Item: Pontifex_Wisdom
-    RandomOptionGroup: PONTIFEX_WISDOM
-    TargetItems:
-      - Item: Adulter_F_T_Sword
-      - Item: Adulter_F_Cakram
-      - Item: Adulter_F_Katar
-      - Item: Adulter_F_Lance
-      - Item: Adulter_F_T_Staff
-      - Item: Adulter_F_Rod
-      - Item: Adulter_F_Humma
-      - Item: Adulter_F_C_Humma
-      - Item: Adulter_F_C_Bow
-      - Item: Adulter_F_Ballista
-      - Item: Adulter_F_A_Bow
-      - Item: Adulter_F_Revolver
-      - Item: Adulter_F_Rifle
-      - Item: Adulter_F_Shotgun
-      - Item: Adulter_F_Gatling
-      - Item: Adulter_F_Launcher
-      - Item: Adulter_F_G_Sword
-      - Item: Adulter_F_Lapier
-      - Item: Adulter_F_Dagger
-      - Item: Adulter_F_Axe
-      - Item: Adulter_F_G_Spear
-      - Item: Adulter_F_M_Book
-      - Item: Adulter_F_P_Book
-      - Item: Adulter_F_Bible
-      - Item: Adulter_F_Moon_B
-      - Item: Adulter_F_Star_B
-      - Item: Adulter_F_Wand
-      - Item: Adulter_F_S_Stick
-      - Item: Adulter_F_D_Wand
-      - Item: Adulter_F_F_Wand
-      - Item: Adulter_F_F_model
-      - Item: Adulter_F_Knuckle
-      - Item: Adulter_F_Claw
-      - Item: Adulter_F_Violin
-      - Item: Adulter_F_Harp
-      - Item: Adulter_F_C_Rope
-      - Item: Adulter_F_Ribbon
-      - Item: Adulter_F_Mace
-      - Item: Adulter_F_Hall
-  - Item: Pontifex_Tenacity
-    RandomOptionGroup: PONTIFEX_TENACITY
-    TargetItems:
-      - Item: Vivatus_F_T_Sword
-      - Item: Vivatus_F_Cakram
-      - Item: Vivatus_F_Katar
-      - Item: Vivatus_F_Lance
-      - Item: Vivatus_F_T_Staff
-      - Item: Vivatus_F_Rod
-      - Item: Vivatus_F_C_Bow
-      - Item: Vivatus_F_Ballista
-      - Item: Vivatus_F_A_Bow
-      - Item: Vivatus_F_G_Sword
-      - Item: Vivatus_F_Lapier
-      - Item: Vivatus_F_Dagger
-      - Item: Vivatus_F_Axe
-      - Item: Vivatus_F_G_Spear
-      - Item: Vivatus_F_M_Book
-      - Item: Vivatus_F_P_Book
-      - Item: Vivatus_F_Bible
-      - Item: Vivatus_F_Wand
-      - Item: Vivatus_F_Knuckle
-      - Item: Vivatus_F_Claw
-      - Item: Vivatus_F_Violin
-      - Item: Vivatus_F_Harp
-      - Item: Vivatus_F_C_Rope
-      - Item: Vivatus_F_Ribbon
-      - Item: Vivatus_F_Mace
-      - Item: Vivatus_F_Hall
-      - Item: Vivatus_F_D_Wand
-      - Item: Vivatus_F_S_Stick
-      - Item: Vivatus_F_F_Wand
-      - Item: Vivatus_F_F_model
-      - Item: Vivatus_F_Star_B
-      - Item: Vivatus_F_Moon_B
-      - Item: Vivatus_F_Gatling
-      - Item: Vivatus_F_Launcher
-      - Item: Vivatus_F_Rifle
-      - Item: Vivatus_F_Shotgun
-      - Item: Vivatus_F_Revolver
-      - Item: Vivatus_F_C_Humma
-      - Item: Vivatus_F_Humma
-  - Item: Pontifex_Belief
-    RandomOptionGroup: PONTIFEX_BELIEF
-    TargetItems:
-      - Item: Vivatus_F_T_Sword
-      - Item: Vivatus_F_Cakram
-      - Item: Vivatus_F_Katar
-      - Item: Vivatus_F_Lance
-      - Item: Vivatus_F_T_Staff
-      - Item: Vivatus_F_Rod
-      - Item: Vivatus_F_C_Bow
-      - Item: Vivatus_F_Ballista
-      - Item: Vivatus_F_A_Bow
-      - Item: Vivatus_F_G_Sword
-      - Item: Vivatus_F_Lapier
-      - Item: Vivatus_F_Dagger
-      - Item: Vivatus_F_Axe
-      - Item: Vivatus_F_G_Spear
-      - Item: Vivatus_F_M_Book
-      - Item: Vivatus_F_P_Book
-      - Item: Vivatus_F_Bible
-      - Item: Vivatus_F_Wand
-      - Item: Vivatus_F_Knuckle
-      - Item: Vivatus_F_Claw
-      - Item: Vivatus_F_Violin
-      - Item: Vivatus_F_Harp
-      - Item: Vivatus_F_C_Rope
-      - Item: Vivatus_F_Ribbon
-      - Item: Vivatus_F_Mace
-      - Item: Vivatus_F_Hall
-      - Item: Vivatus_F_D_Wand
-      - Item: Vivatus_F_S_Stick
-      - Item: Vivatus_F_F_Wand
-      - Item: Vivatus_F_F_model
-      - Item: Vivatus_F_Star_B
-      - Item: Vivatus_F_Moon_B
-      - Item: Vivatus_F_Gatling
-      - Item: Vivatus_F_Launcher
-      - Item: Vivatus_F_Rifle
-      - Item: Vivatus_F_Shotgun
-      - Item: Vivatus_F_Revolver
-      - Item: Vivatus_F_C_Humma
-      - Item: Vivatus_F_Humma
+#  - Item: Pontifex_Courage
+#    TargetItems:
+#      - Item: Adulter_F_T_Sword
+#      - Item: Adulter_F_Cakram
+#      - Item: Adulter_F_Katar
+#      - Item: Adulter_F_Lance
+#      - Item: Adulter_F_T_Staff
+#      - Item: Adulter_F_Rod
+#      - Item: Adulter_F_Humma
+#      - Item: Adulter_F_C_Humma
+#      - Item: Adulter_F_C_Bow
+#      - Item: Adulter_F_Ballista
+#      - Item: Adulter_F_A_Bow
+#      - Item: Adulter_F_Revolver
+#      - Item: Adulter_F_Rifle
+#      - Item: Adulter_F_Shotgun
+#      - Item: Adulter_F_Gatling
+#      - Item: Adulter_F_Launcher
+#      - Item: Adulter_F_G_Sword
+#      - Item: Adulter_F_Lapier
+#      - Item: Adulter_F_Dagger
+#      - Item: Adulter_F_Axe
+#      - Item: Adulter_F_G_Spear
+#      - Item: Adulter_F_M_Book
+#      - Item: Adulter_F_P_Book
+#      - Item: Adulter_F_Bible
+#      - Item: Adulter_F_Moon_B
+#      - Item: Adulter_F_Star_B
+#      - Item: Adulter_F_Wand
+#      - Item: Adulter_F_S_Stick
+#      - Item: Adulter_F_D_Wand
+#      - Item: Adulter_F_F_Wand
+#      - Item: Adulter_F_F_model
+#      - Item: Adulter_F_Knuckle
+#      - Item: Adulter_F_Claw
+#      - Item: Adulter_F_Violin
+#      - Item: Adulter_F_Harp
+#      - Item: Adulter_F_C_Rope
+#      - Item: Adulter_F_Ribbon
+#      - Item: Adulter_F_Mace
+#      - Item: Adulter_F_Hall
+#  - Item: Pontifex_Wisdom
+#    TargetItems:
+#      - Item: Adulter_F_T_Sword
+#      - Item: Adulter_F_Cakram
+#      - Item: Adulter_F_Katar
+#      - Item: Adulter_F_Lance
+#      - Item: Adulter_F_T_Staff
+#      - Item: Adulter_F_Rod
+#      - Item: Adulter_F_Humma
+#      - Item: Adulter_F_C_Humma
+#      - Item: Adulter_F_C_Bow
+#      - Item: Adulter_F_Ballista
+#      - Item: Adulter_F_A_Bow
+#      - Item: Adulter_F_Revolver
+#      - Item: Adulter_F_Rifle
+#      - Item: Adulter_F_Shotgun
+#      - Item: Adulter_F_Gatling
+#      - Item: Adulter_F_Launcher
+#      - Item: Adulter_F_G_Sword
+#      - Item: Adulter_F_Lapier
+#      - Item: Adulter_F_Dagger
+#      - Item: Adulter_F_Axe
+#      - Item: Adulter_F_G_Spear
+#      - Item: Adulter_F_M_Book
+#      - Item: Adulter_F_P_Book
+#      - Item: Adulter_F_Bible
+#      - Item: Adulter_F_Moon_B
+#      - Item: Adulter_F_Star_B
+#      - Item: Adulter_F_Wand
+#      - Item: Adulter_F_S_Stick
+#      - Item: Adulter_F_D_Wand
+#      - Item: Adulter_F_F_Wand
+#      - Item: Adulter_F_F_model
+#      - Item: Adulter_F_Knuckle
+#      - Item: Adulter_F_Claw
+#      - Item: Adulter_F_Violin
+#      - Item: Adulter_F_Harp
+#      - Item: Adulter_F_C_Rope
+#      - Item: Adulter_F_Ribbon
+#      - Item: Adulter_F_Mace
+#      - Item: Adulter_F_Hall
+#  - Item: Pontifex_Tenacity
+#    TargetItems:
+#      - Item: Vivatus_F_T_Sword
+#      - Item: Vivatus_F_Cakram
+#      - Item: Vivatus_F_Katar
+#      - Item: Vivatus_F_Lance
+#      - Item: Vivatus_F_T_Staff
+#      - Item: Vivatus_F_Rod
+#      - Item: Vivatus_F_C_Bow
+#      - Item: Vivatus_F_Ballista
+#      - Item: Vivatus_F_A_Bow
+#      - Item: Vivatus_F_G_Sword
+#      - Item: Vivatus_F_Lapier
+#      - Item: Vivatus_F_Dagger
+#      - Item: Vivatus_F_Axe
+#      - Item: Vivatus_F_G_Spear
+#      - Item: Vivatus_F_M_Book
+#      - Item: Vivatus_F_P_Book
+#      - Item: Vivatus_F_Bible
+#      - Item: Vivatus_F_Wand
+#      - Item: Vivatus_F_Knuckle
+#      - Item: Vivatus_F_Claw
+#      - Item: Vivatus_F_Violin
+#      - Item: Vivatus_F_Harp
+#      - Item: Vivatus_F_C_Rope
+#      - Item: Vivatus_F_Ribbon
+#      - Item: Vivatus_F_Mace
+#      - Item: Vivatus_F_Hall
+#      - Item: Vivatus_F_D_Wand
+#      - Item: Vivatus_F_S_Stick
+#      - Item: Vivatus_F_F_Wand
+#      - Item: Vivatus_F_F_model
+#      - Item: Vivatus_F_Star_B
+#      - Item: Vivatus_F_Moon_B
+#      - Item: Vivatus_F_Gatling
+#      - Item: Vivatus_F_Launcher
+#      - Item: Vivatus_F_Rifle
+#      - Item: Vivatus_F_Shotgun
+#      - Item: Vivatus_F_Revolver
+#      - Item: Vivatus_F_C_Humma
+#      - Item: Vivatus_F_Humma
+#  - Item: Pontifex_Belief
+#    TargetItems:
+#      - Item: Vivatus_F_T_Sword
+#      - Item: Vivatus_F_Cakram
+#      - Item: Vivatus_F_Katar
+#      - Item: Vivatus_F_Lance
+#      - Item: Vivatus_F_T_Staff
+#      - Item: Vivatus_F_Rod
+#      - Item: Vivatus_F_C_Bow
+#      - Item: Vivatus_F_Ballista
+#      - Item: Vivatus_F_A_Bow
+#      - Item: Vivatus_F_G_Sword
+#      - Item: Vivatus_F_Lapier
+#      - Item: Vivatus_F_Dagger
+#      - Item: Vivatus_F_Axe
+#      - Item: Vivatus_F_G_Spear
+#      - Item: Vivatus_F_M_Book
+#      - Item: Vivatus_F_P_Book
+#      - Item: Vivatus_F_Bible
+#      - Item: Vivatus_F_Wand
+#      - Item: Vivatus_F_Knuckle
+#      - Item: Vivatus_F_Claw
+#      - Item: Vivatus_F_Violin
+#      - Item: Vivatus_F_Harp
+#      - Item: Vivatus_F_C_Rope
+#      - Item: Vivatus_F_Ribbon
+#      - Item: Vivatus_F_Mace
+#      - Item: Vivatus_F_Hall
+#      - Item: Vivatus_F_D_Wand
+#      - Item: Vivatus_F_S_Stick
+#      - Item: Vivatus_F_F_Wand
+#      - Item: Vivatus_F_F_model
+#      - Item: Vivatus_F_Star_B
+#      - Item: Vivatus_F_Moon_B
+#      - Item: Vivatus_F_Gatling
+#      - Item: Vivatus_F_Launcher
+#      - Item: Vivatus_F_Rifle
+#      - Item: Vivatus_F_Shotgun
+#      - Item: Vivatus_F_Revolver
+#      - Item: Vivatus_F_C_Humma
+#      - Item: Vivatus_F_Humma
  - Item: Bio_Helm_Refine_Cube
    ResultRefine: 11
    MaximumRefine: 10
--- a/db/re/map_drops.yml
+++ b/db/re/map_drops.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,,,,,,,
@@ -14335,11 +14252,11 @@
 20943,DEATH_WITCH@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,32,
 20943,DEATH_WITCH@HW_GANBANTEIN,attack,483,1,2000,0,5000,yes,target,always,0,,,,,,,
 // 20943,DEATH_WITCH@NPC_EARTHQUAKE_K,attack,750,5,10000,1500,25000,no,target,myhpltmaxrate,20,,,,,,,
-20943,DEATH_WITCH@NPC_EARTHQUAKE,attack,653,5,10000,1500,25000,no,self,myhpltmaxrate,20,,,,,,,
+20943,DEATH_WITCH@NPC_EARTHQUAKE,attack,653,5,10000,1500,25000,no,target,myhpltmaxrate,20,,,,,,,
 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,,,,,,,

@@ -14403,7 +14320,7 @@
 20928,CHIMERA_THEONE@WZ_WATERBALL,chase,86,5,5000,1000,35000,no,target,always,0,,,,,,,
 // TODO
 // 20928,CHIMERA_THEONE@NPC_EARTHQUAKE_K,chase,750,5,10000,500,20000,no,target,myhpltmaxrate,40,,,,,,,
-20928,CHIMERA_THEONE@NPC_EARTHQUAKE,chase,653,5,10000,500,20000,no,self,myhpltmaxrate,40,,,,,,,
+20928,CHIMERA_THEONE@NPC_EARTHQUAKE,chase,653,5,10000,500,20000,no,target,myhpltmaxrate,40,,,,,,,
 20928,CHIMERA_THEONE@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
 20928,CHIMERA_THEONE@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,2,20920,20921,20922,20923,,,
 20928,CHIMERA_THEONE@NPC_GROUNDATTACK,attack,185,3,500,0,5000,yes,target,always,0,,,,,,6,
@@ -14570,236 +14487,5 @@
 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
-20846,MD_HIDDEN_GROUND01@NPC_GRADUAL_GRAVITY,idle,752,3,1000,0,5000,no,target,always,0,,,,,,,
-20846,MD_HIDDEN_GROUND01@NPC_GRADUAL_GRAVITY,attack,752,3,1000,0,5000,no,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_GUIDEDATTACK,chase,172,3,2000,0,5000,yes,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_POISONATTACK,attack,188,5,1000,0,5000,yes,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_BLINDATTACK,chase,177,5,1000,500,5000,no,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_BLINDATTACK,attack,177,3,1000,500,5000,no,target,always,0,,,,,,,
-21296,EP18_RAKEHAND@NPC_GUIDEDATTACK,attack,172,3,2000,0,5000,yes,target,always,0,,,,,,,
-21296,EP18_RAKEHAND@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,0,,,,,,12,
-21296,EP18_RAKEHAND@NPC_STUNATTACK,attack,179,3,1000,500,5000,no,target,always,0,,,,,,11,
-21296,EP18_RAKEHAND@RG_CLOSECONFINE,attack,1005,1,1000,0,30000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21297,EP18_SPARK@MG_FIREBOLT,chase,19,3,2000,300,5000,no,target,always,0,,,,,,,
-21297,EP18_SPARK@MG_FIREBALL,chase,17,3,5000,0,30000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@NPC_GUIDEDATTACK,attack,172,3,2000,0,30000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@MG_FIREBOLT,attack,19,3,1000,0,10000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21297,EP18_SPARK@NPC_SELFDESTRUCTION,attack,173,1,10000,1000,0,no,self,myhpltmaxrate,30,,,,,,,
-21297,EP18_SPARK@NPC_SELFDESTRUCTION,chase,173,1,2000,1000,0,no,self,myhpltmaxrate,30,,,,,,,
-21298,EP18_HOT_MOLAR@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21298,EP18_HOT_MOLAR@NPC_COMBOATTACK,chase,171,3,5000,0,30000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@SM_BASH,attack,5,4,2000,0,5000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@NPC_GUIDEDATTACK,chase,172,3,2000,0,300000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@NPC_BLEEDING2,attack,764,3,2000,0,5000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21298,EP18_HOT_MOLAR@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21299,EP18_VOLCARING@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21299,EP18_VOLCARING@MG_FIREBOLT,chase,19,5,1000,500,30000,yes,target,always,0,,,,,,,
-21299,EP18_VOLCARING@NPC_FIREATTACK,attack,186,3,2000,0,5000,yes,target,always,0,,,,,,,
-21300,EP18_LAVA_TOAD@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21300,EP18_LAVA_TOAD@MG_FIREBOLT,chase,19,3,2000,0,30000,yes,target,always,0,,,,,,,
-21300,EP18_LAVA_TOAD@NPC_CRITICALSLASH,attack,170,1,3000,0,10000,yes,target,always,0,,,,,,,
-21300,EP18_LAVA_TOAD@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21300,EP18_LAVA_TOAD@RG_STRIPSHIELD,attack,216,3,3000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_COMBOATTACK,idle,171,4,5000,0,5000,yes,target,always,0,,,,,,7,
-21301,EP18_BURNING_FANG@NPC_GUIDEDATTACK,chase,172,5,5000,0,1000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_MOVE_COORDINATE,chase,755,1,5000,0,30000,no,target,always,0,,,,,,39,
-21301,EP18_BURNING_FANG@NPC_CRITICALWOUND,attack,673,4,500,500,5000,no,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_MENTALBREAKER,attack,159,4,500,1500,5000,yes,target,always,0,,,,,,42,
-21301,EP18_BURNING_FANG@NPC_CRITICALSLASH,attack,170,1,10000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_MOVE_COORDINATE,attack,755,1,5000,0,60000,no,target,longrangeattacked,0,,,,,,39,
-21301,EP18_BURNING_FANG@NPC_CURSEATTACK,attack,181,5,4000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_STUNATTACK,attack,179,5,2000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@HW_GANBANTEIN,attack,483,1,7000,0,60000,no,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_POWERUP,attack,349,3,3000,0,60000,yes,self,always,0,,,,,,,
-21301,EP18_BURNING_FANG@RG_STRIPHELM,attack,218,5,1000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_SUMMONSLAVE,idle,196,1,10000,1000,30000,no,self,slavele,3,,,,,,,
-21301,EP18_BURNING_FANG@NPC_CALLSLAVE,idle,352,1,10000,0,30000,no,self,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_CALLSLAVE,attack,352,1,10000,0,30000,no,self,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,,,,,,,
-21302,EP18_ASHHOPPER@NPC_EMOTION,chase,197,1,500,0,30000,yes,self,always,0,0x0091,,,,,19,
-21302,EP18_ASHHOPPER@NPC_EMOTION,idle,197,1,2000,0,30000,yes,self,always,0,0x3885,,,,,44,
-21302,EP18_ASHHOPPER@NPC_GUIDEDATTACK,chase,172,3,3000,500,30000,yes,target,always,0,,,,,,,
-21302,EP18_ASHHOPPER@NPC_POISONATTACK,attack,188,5,1000,0,5000,yes,target,always,0,,,,,,,
-21302,EP18_ASHHOPPER@NPC_POISON_BUSTER,attack,742,1,2000,1500,30000,no,self,always,0,,,,,,,
-21302,EP18_ASHHOPPER@NPC_CLOUD_KILL,attack,739,3,2000,500,15000,no,target,always,0,,,,,,,
-21302,EP18_ASHHOPPER@MO_BODYRELOCATION,chase,264,1,2000,500,5000,yes,target,always,0,,,,,,28,
-21303,EP18_ASHRING@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
-21303,EP18_ASHRING@NPC_POISONATTACK,attack,188,3,2000,0,5000,yes,target,always,0,,,,,,,
-21303,EP18_ASHRING@NPC_AGIUP,chase,350,1,1000,0,30000,yes,self,always,0,,,,,,,
-21303,EP18_ASHRING@WZ_QUAGMIRE,chase,92,2,500,0,30000,yes,target,always,0,,,,,,6,
-21304,EP18_GREY_WOLF@NPC_POISONATTACK,chase,188,3,2000,0,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_COMBOATTACK,attack,171,3,2000,200,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_COMBOATTACK,chase,171,3,2000,200,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_STUNATTACK,attack,179,3,2000,0,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_STUNATTACK,attack,179,3,2000,0,5000,yes,target,always,0,,,,,,,
-21305,EP18_TUMBLE_RING@AL_TELEPORT,idle,26,3,7000,0,5000,yes,self,rudeattacked,0,,,,,,,
-21305,EP18_TUMBLE_RING@NPC_CRITICALWOUND,attack,673,1,1000,300,5000,no,target,always,0,,,,,,,
-21305,EP18_TUMBLE_RING@NPC_POISONATTACK,attack,188,2,2000,500,15000,no,target,always,0,,,,,,9,
-21305,EP18_TUMBLE_RING@NPC_CLOUD_KILL,attack,739,5,2000,0,15000,yes,target,always,0,,,,,,,
-21305,EP18_TUMBLE_RING@NPC_AGIUP,chase,350,10,2000,0,100000,yes,self,longrangeattacked,0,,,,,,,
-21306,EP18_FIREWIND_KITE@AL_TELEPORT,idle,26,3,7000,0,5000,yes,self,rudeattacked,0,,,,,,,
-21306,EP18_FIREWIND_KITE@MG_FIREBOLT,idle,19,5,5000,300,5000,no,target,always,0,,,,,,,
-21306,EP18_FIREWIND_KITE@NPC_WINDATTACK,chase,187,5,2000,300,5000,yes,target,always,0,,,,,,,
-21306,EP18_FIREWIND_KITE@NPC_FIREATTACK,chase,186,5,3000,300,5000,yes,target,always,0,,,,,,9,
-21306,EP18_FIREWIND_KITE@NPC_CRITICALSLASH,attack,170,4,2000,500,15000,no,target,always,0,,,,,,9,
-21307,EP18_PHANTOM_WOLF@NPC_GUIDEDATTACK,chase,172,2,5000,0,60000,yes,target,always,0,,,,,,,
-21307,EP18_PHANTOM_WOLF@NPC_CRITICALSLASH,attack,170,1,500,300,30000,yes,target,always,0,,,,,,9,
-21307,EP18_PHANTOM_WOLF@AS_CLOAKING,idle,135,1,1000,300,30000,yes,self,always,0,,,,,,9,
-21307,EP18_PHANTOM_WOLF@AS_GRIMTOOTH,chase,137,5,5000,0,5000,yes,target,always,0,,,,,,,
-21307,EP18_PHANTOM_WOLF@ASC_METEORASSAULT,attack,406,8,3000,0,10000,yes,self,always,0,,,,,,,
-21307,EP18_PHANTOM_WOLF@ASC_BREAKER,chase,379,10,2000,0,5000,yes,target,always,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@TF_SPRINKLESAND,attack,149,1,2000,300,30000,yes,target,always,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@NPC_CRITICALSLASH,chase,170,1,3000,0,10000,yes,target,always,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@RG_STRIPSHIELD,attack,216,3,3000,0,60000,yes,target,always,0,,,,,,,
-21309,EP18_MD_THOR_GUARD@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21309,EP18_MD_THOR_GUARD@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21309,EP18_MD_THOR_GUARD@SM_PROVOKE,chase,6,10,2000,100,10000,yes,target,always,0,,,,,,3,
-21309,EP18_MD_THOR_GUARD@NPC_CURSEATTACK,attack,181,5,1000,300,5000,no,target,always,0,,,,,,,
-21309,EP18_MD_THOR_GUARD@CR_AUTOGUARD,attack,249,3,3000,0,300000,no,self,always,0,,,,,,,
-21310,EP18_MD_GUARD_A@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21310,EP18_MD_GUARD_A@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21310,EP18_MD_GUARD_A@SM_PROVOKE,chase,6,10,2000,100,10000,yes,target,always,0,,,,,,3,
-21310,EP18_MD_GUARD_A@NPC_CURSEATTACK,attack,181,5,1000,300,5000,no,target,always,0,,,,,,,
-21310,EP18_MD_GUARD_A@CR_AUTOGUARD,attack,249,3,3000,0,300000,no,self,always,0,,,,,,,
-21310,EP18_MD_GUARD_A@NPC_STUNATTACK,attack,179,1,500,500,5000,no,target,always,0,,,,,,9,
-21311,EP18_MD_GUARD_B@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21311,EP18_MD_GUARD_B@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21311,EP18_MD_GUARD_B@SM_PROVOKE,chase,6,10,2000,100,10000,yes,target,always,0,,,,,,3,
-21311,EP18_MD_GUARD_B@NPC_CURSEATTACK,attack,181,5,1000,300,5000,no,target,always,0,,,,,,,
-21311,EP18_MD_GUARD_B@CR_AUTOGUARD,attack,249,3,3000,0,300000,no,self,always,0,,,,,,,
-21311,EP18_MD_GUARD_B@NPC_STUNATTACK,attack,179,1,500,500,5000,no,target,always,0,,,,,,9,
-21312,EP18_MD_HEARTHUNTER_R@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@TF_SPRINKLESAND,attack,149,1,2000,300,30000,yes,target,always,0,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@NPC_CRITICALSLASH,chase,170,1,3000,0,10000,yes,target,always,0,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@RG_STRIPSHIELD,attack,216,3,3000,0,60000,yes,target,always,0,,,,,,,
-21313,EP18_MD_HEARTHUNTER_F@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21313,EP18_MD_HEARTHUNTER_F@NPC_EMOTION,chase,197,1,500,0,30000,yes,self,always,0,0x0091,,,,,19,
-21313,EP18_MD_HEARTHUNTER_F@NPC_BLINDATTACK,chase,177,3,1000,0,5000,yes,target,always,0,,,,,,39,
-21313,EP18_MD_HEARTHUNTER_F@HT_BLASTMINE,idle,122,3,2000,500,180000,no,target,always,0,,,,,,,
-21313,EP18_MD_HEARTHUNTER_F@NPC_COMBOATTACK,attack,171,2,3000,500,15000,yes,target,always,0,,,,,,,
-21313,EP18_MD_HEARTHUNTER_F@NPC_EMOTION,idle,197,1,2000,0,30000,yes,self,always,0,0x2085,,,,,44,
-21313,EP18_MD_HEARTHUNTER_F@TF_SPRINKLESAND,attack,149,1,3000,0,30000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_TELEKINESISATTACK,attack,191,2,3000,0,5000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_DARKSTRIKE,chase,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_WIDESTONE2,attack,759,3,3000,500,30000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@MG_THUNDERSTORM,attack,21,5,7000,500,30000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@MG_LIGHTNINGBOLT,chase,20,6,3000,300,5000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_WIDECONFUSE2,attack,762,3,3000,500,30000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_CHANGEWIND,attack,165,1,3000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21314,EP18_MD_SCHULANG@NPC_CHANGEHOLY,attack,167,1,5000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21314,EP18_MD_SCHULANG@NPC_CHANGETELEKINESIS,attack,169,1,1000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21314,EP18_MD_SCHULANG@WZ_VERMILION,chase,85,3,5000,500,60000,no,target,myhpltmaxrate,70,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKNESSATTACK,attack,190,4,3000,0,5000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_EARTHQUAKE,attack,653,4,2000,500,30000,yes,self,always,0,,,,,,6,
-21315,EP18_MD_DEMI_FREYJA@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKSTRIKE,chase,340,4,3000,200,15000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKSTRIKE,attack,340,6,3000,200,15000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_WIDESTONE2,attack,759,5,3000,500,30000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_WIDECONFUSE2,attack,762,5,3000,500,30000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_WIDECURSE2,attack,761,3,3000,500,60000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_HELLJUDGEMENT2,attack,768,5,1000,500,120000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CHANGEDARKNESS,attack,168,1,1000,0,120000,yes,self,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CHANGEHOLY,attack,167,1,3000,0,120000,yes,self,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CANE_OF_EVIL_EYE,chase,780,3,8000,300,30000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CANE_OF_EVIL_EYE,attack,780,5,7000,300,30000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_TELEKINESISATTACK,attack,191,2,3000,0,5000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_DARKSTRIKE,chase,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_WIDESTONE2,attack,759,3,3000,500,30000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@MG_THUNDERSTORM,attack,21,5,7000,500,30000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@MG_LIGHTNINGBOLT,chase,20,6,3000,300,5000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_WIDECONFUSE2,attack,762,3,3000,500,30000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_CHANGEWIND,attack,165,1,3000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21316,EP18_MD_SCHULANG_R@NPC_CHANGEHOLY,attack,167,1,5000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21316,EP18_MD_SCHULANG_R@NPC_CHANGETELEKINESIS,attack,169,1,1000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21316,EP18_MD_SCHULANG_R@WZ_VERMILION,chase,85,3,5000,500,60000,no,target,myhpltmaxrate,70,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKNESSATTACK,attack,190,4,3000,0,5000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_EARTHQUAKE,attack,653,4,2000,500,30000,yes,self,always,0,,,,,,6,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKSTRIKE,chase,340,4,3000,200,15000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKSTRIKE,attack,340,6,3000,200,15000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_WIDESTONE2,attack,759,5,3000,500,30000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_WIDECONFUSE2,attack,762,5,3000,500,30000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_WIDECURSE2,attack,761,3,3000,500,60000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_HELLJUDGEMENT2,attack,768,5,1000,500,120000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CHANGEDARKNESS,attack,168,1,1000,0,120000,yes,self,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CHANGEHOLY,attack,167,1,3000,0,120000,yes,self,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CANE_OF_EVIL_EYE,chase,780,3,8000,300,30000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CANE_OF_EVIL_EYE,attack,780,5,7000,300,30000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21318,EP18_MD_SANARE_R@NPC_EMOTION,chase,197,1,500,0,30000,yes,self,always,0,0x0091,,,,,19,
-21318,EP18_MD_SANARE_R@AL_HEAL,idle,28,9,7000,500,5000,yes,friend,myhpltmaxrate,50,,,,,,3,
-21318,EP18_MD_SANARE_R@NPC_EMOTION,idle,197,1,2000,0,30000,yes,self,always,0,0x3885,,,,,14,
-21318,EP18_MD_SANARE_R@AL_HEAL,attack,28,9,7000,500,15000,yes,friend,always,0,,,,,,3,
-21318,EP18_MD_SANARE_R@NPC_DARKCROSS,attack,338,5,3000,500,15000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_HOLYLIGHT,chase,156,1,3000,300,15000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@NPC_HOLYATTACK,chase,189,3,4000,500,15000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_HEAL,idle,28,9,10000,700,3000,yes,friend,friendhpltmaxrate,50,,,,,,,
-21323,EP18_GREY_GOAT@BS_ADRENALINE,attack,111,10,500,1500,300000,no,self,always,0,,,,,,6,
-21323,EP18_GREY_GOAT@BS_ADRENALINE,chase,111,10,500,1500,300000,no,self,always,0,,,,,,6,
-21323,EP18_GREY_GOAT@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,0x1089,,,,,19,
-21323,EP18_GREY_GOAT@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-21323,EP18_GREY_GOAT@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
-21323,EP18_GREY_GOAT@NPC_CRITICALWOUND,attack,673,1,500,0,5000,yes,target,always,0,,,,,,,
-21323,EP18_GREY_GOAT@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,,
-21323,EP18_GREY_GOAT@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,12,
-21324,EP18_GREY_WOLF_BABY@NPC_PROVOCATION,chase,194,1,200,0,5000,yes,target,always,0,,,,,,19,
-21324,EP18_GREY_WOLF_BABY@NPC_STUNATTACK,attack,179,3,2000,500,5000,no,target,always,0,,,,,,19,
-21324,EP18_GREY_WOLF_BABY@NPC_CRITICALWOUND,attack,673,5,2000,300,10000,no,target,always,0,,,,,,,
-21324,EP18_GREY_WOLF_BABY@NPC_GUIDEDATTACK,attack,172,4,1500,300,10000,yes,target,always,0,,,,,,,
-21324,EP18_GREY_WOLF_BABY@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,,
-21324,EP18_GREY_WOLF_BABY@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,12,
-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_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,,,,,,,
-21360,EP18_MD_SCHULANG_L@MG_THUNDERSTORM,attack,21,5,7000,500,30000,no,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@MG_LIGHTNINGBOLT,chase,20,6,3000,300,5000,no,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_WIDECONFUSE2,attack,762,3,3000,500,30000,no,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_CHANGEWIND,attack,165,1,3000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21360,EP18_MD_SCHULANG_L@NPC_CHANGEHOLY,attack,167,1,5000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21360,EP18_MD_SCHULANG_L@NPC_CHANGETELEKINESIS,attack,169,1,1000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21360,EP18_MD_SCHULANG_L@WZ_VERMILION,chase,85,3,5000,500,60000,no,target,myhpltmaxrate,70,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKNESSATTACK,attack,190,4,3000,0,5000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_EARTHQUAKE,attack,653,4,2000,500,30000,yes,self,always,0,,,,,,6,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKSTRIKE,chase,340,4,3000,200,15000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKSTRIKE,attack,340,6,3000,200,15000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_WIDESTONE2,attack,759,5,3000,500,30000,no,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_WIDECONFUSE2,attack,762,5,3000,500,30000,no,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_WIDECURSE2,attack,761,3,3000,500,60000,no,target,always,0,,,,,,,
-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_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
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
--- a/db/re/skill_tree.yml
+++ b/db/re/skill_tree.yml
@@ -7864,178 +7864,3 @@ Body:
      Royal_Guard: true
      Royal_Guard_T: true
      Imperial_Guard: true
-  - Job: Night_Watch
-    Inherit:
-      Novice: true
-      Gunslinger: true
-      Rebellion: true
-    Tree:
-      - Name: NW_P_F_I
-        MaxLevel: 10
-      - Name: NW_GRENADE_MASTERY
-        MaxLevel: 10
-      - Name: NW_INTENSIVE_AIM
-        MaxLevel: 1
-        Requires:
-          - Name: NW_P_F_I
-            Level: 1
-      - Name: NW_HIDDEN_CARD
-        MaxLevel: 10
-        Requires:
-          - Name: NW_P_F_I
-            Level: 5
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_BASIC_GRENADE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_GRENADE_MASTERY
-            Level: 3
-      - Name: NW_GRENADE_FRAGMENT
-        MaxLevel: 7
-        Requires:
-          - Name: NW_GRENADE_MASTERY
-            Level: 1
-      - Name: NW_THE_VIGILANTE_AT_NIGHT
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_ONLY_ONE_BULLET
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_SPIRAL_SHOOTING
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_MAGAZINE_FOR_ONE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_WILD_FIRE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_HASTY_FIRE_IN_THE_HOLE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_BASIC_GRENADE
-            Level: 3
-      - Name: NW_GRENADES_DROPPING
-        MaxLevel: 5
-        Requires:
-          - Name: NW_HASTY_FIRE_IN_THE_HOLE
-            Level: 3
-      - Name: NW_AUTO_FIRING_LAUNCHER
-        MaxLevel: 5
-        Requires:
-          - Name: NW_GRENADES_DROPPING
-            Level: 3
-      - Name: NW_MISSION_BOMBARD
-        MaxLevel: 10
-        Requires:
-          - Name: NW_GRENADE_MASTERY
-            Level: 5
-          - Name: NW_GRENADES_DROPPING
-            Level: 3
-  - Job: Hyper_Novice
-    Inherit:
-      Novice: true
-      Supernovice: true
-      Super_Novice_E: true
-    Tree:
-      - Name: HN_SELFSTUDY_TATICS
-        MaxLevel: 10
-      - Name: HN_SELFSTUDY_SOCERY
-        MaxLevel: 10
-      - Name: HN_DOUBLEBOWLINGBASH
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_TATICS
-            Level: 5
-      - Name: HN_SHIELD_CHAIN_RUSH
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_TATICS
-            Level: 5
-      - Name: HN_METEOR_STORM_BUSTER
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_JUPITEL_THUNDER_STORM
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_JACK_FROST_NOVA
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_HELLS_DRIVE
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_MEGA_SONIC_BLOW
-        MaxLevel: 10
-        Requires:
-          - Name: HN_DOUBLEBOWLINGBASH
-            Level: 7
-      - Name: HN_SPIRAL_PIERCE_MAX
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SHIELD_CHAIN_RUSH
-            Level: 7
-      - Name: HN_GROUND_GRAVITATION
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_NAPALM_VULCAN_STRIKE
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_BREAKINGLIMIT
-        MaxLevel: 1
-        Requires:
-          - Name: HN_DOUBLEBOWLINGBASH
-            Level: 7
-          - Name: HN_MEGA_SONIC_BLOW
-            Level: 7
-          - Name: HN_SHIELD_CHAIN_RUSH
-            Level: 7
-          - Name: HN_SPIRAL_PIERCE_MAX
-            Level: 7
-      - Name: HN_RULEBREAK
-        MaxLevel: 1
-        Requires:
-          - Name: HN_METEOR_STORM_BUSTER
-            Level: 5
-          - Name: HN_JUPITEL_THUNDER_STORM
-            Level: 5
-          - Name: HN_JACK_FROST_NOVA
-            Level: 5
-          - Name: HN_HELLS_DRIVE
-            Level: 5
-          - Name: HN_GROUND_GRAVITATION
-            Level: 5
-          - Name: HN_NAPALM_VULCAN_STRIKE
-            Level: 5
--- a/db/re/statpoint.yml
+++ b/db/re/statpoint.yml
@@ -582,33 +582,3 @@ Body:
  - Level: 250
    Points: 4099
    TraitPoints: 190
-  - Level: 251
-    Points: 4099
-    TraitPoints: 193
-  - Level: 252
-    Points: 4099
-    TraitPoints: 196
-  - Level: 253
-    Points: 4099
-    TraitPoints: 199
-  - Level: 254
-    Points: 4099
-    TraitPoints: 202
-  - Level: 255
-    Points: 4099
-    TraitPoints: 209
-  - Level: 256
-    Points: 4099
-    TraitPoints: 212
-  - Level: 257
-    Points: 4099
-    TraitPoints: 215
-  - Level: 258
-    Points: 4099
-    TraitPoints: 218
-  - Level: 259
-    Points: 4099
-    TraitPoints: 221
-  - Level: 260
-    Points: 4099
-    TraitPoints: 228
--- 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:
@@ -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,11 +162,9 @@ Body:
      Inspiration: true
      Gvg_Sleep: true
      Sleep: true
-      Protection: true
  - Status: Poison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -184,7 +179,6 @@ Body:
      Inspiration: true
      Poison: true
      Dpoison: true
-      Protection: true
  - Status: Curse
    DurationLookup: NPC_WIDECURSE
    CalcFlags:
@@ -203,7 +197,6 @@ Body:
      Inspiration: true
      Gvg_Curse: true
      Curse: true
-      Protection: true
  - Status: Silence
    DurationLookup: NPC_SILENCEATTACK
    States:
@@ -220,7 +213,6 @@ Body:
      Inspiration: true
      Gvg_Silence: true
      Silence: true
-      Protection: true
  - Status: Confusion
    DurationLookup: NPC_WIDECONFUSE
    Flags:
@@ -230,7 +222,6 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
-      Protection: true
    EndReturn:
      Confusion: true
  - Status: Blind
@@ -250,7 +241,6 @@ Body:
      Fear: true
      Gvg_Blind: true
      Blind: true
-      Protection: true
  - Status: Bleeding
    Icon: EFST_BLOODING
    DurationLookup: NPC_BLEEDING
@@ -268,11 +258,9 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
-      Protection: true
  - Status: Dpoison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -796,6 +784,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
      RemoveOnChangeMap: true
+    MinDuration: 5000
  - Status: Keeping
    DurationLookup: NPC_KEEPING
    CalcFlags:
@@ -1009,7 +998,6 @@ Body:
    Flags:
      SendOption: true
  - Status: Extremityfist
-    Icon: EFST_EXTREMITYFIST
    DurationLookup: MO_EXTREMITYFIST
    CalcFlags:
      Regen: true
@@ -1127,7 +1115,6 @@ Body:
    Icon: EFST_GROUNDMAGIC
    DurationLookup: SA_VOLCANO
    CalcFlags:
-      Batk: true
      Watk: true
      Matk: true
    Flags:
@@ -1152,14 +1139,8 @@ Body:
      NoClearance: true
  - Status: Watk_Element
    DurationLookup: MS_MAGNUM
-    Flags:
-      NoSave: true
-    EndOnStart:
-      Watk_Element: true
  - Status: Armor
    DurationLookup: NPC_DEFENDER
-    CalcFlags:
-      Speed: true
  - Status: Armor_Element_Water
    Icon: EFST_RESIST_PROPERTY_WATER
    CalcFlags:
@@ -2182,6 +2163,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Inchitrate
+    DurationLookup: NPC_POWERUP
    CalcFlags:
      Hit: true
    Flags:
@@ -2200,6 +2182,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Incfleerate
+    DurationLookup: NPC_AGIUP
    CalcFlags:
      Flee: true
    Flags:
@@ -2600,17 +2583,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
@@ -2843,7 +2822,6 @@ Body:
    CalcFlags:
      Flee: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2852,7 +2830,6 @@ Body:
    CalcFlags:
      Watk: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2861,7 +2838,6 @@ Body:
    CalcFlags:
      MaxHp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2870,7 +2846,6 @@ Body:
    CalcFlags:
      MaxSp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2879,7 +2854,6 @@ Body:
    CalcFlags:
      Hit: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2942,12 +2916,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:
@@ -5747,8 +5732,6 @@ Body:
    DurationLookup: RA_UNLIMIT
    Flags:
      DisplayPc: true
-      NoDispell: true
-      NoClearance: true
  - Status: Kings_Grace
    Icon: EFST_KINGS_GRACE
    DurationLookup: LG_KINGS_GRACE
@@ -6122,6 +6105,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:
@@ -7642,7 +7633,7 @@ Body:
      RemoveOnDamaged: true
  - Status: Handicapstate_Lightningstrike
    Icon: EFST_HANDICAPSTATE_LIGHTNINGSTRIKE
-    DurationLookup: EM_LIGHTNING_LAND
+    DurationLookup: WH_SWIFTTRAP
    States:
      #NoMove: true
      #NoCast: true
@@ -7655,7 +7646,7 @@ Body:
      RemoveOnDamaged: true
  - Status: Handicapstate_Crystallization
    Icon: EFST_HANDICAPSTATE_CRYSTALLIZATION
-    DurationLookup: EM_TERRA_DRIVE
+    DurationLookup: WH_SOLIDTRAP
    States:
      #NoMove: true
      #NoCast: true
@@ -7669,7 +7660,7 @@ Body:
      RemoveOnDamaged: true
  - Status: Handicapstate_Conflagration
    Icon: EFST_HANDICAPSTATE_CONFLAGRATION
-    DurationLookup: EM_CONFLAGRATION
+    DurationLookup: WH_FLAMETRAP
    Flags:
      BlEffect: true
      DisplayPc: true
@@ -7897,8 +7888,6 @@ Body:
      BlEffect: true
      DisplayPc: true
      SendVal1: true
-      NoDispell: true
-      NoClearance: true
  - Status: Shadow_Weapon
    Icon: EFST_SHADOW_WEAPON
    DurationLookup: SHC_ENCHANTING_SHADOW
@@ -7944,9 +7933,6 @@ Body:
    Flags:
      BlEffect: true
      DisplayPc: true
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
  - Status: Ultimate_S
    Icon: EFST_ULTIMATE_S
    DurationLookup: IG_ULTIMATE_SACRIFICE
@@ -8759,192 +8745,9 @@ Body:
    DurationLookup: MT_RUSH_QUAKE
    CalcFlags:
      All: true
-    Flags:
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
  - Status: G_LIFEPOTION
    Icon: EFST_G_LIFEPOTION
    Flags:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-  - Status: Hnnoweapon
-    Icon: EFST_NOEQUIPWEAPON
-    DurationLookup: HN_DOUBLEBOWLINGBASH
-  - Status: Shieldchainrush
-    Icon: EFST_SHIELDCHAINRUSH
-    DurationLookup: HN_SHIELD_CHAIN_RUSH
-    CalcFlags:
-      Speed: true
-    Flags:
-      BossResist: true
-  - Status: Mistyfrost
-    Icon: EFST_MISTYFROST
-    DurationLookup: HN_JACK_FROST_NOVA
-    Flags:
-      BossResist: true
-  - Status: Groundgravity
-    Icon: EFST_GROUNDGRAVITY
-    DurationLookup: HN_GROUND_GRAVITATION
-    CalcFlags:
-      Speed: true
-    Flags:
-      BossResist: true
-  - Status: Breakinglimit
-    Icon: EFST_BREAKINGLIMIT
-    DurationLookup: HN_BREAKINGLIMIT
-  - Status: Rulebreak
-    Icon: EFST_RULEBREAK
-    DurationLookup: HN_RULEBREAK
-  - Status: Intensive_Aim
-    Icon: EFST_INTENSIVE_AIM
-    States:
-      NoMove: true
-    CalcFlags:
-      Batk: true
-      Hit: true
-      Cri: true
-    Flags:
-      BlEffect: true
-      DisplayPc: true
-      SendVal1: true
-      NoSave: true
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
-  - Status: Intensive_Aim_Count
-    Icon: EFST_INTENSIVE_AIM_COUNT
-    Flags:
-      DisplayPc: true
-      SendVal1: true
-      NoSave: true
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
-  - Status: Grenade_Fragment_1
-    Icon: EFST_GRENADE_FRAGMENT_1
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_2
-    Icon: EFST_GRENADE_FRAGMENT_2
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_3
-    Icon: EFST_GRENADE_FRAGMENT_3
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_4
-    Icon: EFST_GRENADE_FRAGMENT_4
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_5
-    Icon: EFST_GRENADE_FRAGMENT_5
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_6
-    Icon: EFST_GRENADE_FRAGMENT_6
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-  - Status: Auto_Firing_Launcher
-    Icon: EFST_AUTO_FIRING_LAUNCHEREFST
-    DurationLookup: NW_AUTO_FIRING_LAUNCHER
-    Flags:
-      SendVal1: true
-  - Status: Hidden_Card
-    Icon: EFST_HIDDEN_CARD
-    DurationLookup: NW_HIDDEN_CARD
-    CalcFlags:
-      All: true
-    Flags:
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
-  - Status: Period_Receiveitem_2nd
-    Icon: EFST_PERIOD_RECEIVEITEM_2ND
-    Flags:
-      NoRemoveOnDead: true
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-      SendVal1: true
-  - Status: Period_Plusexp_2nd
-    Icon: EFST_PERIOD_PLUSEXP_2ND
-    Flags:
-      NoRemoveOnDead: true
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-      SendVal1: true
-  - Status: Powerup
-    Icon: EFST_POWERUP
-    DurationLookup: NPC_POWERUP
-    CalcFlags:
-      Hit: true
-    Flags:
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-  - Status: Agiup
-    Icon: EFST_AGIUP
-    DurationLookup: NPC_AGIUP
-    CalcFlags:
-      Speed: true
-      Flee: true
-    Flags:
-      NoClearbuff: true
-      NoBanishingBuster: true
-      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/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -780,28 +780,6 @@ To drop all weapons in inventory...

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

-@stockall {<item type>}
-
-Transfer all items from cart to inventory based on the item type.
-
-Valid item types:
-    -1 = All (default)
-     0 = Healing
-     2 = Usable
-     3 = Etc
-     4 = Armors
-     5 = Weapons
-     6 = Cards
-     7 = Pet Eggs
-     8 = Pet Armors
-     10 = Ammunition
-
-Example:
-To transfer all weapons from cart to inventory...
-@stockall 5
-
---------------------------------------
-
@storeall

 Places all inventory and equipped items directly into your Kafra Storage.
--- 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
@@ -15,7 +15,7 @@ This list contains all available constants referenced in the 'bonus' commands.
 * Status effect (eff)
 	Eff_Bleeding, Eff_Blind, Eff_Burning, Eff_Confusion, Eff_Crystalize, Eff_Curse, Eff_DPoison,
 	Eff_Fear, Eff_Freeze, Eff_Poison, Eff_Silence, Eff_Sleep, Eff_Stone, Eff_Stun, Eff_Freezing,
-	Eff_Heat, Eff_Deepsleep, Eff_WhiteImprison, Eff_Hallucination
+	Eff_Heat, Eff_Deepsleep, Eff_WhiteImprison

 * Element (e)
 	Ele_Dark, Ele_Earth, Ele_Fire, Ele_Ghost, Ele_Holy, Ele_Neutral, Ele_Poison,
@@ -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

 * Class (c)
 	Class_Normal, Class_Boss, Class_Guardian, Class_All
--- a/doc/mapflags.txt
+++ b/doc/mapflags.txt
@@ -118,23 +118,7 @@ is disabled in '/conf/battle/items.conf'.
 *nomvploot

 Disables normal monsters and MVPs from dropping items on a map. Looted items will always drop.
-'nomobloot' prevents monsters and MVPs from dropping items from the 'Drops' table.
-'nomvploot' prevents MVPs from giving MVP prize items from the 'MvpDrops' table.
-'noloot' is the same as 'nomobloot' and 'nomvploot' combined.	
-
---------------------------------------
-
-*nolootnormalmob
-
-Disables normal monsters type (only) from dropping items on a map. Looted items will always drop.
-
---------------------------------------
-
-*no_npc_selfdestruction_on_all
-
-A quick mapflag to change the behaviour of the NPC_SELFDESTRUCTION skill.
-When defined, the skill always and only hits enemy type instead of all units.
-
+'noloot' is the same as 'nomobloot' and 'nomvploot' combined.
 		
 ---------------------------------------

@@ -490,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,43 +125,37 @@ item delay, etc).

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

-*trade_unconditional (PC_PERM_TRADE_UNCONDITIONAL)
-
-Allows player to ignore the trade conditions of items (drop, trade, sell, cart, storage/gstorage, mail and auction).
-
---------------------------------------
- 
 ======================
 | 3. Command-related |
 ======================
 ---------------------------------------

-*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 +163,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/quest_db.txt
+++ b/doc/quest_db.txt
@@ -20,30 +20,11 @@ Title: Quest title.

 TimeLimit: Amount of time before the quest expires.

-Specifying with "+" will mark how long until the quest expires.
 Use a number followed by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-Format: "d" (optional), [0-23]"h" (optional), [0-59]"mn" (optional), [0-59]"s" (optional).
+Specifying with "+" will mark how long until the quest expires.
+Specifying without "+" will mark the exact time the quest expires. Format: "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional).

-Example:
-  - Id: 2069
-    Title: Tierra Gorge Battle
-    # The quest expires 5 minutes after being taken.
-    TimeLimit: +5mn
-
-Specifying without "+" will mark the exact time the quest expires.
-Use a number followed by "d" for day(s) to shift the exact timer to the given day(s) or use the days of the week to set the expiration day,
-and "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-Format: [days of the week] or "d" (optionals), [0-23]"h" (optional), [0-59]"mn" (optional), [0-59]"s" (optional).
-
-Examples:
-  - Id: 9419
-    Title: Attack Sky Fortress Invading Prontera
-    # The quest expires 3 days after being taken at 4am.
-    TimeLimit: 3d 4h
-  - Id: 5965
-    Title: "[Standby] Devil's Special"
-    # The quest expires Monday at 4am.
-    TimeLimit: Monday 4h
+Please note the number before "d" only shifts the exact timer to the given day(s).

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

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

@@ -4229,11 +4212,7 @@ invoking RID. It returns 1 if successful and 0 upon failure.
 4: All players in a specified area of the map of the invoking player (or NPC).
    [ Parameters: <x0>,<y0>,<x1>,<y1> ]
 5: All players in the map.
-    [ Parameters: "<map name>" ] 
- 6: Battleground members of a specified battleground ID.
-    [ Parameters: <battleground id> ]
- 7: Clan members of a specified clan ID.
-    [ Parameters: <clan id> ]
+    [ Parameters: "<map name>" ]
 Account ID: If type is Account ID, attach the specified account ID.

 <flag> can prevent certain players from being attached:
@@ -5694,35 +5673,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 +6090,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 +6587,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 +6616,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 +6638,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.|
 ==================================
@@ -7553,10 +7477,10 @@ This command lets you override the contents of an existing NPC shop or cashshop.
 current sell list will be wiped, and only the items specified with the price
 specified will be for sale.

-The function returns 1 if shop was updated successfully, or 0 on failure.
+The function returns 1 if shop was updated successfully, or 0 if not found.

 NOTES:
- - That you cannot use -1 to specify default selling price for cashshops, pointshops, or itemshops.
+ - That you cannot use -1 to specify default selling price!
 - If the attached shop type is a market shop, notice that there is an extra parameter after price, <stock>. Make sure to not add duplicate items! For unlimited stock use -1.

 ---------------------------------------
@@ -7568,10 +7492,10 @@ This command will add more items at the end of the selling list for the
 specified NPC shop or cashshop. If you specify an item already for sell, that item will
 appear twice on the sell list.

-The function returns 1 if shop was updated successfully, or 0 on failure.
+The function returns 1 if shop was updated successfully, or 0 if not found.

 NOTES:
- - That you cannot use -1 to specify default selling price for cashshops, pointshops, or itemshops.
+ - That you cannot use -1 to specify default selling price!
 - If attached shop type is market shop, need an extra param after price, it's <stock>
   and make sure don't add duplication item! For unlimited stock use -1.

@@ -7615,13 +7539,6 @@ Update an entry from a shop. If the price is 0 it won't be changed. May also be
 marketshop to update the stock quantity. For unlimited stock, use -1.
 For other shop types, the stock value has no effect.

-If the price is -1, it sets it to the default buy price.
-
-The function returns 1 if shop was updated successfully, or 0 on failure.
-
-NOTES:
- - That you cannot use -1 to specify default selling price for cashshops, pointshops, or itemshops.
-
 ---------------------------------------

 *waitingroom "<chatroom name>",<limit>{,"<event label>"{,<trigger>{,<required zeny>{,<min lvl>{,<max lvl>}}}}};
@@ -8016,15 +7933,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 +7951,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
@@ -8501,23 +8413,6 @@ error message instead.

 This command requires packet version 2021-11-03 or newer.

---------------------------------------
-
-*opentips({<Tip ID>,{<char ID>}});
-
-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
@@ -9052,9 +8947,8 @@ Get info of elemental of attached player or player by char_id.
 Other info can be obtained by 'getunitdata' command.

 Valid types are:
-   ELEMINFO_ID        Elemental ID (ID unique to elementals unit type)
-   ELEMINFO_GAMEID    Elemental Game ID
-   ELEMINFO_CLASS     Elemental Class (ID defined in elemental_db.yml)
+   0: Elemental ID
+   1: Elemental Game ID

 ---------------------------------------
 \\
@@ -9866,7 +9760,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).
@@ -10120,7 +10013,7 @@ Remove the quest of the given <ID> from the user's quest log.
 *changequest <ID>,<ID2>{,<char_id>};

 Remove quest of the given <ID> from the user's quest log.
-Add quest <ID2> to the quest log, and the state is "active".
+Add quest of the <ID2> to the the quest log, and the state is "active".

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

@@ -10691,7 +10584,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.

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

@@ -11225,7 +11117,7 @@ Use <color> hex code to set the color for this channel, if not defined, default
 channel color will be used.

 If <char_id> is defined, the channel will be a private channel and the player
-will be the channel owner.
+will be the the channel owner.

 Returns 1 on success.

@@ -11240,17 +11132,6 @@ Returns 1 on success.

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

-*channel_join "<channel_name>"{, <char_id>};
-
-Join an existing channel.
-The command returns 0 upon success, and these values upon failure:
- -1 : Invalid channel or player
- -2 : Player already in channel
- -3 : Player banned
- -4 : Reached max limit
-
---------------------------------------
-
 *channel_setopt "<chname>",<option>,<value>;

 Set option for the channel. Use 1 in <value> to set it, or 0 to unset.
@@ -11478,60 +11359,3 @@ Note: Only works with classes that use the ranking system.
 Returns true if the player is dead else false.

 ---------------------------------------
-
-*has_autoloot({<char_id>});
-
-This command checks whether a player configured autoloot.
-Returns current autoloot value on success.
-
---------------------------------------
-
-*autoloot({<rate>{, <char_id>}});
-
-This command sets the rate of autoloot.
-If no rate is provided and the user has autoloot disabled it will default to 10000 = 100% (enabled) or
-if the user has autoloot enabled it will default to 0 = 0% (disabled).
-Returns true on success and false on failure.
-
-Example:
-    autoloot();      // toggle on/off depend on existing autoloot
-    autoloot(0);     //   0.00% or off
-    autoloot(100);   //   1.00%
-    autoloot(3333);  //  33.33%
-    autoloot(10000); // 100.00%
-
---------------------------------------
-
-*setdialogalign(<align>);
-
-Set vertical or horizontal align in NPC dialog.
-Valid aligns:
- horizontal align:
-  DIALOG_ALIGN_LEFT
-  DIALOG_ALIGN_CENTER
-  DIALOG_ALIGN_RIGHT
-
- vertical align:
-  DIALOG_ALIGN_TOP
-  DIALOG_ALIGN_MIDDLE
-  DIALOG_ALIGN_BOTTOM
-
---------------------------------------
-
-*setdialogsize(<width>, <height>)
-
-Set size for NPC dialog in pixels.
-
---------------------------------------
-
-*setdialogpos(<x>, <y>)
-
-Set position for NPC dialog in pixels.
-
---------------------------------------
-
-*setdialogpospercent(<x>, <y>)
-
-Set position for NPC dialog in screen size percent.
-
---------------------------------------
--- 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.

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

--- 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,16 +1001,13 @@ 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	()
 	desc:
@@ -2835,13 +2832,3 @@ SC_WEAPONBREAKER
 	desc: Bonus given when using NPC_WEAPONBRAKER skill
 	val1: Skill level
 	val2: val1 * 2 weapon break chance
-
-SC_POWERUP
-	desc: Increases ATKpercent and Hit.
-	val1: + ATKpercent
-	val2: +% Hit
-
-SC_AGIUP
-	desc: Increase Speed and Flee.
-	val1: +% Walkspeed
-	val2: +% Flee
--- 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/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -823,7 +823,7 @@ airplane_01,50,66,5	script	Apple Merchant#air01	86,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you lose some weight. -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Meltz]";
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -389,7 +389,7 @@ bat_room,160,150,3	script	Erundek	109,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you lose some weight. -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Erundek]";
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -18,7 +18,7 @@ bat_room,133,178,5	script	Flavius Officer#01a	418,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you lose some weight. -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Guillaume Army Officer]";
@@ -87,7 +87,7 @@ bat_room,133,121,1	script	Flavius Officer#01b	414,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you lose some weight. -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Croix Army Officer]";
@@ -220,7 +220,7 @@ bat_room,148,178,5	script	Flavius Officer#02a	418,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you lose some weight. -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Guillaume Army Officer]";
@@ -289,7 +289,7 @@ bat_room,148,121,1	script	Flavius Officer#02b	414,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you lose some weight. -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Croix Army Officer]";
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -30,7 +30,7 @@ bat_room,151,144,3	script	KVM Logistic Officer#a	734,{
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you lose some weight. -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Logistics]";
--- a/Show More
+++ b/Show More