Clears the cooldown timer display

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>

.git-blame-ignore-revs

@@ -0,0 +1,9 @@
+# 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

.github/workflows/analysis_codeql.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         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@v2
+        uses: github/codeql-action/analyze@v3

.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@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Clang
         uses: egor-tensin/setup-clang@v1

.github/workflows/build_servers_cmake.yml

@@ -34,7 +34,7 @@ jobs:
           os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # Install latest CMake.
       - uses: lukka/get-cmake@latest

.github/workflows/build_servers_gcc.yml

@@ -31,10 +31,14 @@ 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']
+          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
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Update & Install packages
         # Ubuntu runners already have most of the packages rAthena requires to build.
@@ -45,8 +49,10 @@ jobs:
 
       - name: Command - configure
         env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-buildbot=yes'
-        run: ./configure $CONFIGURE_FLAGS
+            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'
       
       - name: Command - make clean
         run: make clean

.github/workflows/build_servers_modes.yml

@@ -36,7 +36,7 @@ jobs:
           mode: ['PRE','RE']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # 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

.github/workflows/build_servers_msbuild.yml

@@ -34,15 +34,15 @@ jobs:
           mode: ['PRE', 'RE']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Build solution in Debug
         if: ${{ matrix.mode == 'PRE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE"
+        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE" /warnaserror
 
       - name: Build solution in Debug
         if: ${{ matrix.mode == 'RE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT"
+        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT" /warnaserror

.github/workflows/build_servers_packetversions.yml

@@ -38,7 +38,7 @@ jobs:
           packetver: ['20211103', '20200902', '20200401', '20180620', '20151104']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # 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

.github/workflows/build_servers_vip.yml

@@ -36,7 +36,7 @@ jobs:
           mode: ['PRE', 'RE']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # 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

.github/workflows/npc_db_validation.yml

@@ -39,7 +39,7 @@ jobs:
           mode: ['PRE', 'RE']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       
       # 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

3rdparty/httplib/httplib.vcxproj

@@ -98,6 +98,7 @@
       <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>
@@ -112,6 +113,7 @@
       <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>
@@ -128,6 +130,7 @@
       <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>
@@ -146,6 +149,7 @@
       <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>

3rdparty/libconfig/libconfig.vcxproj

@@ -108,6 +108,7 @@
       <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>
@@ -122,6 +123,7 @@
       <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>
@@ -138,6 +140,7 @@
       <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>
@@ -156,6 +159,7 @@
       <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>

3rdparty/libconfig/scanner.c

@@ -2,6 +2,11 @@
 
 #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 */
@@ -2365,3 +2370,7 @@ void libconfig_yyfree (void * ptr , yyscan_t yyscanner)
 #define YYTABLES_NAME "yytables"
 
 #line 192 "scanner.l"
+
+#ifdef _MSC_VER
+	#pragma warning( pop )
+#endif

3rdparty/rapidyaml/ryml.vcxproj

@@ -103,6 +103,7 @@
       <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>
@@ -138,6 +139,7 @@
       <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>
@@ -173,6 +175,7 @@
       <DebugInformationFormat>
       </DebugInformationFormat>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -208,6 +211,7 @@
       <DebugInformationFormat>
       </DebugInformationFormat>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>

3rdparty/yaml-cpp/yaml-cpp.vcxproj

@@ -97,6 +97,7 @@
       <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'">
@@ -109,6 +110,7 @@
       <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'">
@@ -122,6 +124,7 @@
       <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>
@@ -139,6 +142,7 @@
       <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>

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 endianess, only LITTLE ENDIAN is supported" )
+	message( WARNING "unable to determine endianness, only LITTLE ENDIAN is supported" )
 elseif( BIG_ENDIAN )
 	message( FATAL_ERROR "bigendian is not supported" )
 endif()

conf/atcommands.yml

@@ -365,6 +365,10 @@ 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.
@@ -685,20 +689,20 @@ Body:
       Gives you the desired item.
   - Command: pvpon
     Help: |
-      Turns pvp on on the current map
+      Enables PvP on the current map
   - Command: pvpoff
     Help: |
-      Turns pvp off on the current map
+      Disables PvP on the current map
   - Command: gvgon
     Aliases:
       - gpvpon
     Help: |
-      Turns gvg on on the current map
+      Enables GvG on the current map
   - Command: gvgoff
     Aliases:
       - gpvpoff
     Help: |
-      Turns gvg off on the current map
+      Disables GvG on the current map
   - Command: agitstart
     Help: |
       Starts War of Emperium
@@ -914,6 +918,11 @@ Body:
   - Command: reloadbattleconf
     Help: |
       Reload battle settings.
+  - Command: reloadcashdb
+    Aliases:
+      - reloadcashshop
+    Help: |
+      Reload cash shop database.
   - Command: reloadinstancedb
     Help: |
       Reload instance database.
@@ -952,6 +961,7 @@ Body:
       atcommand       battleconf     statusdb
       pcdb                    motd             script
       questdb              msgconf       packetdb
+      cashdb
   - Command: langtype
     Help: |
       Params: <language>

conf/battle/battle.conf

@@ -130,10 +130,19 @@ equip_self_break_rate: 100
 // This affects the behaviour of skills like acid terror and meltdown
 equip_skill_break_rate: 100
 
-// 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.
+// 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.
 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

conf/battle/exp.conf

@@ -33,8 +33,7 @@ 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
-// NOTE: Using type 1 disables the bonus where the first attacker gets 
-//       his share of the exp doubled when multiple people attack the mob.
+// 2 = 0 + first attacker counts twice
 exp_calc_type: 0
 
 // Experience increase per attacker. That is, every additional attacker to the

conf/battle/homunc.conf

@@ -17,10 +17,18 @@
 // 0x10: They display luk/3+1 instead of their actual critical in the
 //       stat window (by default they don't crit)
 // 0x20: Their Min-Matk is always the same as their max
-// 0x40: Skill re-use delay is reset when they are vaporized.
-// 0x80: Skill re-use delay is reset when they are warped (by skill or item) with player.
 hom_setting: 0x3D
 
+// Should the cooldown or aftercast delay of homunculi skills be reset when
+// the homunculus is vaporized?
+// Default on official servers: yes for Pre-renewal, no for Renewal
+//hom_delay_reset_vaporize: no
+
+// Should the cooldown or aftercast delay of homunculi skills be reset when
+// warping or changing maps?
+// Default on official servers: yes for Pre-renewal, no for Renewal
+//hom_delay_reset_warp: no
+
 // The rate a homunculus will get friendly by feeding it. (Note 2)
 homunculus_friendly_rate: 100
 

conf/battle/instance.conf

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

conf/battle/items.conf

@@ -12,8 +12,10 @@
 // The highest value at which an item can be sold via the merchant vend skill. (in zeny)
 vending_max_value: 1000000000
 
-// Whether to allow buying from vending chars that are at their max. zeny limit.
-// If set to yes, the rest of the zeny above the char's capacity will disappear.
+// Whether to allow placing items on a vending store when the player's zeny plus the total price
+// of the items exceeds the maximum zeny allowed. (Note 1)
+// If set to "yes", the items will be placed in the store but other players will not be able to buy them.
+// Official behavior is "yes", but on some official servers the client doesn't allow this.
 vending_over_max: yes
 
 // Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
@@ -93,7 +95,7 @@ allow_equip_restricted_item: yes
 // Default on official servers: yes for Pre-renewal, no for Renewal
 //item_enabled_npc: yes
 
-// Allow map_flooritem to check if item is droppable? (Note 1)
+// Allow map_addflooritem to check if item is droppable? (Note 1)
 // If yes, undroppable items will be destroyed instead of appearing on the map when a player's inventory is full.
 // Default: yes
 item_flooritem_check: yes
@@ -134,3 +136,9 @@ 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

conf/battle/misc.conf

@@ -183,3 +183,17 @@ 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

conf/battle/monster.conf

@@ -79,10 +79,10 @@ monster_chase_refresh: 30
 // 8: Enable mob-warping when standing on Dimensional Door
 mob_warp: 0
 
-// 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
+// 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
 
 // Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)
 view_range_rate: 100
@@ -163,6 +163,15 @@ 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.
@@ -302,3 +311,8 @@ 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

conf/battle/pet.conf

@@ -41,6 +41,10 @@ pet_hungry_delay_rate: 100
 // These bonuses are unofficial and found in the import/pet_db.yml
 pet_equip_required: yes
 
+// Should the pet equipment be destroyed if the owner doesn't have enough space in their inventory? (Note 1)
+// Official behavior is "yes", setting this to "no" will leave the item equipped. 
+pet_unequip_destroy: yes
+
 // When the master attacks a monster, whether or not the pet will also attack. (Note 1)
 pet_attack_support: no
 

conf/battle/player.conf

@@ -298,12 +298,9 @@ trait_points_job_change: 7
 // Official is 100.
 max_trait_parameter: 100
 
-// Max amount of RES/MRES to take into the resistance damage reduction formula.
-// A setting of 625 means the max reduction of damage allowed is 50.0%.
-// Formula is 100 - 100 * (5000 + RES) / (5000 + 10 * RES)
-// Note: Best to leave this setting alone unless you know what your doing.
-// Default: 625
-max_res_mres_reduction: 625
+// Max percent of RES/MRES that can be ignored by item bonus/skill.
+// Default: 50
+max_res_mres_ignored: 50
 
 // Maximum AP
 // Default: 1000

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/mob will 
-// appear to "teleport" afterwards.
+// doing a skill, the client will not update this, and the player will appear
+// to "teleport" afterwards. Monsters use AttackMotion instead.
 default_walk_delay: 300
 
 // Completely disable skill delay of the following types (Note 3)
@@ -270,8 +270,10 @@ allow_skill_without_day: no
 // Allow use of ES-type magic on players?
 allow_es_magic_player: no
 
-// Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
-sg_miracle_skill_ratio: 2
+// Miracle of the Sun, Moon and Stars skill ratio
+// Valid values range from 1 (0.005% per hit) to 20000 (100% per hit)
+// This chance is further reduced if AGI is above 46 (92 = halved chance)
+sg_miracle_skill_ratio: 1
 
 // Miracle of the Sun, Moon and Stars skill duration in milliseconds
 sg_miracle_skill_duration: 3600000

conf/battle_athena.conf

@@ -8,6 +8,9 @@
 //General battle-related settings.
 import: conf/battle/battle.conf
 
+//Battleground settings
+import: conf/battle/battleground.conf
+
 //Settings specific to the client.
 import: conf/battle/client.conf
 
@@ -17,14 +20,20 @@ import: conf/battle/drops.conf
 //Experience rates, exp penalties, stats and max level settings.
 import: conf/battle/exp.conf
 
+//Feature control (on/off) settings
+import: conf/battle/feature.conf
+
 //GM levels, atcommands and hack-related configs.
 import: conf/battle/gm.conf
 
 //Guild and WoE settings
 import: conf/battle/guild.conf
 
-//Battleground settings
-import: conf/battle/battleground.conf
+//Homunc related configuration
+import: conf/battle/homunc.conf
+
+//Instance settings
+import: conf/battle/instance.conf
 
 //Item/card-specific and crafting related options.
 import: conf/battle/items.conf
@@ -32,15 +41,16 @@ import: conf/battle/items.conf
 //Mob related configuration
 import: conf/battle/monster.conf
 
+// Anything else that didn't fit anywhere else.
+// Includes duel, day/night, mute/manner, log settings.
+import: conf/battle/misc.conf
+
 //Party related configuration
 import: conf/battle/party.conf
 
 //Pet related configuration
 import: conf/battle/pet.conf
 
-//Homunc related configuration
-import: conf/battle/homunc.conf
-
 //Player specific settings
 import: conf/battle/player.conf
 
@@ -50,12 +60,5 @@ import: conf/battle/skill.conf
 //Status change related settings
 import: conf/battle/status.conf
 
-//Feature control (on/off) settings
-import: conf/battle/feature.conf
-
-// Anything else that didn't fit anywhere else.
-// Includes duel, day/night, mute/manner, log settings.
-import: conf/battle/misc.conf
-
 //Your custom config goes here.
 import: conf/import/battle_conf.txt

conf/char_athena.conf

@@ -144,6 +144,10 @@ unknown_char_name: Unknown
 // To log the character server?
 log_char: yes
 
+// Minimum length for a character name.
+// Must be set to '4' unless your client uses the 'Remove 4/6 letter Character Name limit' diff patch.
+char_name_min_length: 4
+
 // Allow or not identical name for characters but with a different case (upper/lower):
 // example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
 name_ignoring_case: no

conf/groups.yml

@@ -240,6 +240,7 @@ Body:
       bypass_stat_onclone: true
       bypass_max_stat: true
       macro_register: true
+      trade_unconditional: true
       #all_permission: true
 
 Footer:

conf/inter_athena.conf

@@ -30,10 +30,6 @@ 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

conf/login_athena.conf

@@ -55,9 +55,15 @@ console: off
 // Note: This only works if client side password encryption is not enabled.
 new_account: no
 
-//If new_account is enabled, minimum length to userid and passwords should be 4?
-//Must be 'Yes' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
-new_acc_length_limit: yes
+// If new_account is enabled, changes the minimum length for the account name.
+// By default is set to '4' or '6' (depending on the new login UI).
+// Don't change it unless your client uses the 'Remove 4/6 letter User Name limit' diff patch.
+//acc_name_min_length: 6
+
+// If new_account is enabled, changes the minimum length for the password.
+// By default is set to '4' or '6' (depending on the new login UI).
+// Don't change it unless your client uses the 'Remove 4/6 letter Password limit' diff patch.
+//password_min_length: 6
 
 // Account registration flood protection system
 // allowed_regs is the number of registrations allowed in time_allowed (in seconds)

conf/maps_athena.conf

@@ -1592,7 +1592,7 @@ map: jor_sanct
 map: jor_twice
 map: jor_twig
 
-// Biosphere 1st floor
+// Depth biosphere 1st floor
 map: bl_depth1
 
 // Garden of Time
@@ -1602,5 +1602,40 @@ 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 ---------------------------

conf/msg_conf/map_msg.conf

@@ -775,7 +775,7 @@
 730: Character cannot be disguised while in monster form.
 731: Transforming into monster is not allowed in Guild Wars.
 
-732: Item cannot be opened when your inventory is full.
+//732: Free
 
 733: Please enter a NPC file name (usage: @reloadnpcfile <file name>).
 
@@ -933,7 +933,10 @@
 // NoBank Mapflag
 831: You cannot use the Bank on this map.
 
-//832-899 free
+// @reloadcashdb
+832: Cash shop database has been reloaded.
+
+//833-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1815,5 +1818,10 @@
 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

conf/msg_conf/map_msg_idn.conf

@@ -765,7 +765,7 @@
 730: Karakter tidak dapat disguise ketika sedang berwujud monster.
 731: Perubahan menjadi monster tidak diizinkan dalam Guild Wars.
 
-732: Item tidak dapat dibuka ketika inventory penuh.
+//732: Free
 
 //733 free
 

conf/msg_conf/map_msg_por.conf

@@ -779,7 +779,7 @@
 730: O personagem não pode ser disfarçado enquanto estiver em forma de monstro.
 731: Transformar em monstro não é permitido em GvG.
 
-732: O item não pode ser aberto quando o seu inventário está cheio.
+//732: Free
 
 733: Por favor insira um nome de arquivo NPC (uso: @reloadnpcfile <nome do arquivo>).
 

conf/msg_conf/map_msg_spn.conf

@@ -775,7 +775,7 @@
 730: El personaje no puede disfrazarse si está transformado en un monstruo.
 731: No puedes transformarte en monstruo durante la guerra de clanes.
 
-732: No puedes abrir el objeto porque tu inventario está lleno.
+//732: libre
 
 733: Introduce la ruta de archivo de un NPC (instrucciones: @reloadnpcfile <ruta>).
 

configure

@@ -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 endianess, only little endian is supported" >&5
-$as_echo "$as_me: WARNING: unable to determine endianess, only little endian is supported" >&2;}
+     { $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;}
  ;;
  esac
 

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 endianess, only little endian is supported]])]
+	[AC_MSG_WARN([[unable to determine endianness, only little endian is supported]])]
 )
 
 

db/const.yml

@@ -45,6 +45,8 @@ Body:
     Value: 4
   - Name: JUMPINGCLAN
     Value: 5
+  - Name: REPUTATION_EP18
+    Value: 3
 
 Footer:
   Imports:

db/import-tmpl/mob_db.yml

@@ -56,6 +56,7 @@
 #   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)
@@ -77,7 +78,7 @@
 
 Header:
   Type: MOB_DB
-  Version: 3
+  Version: 4
 
 #Body:
 # eAthena Dev Team

db/import-tmpl/mob_summon.yml

@@ -33,3 +33,24 @@ Header:
   Type: MOB_SUMMONABLE_DB
   Version: 1
 
+#Body:
+# Pre-re Brasilis
+#=============================================================
+#  - Group: BLOODY_DEAD_BRANCH
+#    Summon:
+#      - Mob: BOITATA
+#        Rate: 1000000
+#  - Group: Branch_Of_Dead_Tree
+#    Summon:
+#      - Mob: IARA
+#        Rate: 71428
+#      - Mob: PIRANHA
+#        Rate: 71428
+#      - Mob: HEADLESS_MULE
+#        Rate: 71428
+#      - Mob: JAGUAR
+#        Rate: 71428
+#      - Mob: TOUCAN
+#        Rate: 71428
+#      - Mob: CURUPIRA
+#        Rate: 71428

db/map_index.txt

@@ -1236,6 +1236,31 @@ 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 -

db/mob_db.yml

@@ -56,6 +56,7 @@
 #   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)
@@ -77,7 +78,7 @@
 
 Header:
   Type: MOB_DB
-  Version: 3
+  Version: 4
 
 Footer:
   Imports:

db/pre-re/item_db_equip.yml

@@ -20587,16 +20587,7 @@ Body:
     EquipLevelMin: 94
     Script: |
       bonus bMdef,5;
-      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;
+      bonus3 bSubEle,Ele_All,30,BF_WEAPON;
       bonus bFlee,30;
       skill "AL_TELEPORT",1;
       bonus bUnbreakableGarment;

db/pre-re/item_db_usable.yml

@@ -8637,21 +8637,21 @@ Body:
     Type: Usable
     Weight: 10
     Script: |
-      searchstores 10,0;
+      searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
   - Id: 12581
     AegisName: Vending_Search_Scroll2
     Name: Universal Catalog Gold
     Type: Usable
     Weight: 10
     Script: |
-      searchstores 10,1;
+      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
   - Id: 12591
     AegisName: Uni_Catalog_Bz
     Name: Universal Catalog Bronze
     Type: Usable
     Weight: 10
     Script: |
-      searchstores 10,1;
+      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
   - Id: 12609
     AegisName: Old_Ore_Box
     Name: Old Ore Box

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,randomtarget,always,0,,,,,,,
+1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,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,randomtarget,always,0,,,,,,,
+1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,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,randomtarget,always,0,,,,,,,
+1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,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,randomtarget,always,0,,,,,,,
+1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,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,randomtarget,always,0,,,,,,,
+1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,target,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,randomtarget,always,0,,,,,,,
+1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,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,randomtarget,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,target,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,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,randomtarget,always,0,,,,,,9,
+1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,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,randomtarget,always,0,,,,,,,
+1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,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,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,,,,,,,
+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,,,,,,,
 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,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,,,,,,,
+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,,,,,,,
 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,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@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@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,10,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
+1765,Valkyrie@AL_HEAL,idle,28,11,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,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@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@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,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,,,,,,,
+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,,,,,,,
 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,randomtarget,always,0,,,,,,6,
-1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,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,,,,,,,
 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,10,500,500,5000,no,self,always,0,,,,,,,
+2017,Rata@SM_MAGNUM,attack,7,25,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,6 +5694,14 @@
 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,,,,,,,
@@ -5771,28 +5779,3 @@
 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,,,,,,,

db/pre-re/pet_db.yml

@@ -866,3 +866,14 @@ Body:
         bonus2 bSubEle,Ele_Fire,2;
         bonus2 bAddEle,Ele_Fire,2;
       }
+  - Mob: E_HYDRA
+    TameItem: Leaf_Cat_Ball
+    EggItem: Mystic_Leaf_Cat_Ball
+    Fullness: 0
+    HungryDelay: 0
+    IntimacyStart: 0
+    IntimacyFed: 0
+    IntimacyOverfed: 0
+    IntimacyOwnerDie: 0
+    CaptureRate: 50
+    SpecialPerformance: false

db/pre-re/skill_db.yml

@@ -4153,7 +4153,6 @@ Body:
         Time: 120000
       - Level: 5
         Time: 60000
-    Duration2: 3000
     Requires:
       SpCost: 10
       ItemCost:
@@ -4408,7 +4407,7 @@ Body:
     TargetType: Ground
     DamageFlags:
       Splash: true
-      IgnoreFlee: true
+      IgnoreAtkCard: true
     Flags:
       IsTrap: true
       AlterRangeResearchTrap: true
@@ -4999,7 +4998,7 @@ Body:
     TargetType: Attack
     DamageFlags:
       NoDamage: true
-      IgnoreElement: true
+      IgnoreAtkCard: true
       IgnoreFlee: true
     Range: 1
     Hit: Single
@@ -5014,26 +5013,47 @@ Body:
     CastTime: 1000
     Duration1:
       - Level: 1
-        Time: 5000
+        Time: 11000
       - Level: 2
-        Time: 5500
+        Time: 10000
       - Level: 3
-        Time: 6000
+        Time: 9000
       - Level: 4
-        Time: 6500
+        Time: 8000
       - Level: 5
         Time: 7000
       - Level: 6
-        Time: 7500
+        Time: 6000
       - Level: 7
-        Time: 8000
+        Time: 5000
       - Level: 8
-        Time: 8500
+        Time: 4000
       - Level: 9
-        Time: 9000
+        Time: 3000
       - Level: 10
-        Time: 9500
+        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
+      - Level: 8
+        Time: 11000
+      - Level: 9
+        Time: 11500
+      - Level: 10
+        Time: 12000
     Requires:
       SpCost:
         - Level: 1
@@ -5164,6 +5184,8 @@ Body:
     MaxLevel: 1
     Type: Weapon
     TargetType: Attack
+    DamageFlags:
+      IgnoreAtkCard: true
     Flags:
       IsQuest: true
     Range: 1
@@ -5806,8 +5828,8 @@ Body:
   - Id: 192
     Name: NPC_MAGICALATTACK
     Description: Demon Shock Attack
-    MaxLevel: 10
-    Type: Weapon
+    MaxLevel: 1
+    Type: Magic
     TargetType: Attack
     Flags:
       IsNpc: true
@@ -5913,34 +5935,13 @@ Body:
     Name: NPC_KEEPING
     Description: Keeping
     MaxLevel: 1
-    Type: Weapon
     TargetType: Self
     DamageFlags:
       NoDamage: true
     Flags:
       IsNpc: true
     HitCount: 1
-    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
+    Duration1: 30000
     Status: Keeping
   - Id: 202
     Name: NPC_DARKBREATH
@@ -5980,60 +5981,19 @@ Body:
     Flags:
       IsNpc: true
     HitCount: 1
-    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
+    Duration1: 15000
     Status: Barrier
   - Id: 205
     Name: NPC_DEFENDER
     Description: Defender
     MaxLevel: 1
-    Type: Weapon
     TargetType: Self
     DamageFlags:
       NoDamage: true
     Flags:
       IsNpc: true
     HitCount: 1
-    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
+    Duration1: 15000
     Status: Armor
   - Id: 206
     Name: NPC_LICK
@@ -6461,6 +6421,7 @@ Body:
     TargetType: Attack
     DamageFlags:
       IgnoreAtkCard: true
+      IgnoreDefense: true
       IgnoreFlee: true
     Flags:
       IgnoreAutoGuard: true
@@ -6926,12 +6887,9 @@ Body:
     MaxLevel: 10
     Type: Magic
     TargetType: Self
-    DamageFlags:
-      IgnoreAtkCard: true
-      IgnoreFlee: true
     Flags:
       TargetSelf: true
-    Range: 5
+    Range: 9
     Hit: Single
     HitCount: 1
     Element: Holy
@@ -7401,7 +7359,7 @@ Body:
         Time: 1500
       - Level: 5
         Time: 1000
-    Duration2: 300000
+    Duration1: 300000
     Requires:
       SpCost: 1
       Weapon:
@@ -8580,6 +8538,7 @@ Body:
     HitCount: 1
     SplashArea: -1
     AfterCastActDelay: 4000
+    Duration1: 15000
     Duration2: 12000
     Requires:
       SpCost:
@@ -8871,6 +8830,7 @@ Body:
     HitCount: 1
     SplashArea: -1
     AfterCastActDelay: 4000
+    Duration1: 5000
     Duration2: 5000
     Requires:
       SpCost:
@@ -9398,8 +9358,7 @@ Body:
   - Id: 349
     Name: NPC_POWERUP
     Description: Power Up
-    MaxLevel: 10
-    Type: Weapon
+    MaxLevel: 5
     TargetType: Self
     DamageFlags:
       NoDamage: true
@@ -9408,19 +9367,19 @@ Body:
     Hit: Single
     Duration1:
       - Level: 1
-        Time: 10000
+        Time: 5000
       - Level: 2
-        Time: 15000
+        Time: 10000
       - Level: 3
-        Time: 20000
+        Time: 15000
       - Level: 4
-        Time: 25000
+        Time: 20000
       - Level: 5
-        Time: 30000
-    Status: IncHitRate
+        Time: 25000
+    Status: Powerup
   - Id: 350
     Name: NPC_AGIUP
-    Description: Agility UP
+    Description: Agility Up
     MaxLevel: 10
     TargetType: Self
     DamageFlags:
@@ -9432,14 +9391,24 @@ Body:
       - Level: 1
         Time: 10000
       - Level: 2
-        Time: 15000
-      - Level: 3
         Time: 20000
-      - Level: 4
-        Time: 25000
-      - Level: 5
+      - Level: 3
         Time: 30000
-    Status: IncFleeRate
+      - Level: 4
+        Time: 40000
+      - 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
   - Id: 351
     Name: NPC_SIEGEMODE
     Description: Siege Mode
@@ -9641,7 +9610,7 @@ Body:
     Hit: Single
     HitCount: 1
     Duration1: 300000
-    Duration2: 15000
+    Duration2: 10000
     Requires:
       SpCost: 200
     Status: Berserk
@@ -10031,15 +10000,15 @@ Body:
     Element: Weapon
     Duration1:
       - Level: 1
-        Time: 4000
+        Time: 2000
       - Level: 2
-        Time: 8000
+        Time: 4000
       - Level: 3
-        Time: 12000
+        Time: 6000
       - Level: 4
-        Time: 16000
+        Time: 8000
       - Level: 5
-        Time: 24000
+        Time: 10000
     CastDelayFlags:
       IgnoreStatus: true
     Requires:
@@ -10055,7 +10024,7 @@ Body:
         - Level: 5
           Amount: 12
       SpiritSphereCost: 1
-    Status: Stop
+    Status: Ankle
   - Id: 372
     Name: CH_CHAINCRUSH
     Description: Chain Crush Combo
@@ -10233,17 +10202,7 @@ Body:
         Time: 55000
       - Level: 5
         Time: 60000
-    Duration2:
-      - Level: 1
-        Time: 20000
-      - Level: 2
-        Time: 30000
-      - Level: 3
-        Time: 40000
-      - Level: 4
-        Time: 50000
-      - Level: 5
-        Time: 60000
+    Duration2: 60000
     Requires:
       SpCost:
         - Level: 1
@@ -10844,7 +10803,7 @@ Body:
       IgnoreDefense: true
     Flags:
       TargetTrap: true
-    Range: 5
+    Range: 4
     Hit: Multi_Hit
     HitCount: 5
     Element: Weapon
@@ -10886,7 +10845,7 @@ Body:
       Weapon:
         1hSpear: true
         2hSpear: true
-    Status: Stop
+    Status: Ankle
   - Id: 398
     Name: LK_HEADCRUSH
     Description: Traumatic Blow
@@ -11105,7 +11064,7 @@ Body:
     TargetType: Attack
     DamageFlags:
       NoDamage: true
-    Range: 7
+    Range: 9
     Hit: Single
     HitCount: 1
     ActiveInstance: 3
@@ -13866,8 +13825,6 @@ Body:
     Description: Chain Action
     MaxLevel: 10
     Type: Weapon
-    DamageFlags:
-      Critical: true
     Range: -9
     Hit: Multi_Hit
     HitCount: 2
@@ -14339,6 +14296,7 @@ Body:
     TargetType: Ground
     DamageFlags:
       Splash: true
+      IgnoreAtkCard: true
       IgnoreFlee: true
     Flags:
       AlterRangeSnakeEye: true
@@ -14424,7 +14382,7 @@ Body:
     Type: Weapon
     TargetType: Attack
     DamageFlags:
-      IgnoreFlee: true
+      IgnoreAtkCard: true
     Range: 9
     Hit: Single
     HitCount: 1
@@ -14442,7 +14400,6 @@ Body:
     TargetType: Attack
     DamageFlags:
       IgnoreAtkCard: true
-      IgnoreFlee: true
     Range: 9
     Hit: Multi_Hit
     HitCount: 3
@@ -14518,7 +14475,7 @@ Body:
     Flags:
       IgnoreBgReduction: true
       IgnoreGvgReduction: true
-    Range: 9
+    Range: 7
     Hit: Single
     HitCount: 1
     CopyFlags:
@@ -14555,6 +14512,8 @@ Body:
     MaxLevel: 5
     Type: Weapon
     TargetType: Self
+    DamageFlags:
+      IgnoreAtkCard: true
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -16375,7 +16334,7 @@ Body:
     Flags:
       IsNpc: true
     HitCount: 1
-    Duration1: -1
+    Duration1: 300000
     Status: Invincible
   - Id: 686
     Name: NPC_INVINCIBLEOFF
@@ -16387,8 +16346,6 @@ Body:
     Flags:
       IsNpc: true
     HitCount: 1
-    Duration1: 60000
-    Status: InvincibleOff
   - Id: 687
     Name: NPC_ALLHEAL
     Description: Full Heal
@@ -17007,32 +16964,13 @@ Body:
       Skill:
         Plagiarism: true
         Reproduce: true
-    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
+    Duration2: 60000
     Requires:
       SpCost: 15
       Ammo:
         Dagger: true
       AmmoAmount: 1
+    Status: Poison
   - Id: 1005
     Name: RG_CLOSECONFINE
     Description: Close Confine
@@ -17244,6 +17182,7 @@ Body:
     TargetType: Attack
     DamageFlags:
       Splash: true
+      IgnoreAtkCard: true
     Flags:
       IsQuest: true
     Range: -1
@@ -30787,10 +30726,8 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Range: 9
-    Hit: Single
-    HitCount: 1
     AfterCastActDelay: 2000
+    AfterCastWalkDelay: 1000
     Requires:
       SpCost:
         - Level: 1
@@ -30813,11 +30750,8 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-      Splash: true
-    Hit: Single
-    HitCount: 1
-    SplashArea: -1
     AfterCastActDelay: 35000
+    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 40000
@@ -30846,7 +30780,6 @@ Body:
     Name: HLIF_BRAIN
     Description: Brain Surgery
     MaxLevel: 5
-    SplashArea: 1
   - Id: 8004
     Name: HLIF_CHANGE
     Description: Change
@@ -30854,7 +30787,14 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Hit: Single
+    AfterCastActDelay:
+      - Level: 1
+        Time: 600000
+      - Level: 2
+        Time: 900000
+      - Level: 3
+        Time: 1200000
+    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 60000
@@ -30862,13 +30802,6 @@ Body:
         Time: 180000
       - Level: 3
         Time: 300000
-    Duration2:
-      - Level: 1
-        Time: 600000
-      - Level: 2
-        Time: 900000
-      - Level: 3
-        Time: 1200000
     Requires:
       SpCost: 100
     Status: Change
@@ -30880,7 +30813,8 @@ Body:
     DamageFlags:
       NoDamage: true
     Hit: Single
-    Duration2: 1000
+    AfterCastActDelay: 1000
+    AfterCastWalkDelay: 1000
     Requires:
       SpCost: 10
   - Id: 8006
@@ -30892,6 +30826,7 @@ Body:
       NoDamage: true
     Hit: Single
     AfterCastActDelay: 30000
+    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 40000
@@ -30930,6 +30865,14 @@ 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
@@ -30937,13 +30880,6 @@ Body:
         Time: 180000
       - Level: 3
         Time: 300000
-    Duration2:
-      - Level: 1
-        Time: 300000
-      - Level: 2
-        Time: 600000
-      - Level: 3
-        Time: 900000
     Requires:
       SpCost: 120
     Status: Bloodlust
@@ -30966,7 +30902,6 @@ Body:
         Count: -2
       - Level: 5
         Count: -3
-    AfterCastWalkDelay: 2000
     Requires:
       SpCost:
         - Level: 1
@@ -30987,6 +30922,18 @@ Body:
     DamageFlags:
       NoDamage: true
     Hit: Single
+    AfterCastActDelay:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 120000
+    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 60000
@@ -30998,17 +30945,6 @@ Body:
         Time: 45000
       - Level: 5
         Time: 40000
-    Duration2:
-      - Level: 1
-        Time: 60000
-      - Level: 2
-        Time: 70000
-      - Level: 3
-        Time: 80000
-      - Level: 4
-        Time: 90000
-      - Level: 5
-        Time: 120000
     Requires:
       SpCost:
         - Level: 1
@@ -31032,6 +30968,18 @@ Body:
       NoDamage: true
     Hit: Single
     CastCancel: true
+    AfterCastActDelay:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 120000
+    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 60000
@@ -31043,17 +30991,6 @@ Body:
         Time: 45000
       - Level: 5
         Time: 40000
-    Duration2:
-      - Level: 1
-        Time: 60000
-      - Level: 2
-        Time: 70000
-      - Level: 3
-        Time: 80000
-      - Level: 4
-        Time: 90000
-      - Level: 5
-        Time: 120000
     Requires:
       SpCost:
         - Level: 1
@@ -31076,7 +31013,6 @@ Body:
     Range: 15
     Hit: Single
     HitCount: 1
-    AfterCastActDelay: 1000
     Requires:
       SpCost: 1
   - Id: 8013
@@ -31098,17 +31034,6 @@ Body:
         Count: 4
       - Level: 5
         Count: 5
-    AfterCastActDelay:
-      - Level: 1
-        Time: 2000
-      - Level: 2
-        Time: 2200
-      - Level: 3
-        Time: 2400
-      - Level: 4
-        Time: 2600
-      - Level: 5
-        Time: 2800
     Requires:
       SpCost:
         - Level: 1
@@ -31129,8 +31054,7 @@ Body:
     DamageFlags:
       NoDamage: true
     Hit: Single
-    AfterCastActDelay: 3000
-    AfterCastWalkDelay: 3000
+    AfterCastWalkDelay: 1500
     Requires:
       SpCost: 40
   - Id: 8015
@@ -31154,7 +31078,6 @@ Body:
     HitCount: 1
     Element: Weapon
     SplashArea: 4
-    AfterCastWalkDelay: 1000
     Requires:
       SpCost: 1
   - Id: 8018
@@ -32348,6 +32271,7 @@ Body:
         - Level: 10
           Amount: 16
       SpCost: 30
+    Status: Sub_Weaponproperty
   - Id: 8203
     Name: MS_BOWLINGBASH
     Description: Bowling_Bash
@@ -32420,6 +32344,7 @@ Body:
         Time: 60000
     Requires:
       SpCost: 50
+    Status: Parrying
   - Id: 8205
     Name: MS_REFLECTSHIELD
     Description: Shield_Reflect
@@ -32453,6 +32378,7 @@ Body:
           Amount: 75
         - Level: 10
           Amount: 80
+    Status: ReflectShield
   - Id: 8206
     Name: MS_BERSERK
     Description: Frenzy
@@ -32464,9 +32390,10 @@ Body:
     Hit: Single
     HitCount: 1
     Duration1: 300000
-    Duration2: 15000
+    Duration2: 10000
     Requires:
-      SpCost: 100
+      SpCost: 200
+    Status: Berserk
   - Id: 8207
     Name: MA_DOUBLE
     Description: Double_Strafe
@@ -32595,6 +32522,7 @@ Body:
       Flag:
         NoReiteration: true
         NoFootSet: true
+    Status: Stun
   - Id: 8211
     Name: MA_SANDMAN
     Description: Sandman
@@ -32634,6 +32562,7 @@ Body:
       Flag:
         NoReiteration: true
         NoFootSet: true
+    Status: Sleep
   - Id: 8212
     Name: MA_FREEZINGTRAP
     Description: Freezing_Trap
@@ -32642,7 +32571,7 @@ Body:
     TargetType: Ground
     DamageFlags:
       Splash: true
-      IgnoreFlee: true
+      IgnoreAtkCard: true
     Flags:
       IsTrap: true
       AlterRangeResearchTrap: true
@@ -32685,6 +32614,7 @@ Body:
       Flag:
         NoReiteration: true
         NoFootSet: true
+    Status: Freeze
   - Id: 8213
     Name: MA_REMOVETRAP
     Description: Remove_Trap
@@ -32808,7 +32738,7 @@ Body:
       IgnoreDefense: true
     Flags:
       TargetTrap: true
-    Range: 5
+    Range: 4
     Hit: Multi_Hit
     HitCount: 5
     Element: Weapon
@@ -32851,6 +32781,7 @@ Body:
           Amount: 27
         - Level: 5
           Amount: 30
+    Status: Ankle
   - Id: 8219
     Name: ML_DEFENDER
     Description: Defending_Aura
@@ -32868,6 +32799,7 @@ Body:
     Requires:
       SpCost: 30
       State: Shield
+    Status: Defender
   - Id: 8220
     Name: ML_AUTOGUARD
     Description: Guard
@@ -32903,6 +32835,7 @@ Body:
           Amount: 28
         - Level: 10
           Amount: 30
+    Status: AutoGuard
   - Id: 8221
     Name: ML_DEVOTION
     Description: Sacrifice
@@ -32945,6 +32878,7 @@ Body:
       IgnoreItemBonus: true
     Requires:
       SpCost: 25
+    Status: Devotion
   - Id: 8222
     Name: MER_MAGNIFICAT
     Description: Magnificat
@@ -33057,9 +32991,10 @@ Body:
     Type: Weapon
     TargetType: Attack
     Range: 1
-    Hit: Multi_Hit
-    HitCount: 3
+    Hit: Single
+    HitCount: 1
     Element: Weapon
+    CastCancel: true
     CastTime: 1000
     AfterCastActDelay: 2000
     Duration2: 5000

db/pre-re/statpoint.yml

@@ -532,3 +532,23 @@ 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

db/pre-re/status.yml

@@ -162,6 +162,7 @@ Body:
   - Status: Poison
     DurationLookup: NPC_POISON
     CalcFlags:
+      Def: true
       Def2: true
       Regen: true
     Opt2:
@@ -252,6 +253,7 @@ Body:
   - Status: Dpoison
     DurationLookup: NPC_POISON
     CalcFlags:
+      Def: true
       Def2: true
       Regen: true
     Opt2:
@@ -767,7 +769,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveOnChangeMap: true
-    MinDuration: 5000
   - Status: Keeping
     DurationLookup: NPC_KEEPING
     CalcFlags:
@@ -1098,6 +1099,7 @@ Body:
     Icon: EFST_GROUNDMAGIC
     DurationLookup: SA_VOLCANO
     CalcFlags:
+      Batk: true
       Watk: true
     Flags:
       NoSave: true
@@ -1121,8 +1123,14 @@ 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:
@@ -2050,7 +2058,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
   - Status: Inchitrate
-    DurationLookup: NPC_POWERUP
     CalcFlags:
       Hit: true
     Flags:
@@ -2069,7 +2076,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
   - Status: Incfleerate
-    DurationLookup: NPC_AGIUP
     CalcFlags:
       Flee: true
     Flags:
@@ -2472,13 +2478,17 @@ Body:
     DurationLookup: HLIF_AVOID
     CalcFlags:
       Speed: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnWarp: true
   - Status: Change
     DurationLookup: HLIF_CHANGE
     CalcFlags:
       Vit: true
       Int: true
     Flags:
-      RemoveOnChangeMap: true
+      NoSave: true
+      RemoveFromHomOnWarp: true
     Fail:
       Change: true
   - Status: Bloodlust
@@ -2712,6 +2722,7 @@ Body:
     CalcFlags:
       Flee: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2720,6 +2731,7 @@ Body:
     CalcFlags:
       Watk: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2728,6 +2740,7 @@ Body:
     CalcFlags:
       MaxHp: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2736,6 +2749,7 @@ Body:
     CalcFlags:
       MaxSp: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2744,6 +2758,7 @@ Body:
     CalcFlags:
       Hit: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2812,23 +2827,12 @@ 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:
@@ -7048,3 +7052,25 @@ 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

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

db/re/item_packages.yml

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
+#   Copyright(C) 2024 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -159,77 +159,153 @@ 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: Boost_Armor_Box
+  - Item: Minus_Status_Box_
     Groups:
       - Group: 0
         Items:
-          - Item: Atker_Plate
-          - Item: Atker_Manteau
-          - Item: Atker_Greave
-          - Item: Atker_Ring
-          - Item: Boost_Up_1
-            Amount: 3
+          - Item: Minus_Str
+            Amount: 6
       - Group: 1
         Items:
-          - Item: Ran_Suits
-          - Item: Ran_Manteau
-          - Item: Ran_Boots
-          - Item: Ran_Brooch
-          - Item: Boost_Up_1
-            Amount: 3
+          - Item: Minus_Agi
+            Amount: 6
       - Group: 2
         Items:
-          - Item: Ele_Robe
-          - Item: Ele_Muffler
-          - Item: Ele_Shoes
-          - Item: Ele_Earing
-          - Item: Boost_Up_1
-            Amount: 3
+          - Item: Minus_Vit
+            Amount: 6
       - Group: 3
         Items:
-          - Item: Defn_Robe
-          - Item: Defn_Muffler
-          - Item: Defn_Shoes
-          - Item: Defn_Earing
-          - Item: Boost_Up_1
-            Amount: 3
-  - Item: Special_Coin_Pack
+          - 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_
     Groups:
       - Group: 0
         Items:
-          - Item: EP17_1_EVT39
-            Amount: 3
-          - Item: EP17_1_EVT02
-            Amount: 18
+          - Item: Fire_Bottle
+            Amount: 50
       - Group: 1
         Items:
-          - Item: BarMealTicket
-            Amount: 20
+          - Item: Acid_Bottle
+            Amount: 50
       - Group: 2
         Items:
-          - Item: Ep18_Amethyst_Fragment
-            Amount: 20
+          - Item: MenEater_Plant_Bottle
+            Amount: 50
       - Group: 3
         Items:
-          - Item: Ep19_Snow_Flower
-            Amount: 20
+          - 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: Metal_W_Box
     Groups:
       - Group: 0
@@ -326,206 +402,581 @@ Body:
       - Group: 3
         Items:
           - Item: C_School_Bag_PU
-  - Item: aegis_101470
+  - Item: Special_Coin_Pack
     Groups:
       - Group: 0
         Items:
-          - Item: Minus_Str
-            Amount: 6
+          - Item: EP17_1_EVT39
+            Amount: 3
+          - Item: EP17_1_EVT02
+            Amount: 18
       - Group: 1
         Items:
-          - Item: Minus_Agi
-            Amount: 6
+          - Item: BarMealTicket
+            Amount: 20
       - Group: 2
         Items:
-          - Item: Minus_Vit
-            Amount: 6
+          - Item: Ep18_Amethyst_Fragment
+            Amount: 20
       - Group: 3
         Items:
-          - Item: Minus_Int
-            Amount: 6
+          - 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
       - Group: 4
         Items:
-          - Item: Minus_Dex
-            Amount: 6
+          - 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
       - 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: aegis_101471
+          - Item: Hero_Weapon_Up_Box_6
+  - Item: Hero_Weapon_Hammer_S
     Groups:
       - Group: 0
         Items:
-          - Item: Fire_Bottle
-            Amount: 50
+          - Item: Hero_Weapon_Hammer_1
       - Group: 1
         Items:
-          - Item: Acid_Bottle
-            Amount: 50
+          - Item: Hero_Weapon_Hammer_2
       - Group: 2
         Items:
-          - Item: MenEater_Plant_Bottle
-            Amount: 50
+          - Item: Hero_Weapon_Hammer_3
       - Group: 3
         Items:
-          - Item: Coating_Bottle
-            Amount: 50
+          - Item: Hero_Weapon_Hammer_4
       - Group: 4
         Items:
-          - 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
+          - Item: Hero_Weapon_Hammer_5
       - Group: 5
         Items:
-          - Item: Scorpio_Diadem_K
-      - Group: 6
-        Items:
-          - Item: Sagittarius_DiademK
-  - Item: aegis_101565
+          - Item: Hero_Weapon_Hammer_6
+  - Item: aegis_102215
     Groups:
       - Group: 0
         Items:
-          - Item: Class_Sha_R_M_Melee
+          - Item: Bio_Weapon_Refine_Cube
       - Group: 1
         Items:
-          - Item: Class_Sha_R_M_Magic
+          - Item: Old_Refine_Cube
       - Group: 2
         Items:
-          - Item: Skill_Sha_R_M_Melee
-      - Group: 3
-        Items:
-          - Item: Skill_Sha_R_M_Magic
-  - Item: aegis_101654
+          - Item: Geffen_Refine_Cube
+  - Item: aegis_102216
     Groups:
       - Group: 0
         Items:
-          - Item: aegis_101655
+          - Item: Bio_Helm_Refine_Cube
       - Group: 1
         Items:
-          - Item: aegis_101656
-  - Item: aegis_101657
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101658
-      - Group: 1
-        Items:
-          - Item: aegis_101659
+          - Item: Circlet_Refine_Cube
       - Group: 2
         Items:
-          - Item: aegis_101660
+          - Item: Auto_Armor_Refine_Cube
       - Group: 3
         Items:
-          - Item: aegis_101661
-  - Item: aegis_101662
+          - 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
     Groups:
       - Group: 0
         Items:
-          - Item: aegis_101663
+          - Item: Royal_Bow_K
+            Refine: 11
       - Group: 1
         Items:
-          - Item: aegis_101664
-  - Item: aegis_101727
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101717
-      - Group: 1
-        Items:
-          - Item: aegis_101718
+          - Item: Shadow_Staff_K
+            Refine: 11
       - Group: 2
         Items:
-          - Item: aegis_101719
+          - Item: Iron_Nail_K
+            Refine: 11
       - Group: 3
         Items:
-          - Item: aegis_101720
-  - Item: aegis_101728
+          - 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
     Groups:
       - Group: 0
         Items:
-          - Item: aegis_101721
+          - Item: Sword_Of_Bluefire
+            Refine: 11
       - Group: 1
         Items:
-          - Item: aegis_101722
+          - Item: Iron_Staff
+            Refine: 11
       - Group: 2
         Items:
-          - Item: aegis_101723
+          - Item: Oriental_Sword
+            Refine: 11
       - Group: 3
         Items:
-          - Item: aegis_101724
-  - Item: aegis_101729
+          - 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
     Groups:
       - Group: 0
         Items:
-          - Item: aegis_101725
+          - Item: Narcis_Bow
+            Refine: 11
       - Group: 1
         Items:
-          - Item: aegis_101726
+          - Item: Magic_Sword
+            Refine: 11
+      - Group: 2
+        Items:
+          - Item: Avenger
+            Refine: 11
+      - 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
+    Groups:
+      - Group: 0
+        Items:
+          - Item: OneSkyOneSun
+            Refine: 11
+      - 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

db/re/item_randomopt_group.yml

@@ -15318,3 +15318,663 @@ 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

db/re/job_stats.yml

@@ -8884,6 +8884,15 @@ 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
@@ -9017,6 +9026,15 @@ 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
@@ -9149,6 +9167,15 @@ 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
@@ -9186,7 +9213,7 @@ Body:
         Vit: 1
         Int: 1
       - Level: 13
-        Agi: 1
+        Dex: 1
         Spl: 1
       - Level: 14
         Sta: 1
@@ -9202,7 +9229,7 @@ Body:
         Int: 1
         Dex: 1
       - Level: 19
-        Dex: 1
+        Int: 1
       - Level: 20
         Vit: 1
         Int: 1
@@ -9281,6 +9308,15 @@ 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
@@ -9413,6 +9449,16 @@ 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
@@ -9546,6 +9592,15 @@ 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
@@ -9680,6 +9735,15 @@ 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
@@ -9812,6 +9876,15 @@ 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
@@ -9944,6 +10017,15 @@ 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
@@ -10076,6 +10158,16 @@ 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
@@ -10208,6 +10300,15 @@ 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
@@ -10340,6 +10441,15 @@ 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
@@ -10473,6 +10583,15 @@ 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
@@ -10607,6 +10726,14 @@ 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
@@ -10730,6 +10857,16 @@ 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
@@ -10863,6 +11000,16 @@ 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
@@ -10985,6 +11132,15 @@ 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
@@ -10998,7 +11154,6 @@ Body:
       - Level: 2
         Str: 1
         Agi: 1
-        Sta: 1
       - Level: 3
         Vit: 1
         Luk: 1
@@ -11034,6 +11189,7 @@ Body:
         Dex: 1
       - Level: 15
         Luk: 1
+        Sta: 1
       - Level: 16
         Vit: 1
         Int: 1
@@ -11074,13 +11230,13 @@ Body:
       - Level: 30
         Str: 1
         Int: 1
-        Sta: 1
       - Level: 31
         Dex: 1
         Con: 1
       - Level: 32
         Pow: 1
       - Level: 33
+        Sta: 1
         Crt: 1
       - Level: 34
         Crt: 1
@@ -11095,7 +11251,10 @@ Body:
       - Level: 40
         Pow: 1
       - Level: 41
+        Sta: 1
         Con: 1
+      - Level: 42
+        Sta: 1
       - Level: 43
         Crt: 1
       - Level: 44
@@ -11104,6 +11263,7 @@ Body:
         Con: 1
       - Level: 46
         Pow: 1
+        Sta: 1
       - Level: 47
         Con: 1
       - Level: 48
@@ -11112,6 +11272,15 @@ 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
@@ -11248,6 +11417,15 @@ 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
@@ -11379,3 +11557,13 @@ 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

db/re/laphine_upgrade.yml

@@ -4727,170 +4727,174 @@ Body:
       - Item: Gray_W_Muffler
       - Item: Gray_W_Boots
       - Item: Gray_W_Shoes
-#  - 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: 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: Bio_Helm_Refine_Cube
     ResultRefine: 11
     MaximumRefine: 10

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,randomtarget,always,0,,,,,,,
+1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,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,randomtarget,always,0,,,,,,,
+1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,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,randomtarget,always,0,,,,,,,
+1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,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,randomtarget,always,0,,,,,,,
+1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,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,randomtarget,always,0,,,,,,,
+1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,target,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,randomtarget,always,0,,,,,,,
+1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,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,randomtarget,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,target,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,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,randomtarget,always,0,,,,,,9,
+1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,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,randomtarget,always,0,,,,,,,
+1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,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,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,,,,,,,
+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,,,,,,,
 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,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,,,,,,,
+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,,,,,,,
 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,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@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@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,10,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
+1765,Valkyrie@AL_HEAL,idle,28,11,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,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@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@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,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,,,,,,,
+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,,,,,,,
 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,randomtarget,always,0,,,,,,6,
-1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,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,,,,,,,
 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,30 +5704,11 @@
 
 //****
 // 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,,,,,,,
-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,,,,,,,
+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,,,,,,,
 
 //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,,,,,
@@ -7980,8 +7961,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,randomtarget,myhpltmaxrate,50,,,,,,3,
-2311,Manananggal@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
+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_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,,,,,,,
@@ -8009,8 +7990,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,randomtarget,myhpltmaxrate,50,,,,,,3,
-2315,Wakwak@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
+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_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,
@@ -8113,7 +8094,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,randomtarget,always,0,,,,,,,
+2337,Hidden Mob@WZ_METEOR,attack,83,5,10000,0,1000,yes,target,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,
@@ -8129,11 +8110,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,randomtarget,always,0,,,,,,2,
+2340,Tiyanak@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,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,randomtarget,always,0,,,,,,6,
+2340,Tiyanak@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,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,,,,,,,
@@ -8162,7 +8143,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,randomtarget,always,0,,,,,,,
+2343,Hidden Mob@WZ_STORMGUST,attack,89,5,10000,0,1000,yes,target,always,0,,,,,,,
 
 // Nightmare Pyramids
 2353,Nightmare Minorous@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
@@ -8198,8 +8179,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,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_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_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,
@@ -8218,11 +8199,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,randomtarget,always,0,,,,,,9,
+2362,Nightmare Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,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,randomtarget,always,0,,,,,,,
+2362,Nightmare Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,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,,,,,,,,
@@ -8856,11 +8837,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,10,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
+2483,Baphomet (Nightmare)@AL_HEAL,idle,28,11,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,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)@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)@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,,,,,,,,
@@ -8948,15 +8929,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,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,,,,,,,,
+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,,,,,,,,
 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,10,2000,1000,5000,no,target,always,,,,,,,,
+2535,Yellow Faceworm Queen@MG_THUNDERSTORM,attack,21,20,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,,,,,,,,
@@ -9840,7 +9821,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,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2742,Furious Incarnation of Morocc@AL_HEAL,idle,28,11,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,,,,,,,,
@@ -9853,7 +9834,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,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2743,Elusive Incarnation of Morocc@AL_HEAL,idle,28,11,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,,,,,,,,
@@ -9869,7 +9850,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,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2744,Swift Incarnation of Morocc@AL_HEAL,idle,28,11,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,
@@ -11387,7 +11368,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,10,200,0,10000,yes,target,always,,,,,,,,
+3209,V_MAGALETA@AL_DECAGI,chase,30,48,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,
@@ -11405,11 +11386,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,10,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@WZ_JUPITEL,chase,84,28,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,10,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@MG_FROSTDIVER,chase,15,40,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,,,,,,,,
@@ -11420,7 +11401,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,10,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@WZ_JUPITEL,attack,84,28,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,,,,,,
@@ -11489,11 +11470,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,10,200,0,10000,yes,target,always,,,,,,,,
+3215,V_G_MAGALETA@AL_DECAGI,chase,30,48,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,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_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_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,
@@ -11510,14 +11491,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,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@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@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,10,200,1000,10000,no,target,always,,,,,,,,
+3216,V_G_KATRINN@WZ_JUPITEL,attack,84,28,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,,,,,,,,
@@ -11534,7 +11515,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,10,200,0,10000,yes,target,always,,,,,,,23,
+3218,V_G_HARWORD@MC_MAMMONITE,attack,42,22,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,,,,,,,
@@ -11548,7 +11529,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,10,1000,0,300000,yes,self,always,,,,,,,2,
+3219,V_G_SEYREN@KN_TWOHANDQUICKEN,attack,60,30,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,,,,,,,,
@@ -11639,7 +11620,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,10,200,0,10000,yes,target,always,,,,,,,23,
+3223,V_B_HARWORD@MC_MAMMONITE,attack,42,22,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,
@@ -11661,7 +11642,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,10,200,1000,10000,no,target,always,,,,,,,,
+3224,V_B_KATRINN@WZ_JUPITEL,attack,84,28,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,,,,,,,,
@@ -11675,7 +11656,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,10,1000,0,300000,yes,self,always,,,,,,,2,
+3225,V_B_SEYREN@KN_TWOHANDQUICKEN,attack,60,30,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,,,,,,,,
@@ -11724,7 +11705,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,10,300,500,10000,no,target,always,,,,,,,,
+3228,V_CELIA@MG_THUNDERSTORM,chase,21,20,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,,,,,,,,
@@ -11737,7 +11718,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,10,200,0,10000,yes,target,always,,,,,,,,
+3229,V_CHEN@AL_DECAGI,chase,30,48,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,,,,,,,,
@@ -12759,7 +12740,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,10,2000,0,5000,no,target,always,0,,,,,,,
+3757,Dracula of Rage@AL_DECAGI,chase,30,48,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,
@@ -12847,12 +12828,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,10,10000,1000,25000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,idle,85,21,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,10,10000,500,27000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,chase,85,21,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,10,10000,1000,25000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,attack,85,21,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,,,,,,,
@@ -13124,6 +13105,108 @@
 20280,G_ILL_WOOTAN_FIGHTER@KN_BRANDISHSPEAR,attack,57,5,2000,0,10000,yes,target,always,0,,,,,,6,
 20280,G_ILL_WOOTAN_FIGHTER@NPC_FIREATTACK,attack,186,4,1000,0,5000,yes,target,always,0,,,,,,,
 
+// Illusion of Teddy Bear
+20255,ILL_TEDDY_BEAR_R@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20255,ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
+20255,ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
+20255,ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,2,1000,0,5000,yes,target,always,0,,,,,,37,
+20255,ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
+20256,ILL_TEDDY_BEAR_Y@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
+20256,ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
+20256,ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
+20256,ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
+20256,ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
+20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
+20257,ILL_TEDDY_BEAR_G@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20257,ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
+20257,ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
+20258,ILL_TEDDY_BEAR_W@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
+20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
+20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
+20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
+20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
+20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
+20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
+20258,ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
+20258,ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
+20259,ILL_TEDDY_BEAR_B@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
+20259,ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
+20259,ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
+20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_AGIUP,attack,350,1,5000,0,20000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_BLEEDING2,attack,764,5,2000,500,10000,no,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_CRITICALWOUND,attack,673,3,1000,500,20000,no,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_WIDESIGHT,attack,669,1,10000,0,30000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_WEAPONBRAKER,attack,343,1,10000,0,40000,yes,target,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_DARKBREATH,attack,202,5,2000,3000,10000,no,target,myhpltmaxrate,60,,,,,,0,
+20260,ILL_TEDDY_BEAR_S@CR_HOLYCROSS,attack,253,10,500,0,5000,yes,target,always,0,,,,,,32,
+20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,idle,352,1,10000,0,10000,yes,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,chase,352,1,10000,0,5000,yes,self,always,0,,,,,,,
+// 20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE_K,attack,750,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE,attack,653,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_PULSESTRIKE,attack,661,5,3000,3000,20000,no,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,idle,196,1,10000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
+20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,attack,196,1,5000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
+20260,ILL_TEDDY_BEAR_S@NPC_POWERUP,attack,349,5,10000,0,60000,yes,self,myhpltmaxrate,20,,,,,,6,
+20260,ILL_TEDDY_BEAR_S@NPC_GRANDDARKNESS,attack,339,10,3000,1000,5000,no,self,always,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,walk,26,1,5000,0,10000,yes,self,rudeattacked,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20260,ILL_TEDDY_BEAR_S@SA_LANDPROTECTOR,attack,288,2,3000,1000,10000,no,target,groundattacked,0,,,,,,6,
+20260,ILL_TEDDY_BEAR_S@AL_PNEUMA,attack,25,1,3000,0,5000,yes,target,longrangeattacked,0,,,,,,18,
+20261,ILL_PITMAN@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20261,ILL_PITMAN@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
+20261,ILL_PITMAN@NPC_SILENCEATTACK,chase,178,3,500,0,5000,no,target,always,0,,,,,,6,
+20261,ILL_PITMAN@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
+20261,ILL_PITMAN@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
+20261,ILL_PITMAN@SM_MAGNUM,attack,7,3,1000,0,20000,yes,self,always,0,,,,,,32,
+20261,ILL_PITMAN@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
+20262,ILL_MINERAL@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
+20262,ILL_MINERAL@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
+20262,ILL_MINERAL@AL_HEAL,idle,28,9,5000,0,1500,yes,friend,mystatuson,0,,,,,,18,
+20262,ILL_MINERAL@TF_HIDING,chase,51,1,2000,0,10000,yes,self,always,0,,,,,,19,
+20262,ILL_MINERAL@TF_HIDING,chase,51,1,10000,0,10000,yes,self,myhpltmaxrate,30,,,,,,19,
+20262,ILL_MINERAL@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
+20262,ILL_MINERAL@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
+20262,ILL_MINERAL@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
+20262,ILL_MINERAL@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
+20262,ILL_MINERAL@NPC_RANDOMATTACK,attack,183,2,1500,500,5000,yes,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@TF_HIDING,idle,51,1,500,500,5000,yes,self,always,0,,,,,,19,
+20263,ILL_OBSIDIAN@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
+20263,ILL_OBSIDIAN@WZ_EARTHSPIKE,chase,90,3,1500,500,5000,no,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@CR_SHIELDCHARGE,attack,250,3,1000,1000,5000,no,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@NPC_GROUNDATTACK,attack,185,2,500,500,5000,yes,target,always,0,,,,,,,
+20263,ILL_OBSIDIAN@TF_HIDING,attack,51,1,500,500,50000,yes,self,always,0,,,,,,19,
+20264,G_ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
+20264,G_ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
+20264,G_ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,5,1000,0,5000,yes,target,always,0,,,,,,37,
+20264,G_ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
+20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
+20265,G_ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
+20265,G_ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
+20265,G_ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
+20265,G_ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
+20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
+20266,G_ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
+20266,G_ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
+20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
+20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
+20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
+20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
+20267,G_ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
+20267,G_ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
+20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
+20268,G_ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
+20268,G_ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
+20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
+
 // Episode 17.1 - Illusion (custom) #!todo
 20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
 20340,EL-A17T@NPC_POWERUP,attack,349,5,2000,0,60000,no,self,always,0,,,,,,6,
@@ -14252,7 +14335,7 @@
 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,target,myhpltmaxrate,20,,,,,,,
+20943,DEATH_WITCH@NPC_EARTHQUAKE,attack,653,5,10000,1500,25000,no,self,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,,,,,,,
@@ -14320,7 +14403,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,target,myhpltmaxrate,40,,,,,,,
+20928,CHIMERA_THEONE@NPC_EARTHQUAKE,chase,653,5,10000,500,20000,no,self,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,
@@ -14489,3 +14572,234 @@
 21395,ILL_MAYA@NPC_IMMUNE_PROPERTY,attack,754,1,1500,1500,60000,no,self,longrangeattacked,0,,,,,,,
 21395,ILL_MAYA@NPC_DAMAGE_HEAL,attack,753,1,500,1500,120000,no,target,myhpltmaxrate,50,,,,,,32,
 21395,ILL_MAYA@NPC_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,,,,,,,

db/re/quest_db.yml

@@ -1404,21 +1404,21 @@ Body:
     TimeLimit: 4h
   - Id: 3455
     Title: Illusion Investigation Team - Machoko
-  # - Id: 3456
-    # Title: Illusion of Teddy Bear 100 Kills
-    # Targets:
-      # - Id: 1
-        # Count: 100
-        # Location: ein_d02_i
-        # MapMobTargets:
-          # ILL_TEDDY_BEAR_B: true
-          # ILL_MINERAL: true
-          # ILL_PITMAN: true
-          # ILL_TEDDY_BEAR_R: true
-          # ILL_TEDDY_BEAR_Y: true
-          # ILL_TEDDY_BEAR_W: true
-          # ILL_OBSIDIAN: true
-          # ILL_TEDDY_BEAR_G: true
+  - Id: 3456
+    Title: Illusion of Teddy Bear 100 Kills
+    Targets:
+      - Id: 1
+        Count: 100
+        Location: ein_d02_i
+        MapMobTargets:
+          ILL_TEDDY_BEAR_B: true
+          ILL_MINERAL: true
+          ILL_PITMAN: true
+          ILL_TEDDY_BEAR_R: true
+          ILL_TEDDY_BEAR_Y: true
+          ILL_TEDDY_BEAR_W: true
+          ILL_OBSIDIAN: true
+          ILL_TEDDY_BEAR_G: true
   - Id: 3457
     Title: Illusion of Teddy Bear 100 Kills - Standby
     TimeLimit: 4h
@@ -1571,8 +1571,32 @@ Body:
   - Id: 3492
     Title: (Skilled) Dragon Monster Hunting - Standby
     TimeLimit: 4h
+  - Id: 3493
+    Title: Conversation with Jarad
+  - Id: 3494
+    Title: Conversation with Rohi
+  - Id: 3495
+    Title: Conversation with Jeojin
+  - Id: 3496
+    Title: Conversation with Squain
+  - Id: 3497
+    Title: Conversation with Senado
+  - Id: 3498
+    Title: Conversation with Japer
+  - Id: 3499
+    Title: Conversation with Shirouan
+  - Id: 3500
+    Title: Conversation with Ishira
+  - Id: 3501
+    Title: Conversation with Gina
+  - Id: 3502
+    Title: Conversation with Hari
+  - Id: 3503
+    Title: Examine the Sky
   - Id: 3504
     Title: Look at the Sky - Standby
+  - Id: 3505
+    Title: Report to Junok
     TimeLimit: 4h
   - Id: 3507
     Title: Illusion Investigation Team - Sheshin
@@ -3209,6 +3233,27 @@ Body:
   - Id: 5931
     Title: "[Standby] Subjugation-Yanggeochon"
     TimeLimit: 4h
+  - Id: 5932
+    Title: The Abused Child
+  - Id: 5933
+    Title: Business Plan Presentation
+  - Id: 5934
+    Title: Gathering Training (1)
+  - Id: 5935
+    Title: Gathering Training (2)
+  - Id: 5936
+    Title: Gathering Training (3)
+  - Id: 5937
+    Title: "[Standby] Flower Room's work"
+    TimeLimit: 4h
+  - Id: 5938
+    Title: Gathering Half Flower
+  - Id: 5939
+    Title: Gathering Half Flower
+  - Id: 5940
+    Title: Gathering Half Flower
+  - Id: 5941
+    Title: Gathering Half Flower
   - Id: 6000
     Title: Job Change to Taekwon
   - Id: 6001
@@ -6270,6 +6315,56 @@ Body:
           MAGMARING: true
           DROSERA: true
           MUSCIPULAR: true
+  - Id: 8681
+    Title: To Rachel (1)
+  - Id: 8682
+    Title: To Rachel (2)
+  - Id: 8683
+    Title: Please stop fighting
+  - Id: 8684
+    Title: It's over
+  - Id: 8685
+    Title: A suspicious movement detected in the temple
+  - Id: 8686
+    Title: The Intruder of the Temple
+  - Id: 8687
+    Title: Did you break it?
+  - Id: 8688
+    Title: Thanks for today's daily food
+  - Id: 8689
+    Title: Today's Daily food - Standby
+    TimeLimit: 4h
+  - Id: 8690
+    Title: Thanks for today's daily food
+  - Id: 8691
+    Title: Sacred Relics for Essence (1)
+  - Id: 8692
+    Title: Sacred Relics for Essence (2)
+  - Id: 8693
+    Title: Sacred Relics for Essence (3)
+  - Id: 8694
+    Title: Clean Water Procurement - Standby
+    TimeLimit: 4h
+  - Id: 8695
+    Title: Procurement of clean water (1)
+  - Id: 8696
+    Title: Procurement of clean water (2)
+  - Id: 8697
+    Title: Procurement of clean water (3)
+  - Id: 8698
+    Title: Late migration
+  - Id: 8699
+    Title: First Step Out of the City
+  - Id: 8700
+    Title: I couldn't even come halfway
+  - Id: 8701
+    Title: Scenery I've Seen for the First Time
+  - Id: 8702
+    Title: Smell of Volcanic Ash
+  - Id: 8703
+    Title: The easy way to go
+  - Id: 8718
+    Title: My friend's regards
   - Id: 8719
     Title: A new area somewhere in the anthill
   - Id: 8720
@@ -7943,14 +8038,74 @@ Body:
   - Id: 11555
     Title: In search of the taste of hometown - Waiting
     TimeLimit: 4h
+  - Id: 11556
+    Title: Missing Steven
+  - Id: 11557
+    Title: Missing Steven
+  - Id: 11558
+    Title: Missing Steven
+  - Id: 11559
+    Title: Missing Steven
+  - Id: 11560
+    Title: Missing Steven
+  - Id: 11561
+    Title: Missing Steven
+  - Id: 11562
+    Title: Missing Steven
+  - Id: 11563
+    Title: Nasarian Conspiracy
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_R
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_Y
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_G
+        Count: 10
+  - Id: 11564
+    Title: Nasarian Conspiracy
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_B
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_W
+        Count: 10
+  - Id: 11565
+    Title: RUN!
+    Targets:
+      - Mob: ILL_PITMAN
+        Count: 10
+      - Mob: ILL_MINERAL
+        Count: 10
+      - Mob: ILL_OBSIDIAN
+        Count: 10
   - Id: 11566
-    Title: Escape!!!! - Wait
+    Title: RUN! - Pending
     TimeLimit: 4h
+  - Id: 11567
+    Title: Things That Shouldn't Exist
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_R
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_Y
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_G
+        Count: 10
+  - Id: 11568
+    Title: Things That Shouldn't Exist
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_B
+        Count: 10
+      - Mob: ILL_TEDDY_BEAR_W
+        Count: 10
   - Id: 11569
-    Title: Present not to exist-wait
+    Title: Things That Shouldn't Exist - Pending
     TimeLimit: 4h
+  - Id: 11570
+    Title: Let the Light Devour the Darkness
+    Targets:
+      - Mob: ILL_TEDDY_BEAR_S
+        Count: 1
   - Id: 11571
-    Title: Let the light consume the darkness - Wait
+    Title: Let the Light Devour the Darkness - Pending
     TimeLimit: 4h
   - Id: 11596
     Title: Old Memories
@@ -8040,6 +8195,106 @@ Body:
   - Id: 11667
     Title: Squirrels are rats, too? Standby
     TimeLimit: 4h
+  - Id: 11696
+    Title: Niren's Request
+  - Id: 11697
+    Title: Niren's Request
+  - Id: 11698
+    Title: Niren's Request
+  - Id: 11699
+    Title: Niren's Request
+  - Id: 11700
+    Title: Niren's Request
+  - Id: 11701
+    Title: Niren's Request
+  - Id: 11702
+    Title: Niren's Request
+  - Id: 11703
+    Title: Niren's Request
+  - Id: 11704
+    Title: Niren's Request
+  - Id: 11705
+    Title: Children of Grey
+  - Id: 11706
+    Title: Children of Grey
+  - Id: 11707
+    Title: Children of Grey
+  - Id: 11708
+    Title: Children of Grey
+  - Id: 11709
+    Title: Children of Grey
+  - Id: 11710
+    Title: Children of Grey
+  - Id: 11711
+    Title: Children of Grey
+  - Id: 11712
+    Title: Children of Grey
+  - Id: 11713
+    Title: Children of Grey
+  - Id: 11714
+    Title: Children of Grey
+  - Id: 11715
+    Title: Children of Grey
+  - Id: 11716
+    Title: Children of Grey
+  - Id: 11717
+    Title: Children of Grey
+  - Id: 11718
+    Title: Children of Grey
+  - Id: 11719
+    Title: Children of Grey
+  - Id: 11720
+    Title: Children of Grey
+  - Id: 11721
+    Title: Children of Grey
+  - Id: 11722
+    Title: Children of Grey
+  - Id: 11723
+    Title: Children of Grey
+  - Id: 11724
+    Title: Children of Grey
+  - Id: 11725
+    Title: Investigation of Oz Labyrinth
+  - Id: 11726
+    Title: Investigation of Oz Labyrinth
+  - Id: 11727
+    Title: Investigation of Oz Labyrinth
+  - Id: 11728
+    Title: Investigation of Oz Labyrinth
+  - Id: 11729
+    Title: Investigation of Oz Labyrinth
+  - Id: 11730
+    Title: Investigation of Oz Labyrinth
+    Targets:
+      - Id: 1
+        Location: oz_dun01
+        Count: 10
+  - Id: 11731
+    Title: Investigation of Oz Labyrinth
+  - Id: 11732
+    Title: Investigation of Oz Labyrinth
+  - Id: 11733
+    Title: Investigation of Oz Labyrinth
+  - Id: 11734
+    Title: Investigation of Oz Labyrinth
+  - Id: 11735
+    Title: Investigation of Oz Labyrinth
+  - Id: 11736
+    Title: Maze of Oz 1st Floor (170lv)
+    Targets:
+      - Mob: EP18_ASH_TOAD
+        Count: 20
+  - Id: 11737
+    Title: Maze of Oz Level 1 - Standby
+    TimeLimit: 4h
+  - Id: 11738
+    Title: Maze of Oz Level 2 (200lv)
+    Targets:
+      - Mob: EP18_HOT_MOLAR
+        Count: 20
+  - Id: 11739
+    Title: Maze of Oz Level 2 (200lv)
+    TimeLimit: 4h
   - Id: 12000
     Title: An old friend
   - Id: 12001
@@ -9079,6 +9334,31 @@ Body:
   - Id: 12506
     Title: Let's try again to seal the crack
     TimeLimit: 4h
+  - Id: 12520
+    Title: Villa of Deception
+  - Id: 12521
+    Title: Villa of Deception Hard
+  - Id: 12522
+    Title: Cooldown: Villa of Deception
+    TimeLimit: 4h
+  - Id: 12531
+    Title: Future General Candidate
+  - Id: 12532
+    Title: Trouble at the Top
+  - Id: 12533
+    Title: The Hidden Helper
+  - Id: 12534
+    Title: The Missing Camille
+  - Id: 12535
+    Title: The Governor's Decision
+  - Id: 12536
+    Title: The Scattered Luggage (North)
+  - Id: 12537
+    Title: Scattered Luggage (West)
+  - Id: 12538
+    Title: The Scattered Luggage (East)
+  - Id: 12539
+    Title: Scattered Luggage (South)
   - Id: 13000
     Title: RWC2011Card Gathering
   - Id: 13001
@@ -11226,6 +11506,90 @@ Body:
     Title: Farm Worker
   - Id: 16547
     Title: Juno Monster Society
+  - Id: 16548
+    Title: I can't sleep
+    Targets:
+      - Mob: EP18_FIREWIND_KITE
+        Count: 30
+  - Id: 16549
+    Title: I can't sleep
+    Targets:
+      - Mob: EP18_FIREWIND_KITE
+        Count: 30
+  - Id: 16550
+    Title: I Can't Sleep - Wait
+    TimeLimit: 4h
+  - Id: 16551
+    Title: The Story of Dinar
+  - Id: 16552
+    Title: Amira's Story
+  - Id: 16553
+    Title: Shanina's Grandma's Story
+  - Id: 16554
+    Title: Please collect the stories
+  - Id: 16555
+    Title: The Story of Dinar
+  - Id: 16556
+    Title: Amira's Story
+  - Id: 16557
+    Title: Shanina's Grandma's Story
+  - Id: 16558
+    Title: Please collect the stories
+  - Id: 16559
+    Title: Please collect the stories - Standby
+    TimeLimit: 4h
+  - Id: 16560
+    Title: This is not the place
+  - Id: 16561
+    Title: This is not the place
+  - Id: 16562
+    Title: This is not the place
+  - Id: 16563
+    Title: This is not the place
+  - Id: 16564
+    Title: This is not the place
+  - Id: 16565
+    Title: This is not the place
+  - Id: 16566
+    Title: This is not the place
+  - Id: 16567
+    Title: The Contest of the Grey Wolf Forest
+  - Id: 16568
+    Title: Everyone's Opinion
+  - Id: 16569
+    Title: Everyone's Opinion
+  - Id: 16570
+    Title: Everyone's Opinion
+  - Id: 16571
+    Title: Everyone's Opinion
+  - Id: 16572
+    Title: The Contest of the Grey Wolf Forest
+  - Id: 16573
+    Title: Source of Weapon
+  - Id: 16574
+    Title: Source of Weapon
+  - Id: 16575
+    Title: Source of Weapon
+  - Id: 16576
+    Title: Source of Weapon
+  - Id: 16577
+    Title: Source of Weapon
+  - Id: 16578
+    Title: Source of Weapon
+  - Id: 16579
+    Title: Source of Weapon
+  - Id: 16580
+    Title: Source of Weapon
+  - Id: 16581
+    Title: Children Know It
+  - Id: 16582
+    Title: Children Know It
+  - Id: 16583
+    Title: Children Know It
+  - Id: 16584
+    Title: The Price of Labor
+  - Id: 16585
+    Title: The Price of Labor
   - Id: 17000
     Title: Meet with Father Bamph
   - Id: 17001
@@ -11487,12 +11851,61 @@ Body:
   - Id: 17425
     Title: (Standby) Thanatos Tower, 12th floor
     TimeLimit: 4h
+  - Id: 17504
+    Title: Where's My Home
+  - Id: 17505
+    Title: Where's My Home
+  - Id: 17506
+    Title: Where's My Home
+  - Id: 17507
+    Title: Where's My Home
+  - Id: 17508
+    Title: Lack of Supplies
+    Drops:
+      - Mob: EP18_GREY_WOLF
+        Item: Ep18_Very_Ddan_Crystal
+        Rate: 5000
   - Id: 17509
     Title: (Standby) Lack of supplies
     TimeLimit: 4h
+  - Id: 17510
+    Title: There are no bad beasts in the world
+  - Id: 17511
+    Title: There are no bad beasts in the world
+  - Id: 17512
+    Title: There are no bad beasts in the world
+  - Id: 17513
+    Title: The Unexpected Shepherd
+  - Id: 17514
+    Title: The Unexpected Shepherd
+    Targets:
+      - Mob: EP18_ASHRING
+        Count: 20
+  - Id: 17515
+    Title: The Unexpected Shepherd
   - Id: 17516
     Title: (Standby) Unexpected shepherd
     TimeLimit: 4h
+  - Id: 17517
+    Title: The Rebels
+  - Id: 17518
+    Title: The Rebels
+  - Id: 17519
+    Title: The Rebels
+  - Id: 17520
+    Title: Wolf in the Sheep
+  - Id: 17521
+    Title: When you need a conversation
+  - Id: 17522
+    Title: Cleaning the Traitors
+  - Id: 17523
+    Title: Purification of the Sanctuary
+  - Id: 17524
+    Title: Cleaning the Traitors
+  - Id: 17525
+    Title: When you need a conversation
+  - Id: 17526
+    Title: Purification of the Sanctuary
   - Id: 17527
     Title: (Standby) Cleaning strategy
     TimeLimit: 4h
@@ -11621,6 +12034,23 @@ Body:
   - Id: 18080
     Title: Goseong dungeon 1st floor attack
     TimeLimit: 4h
+  - Id: 18082
+    Title: Eligibility to Participate in the Competition
+  - Id: 18083
+    Title: Investigation of Daishinkan's Villa
+  - Id: 18084
+    Title: Fact Investigation
+  - Id: 18085
+    Title: The Direction of Prayer
+  - Id: 18086
+    Title: Make the Grey Wolf Forest Safer
+    Targets:
+      - Id: 1
+        Location: gw_fild01
+        Count: 30
+  - Id: 18087
+    Title: Safer in the Gray Wolf Forest - Standby
+    TimeLimit: 4h
   - Id: 18100
     Title: Legends from Moscovia
   - Id: 18101

db/re/skill_tree.yml

@@ -6683,6 +6683,13 @@ Body:
         Requires:
           - Name: DK_TWOHANDDEF
             Level: 5
+      - Name: DK_DRAGONIC_BREATH
+        MaxLevel: 10
+        Requires:
+          - Name: RK_DRAGONBREATH
+            Level: 10
+          - Name: RK_DRAGONBREATH_WATER
+            Level: 10
       - Name: DK_DRAGONIC_AURA
         MaxLevel: 10
         Requires:
@@ -6765,6 +6772,21 @@ Body:
             Level: 3
           - Name: MT_SUMMON_ABR_BATTLE_WARIOR
             Level: 2
+      - Name: MT_SPARK_BLASTER
+        MaxLevel: 10
+        Requires:
+          - Name: MT_M_MACHINE
+            Level: 1
+      - Name: MT_TRIPLE_LASER
+        MaxLevel: 5
+        Requires:
+          - Name: MT_SPARK_BLASTER
+            Level: 5
+      - Name: MT_MIGHTY_SMASH
+        MaxLevel: 10
+        Requires:
+          - Name: MT_AXE_STOMP
+            Level: 3
       - Name: MT_SUMMON_ABR_MOTHER_NET
         MaxLevel: 4
         Requires:
@@ -7314,6 +7336,18 @@ Body:
             Level: 3
           - Name: BO_WOODEN_FAIRY
             Level: 3
+      - Name: BO_EXPLOSIVE_POWDER
+        MaxLevel: 5
+        Requires:
+          - Name: BO_BIONICS_M
+            Level: 3
+      - Name: BO_MAYHEMIC_THORNS
+        MaxLevel: 10
+        Requires:
+          - Name: BO_BIONICS_M
+            Level: 5
+          - Name: BO_EXPLOSIVE_POWDER
+            Level: 3
   - Job: Abyss_Chaser
     Inherit:
       Novice: true
@@ -7830,3 +7864,178 @@ 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

db/re/statpoint.yml

@@ -582,3 +582,33 @@ 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

db/re/status.yml

@@ -72,6 +72,7 @@ Body:
       Stun: true
       Sleep: true
       Burning: true
+      Protection: true
     EndOnStart:
       Aeterna: true
     EndReturn:
@@ -125,6 +126,7 @@ Body:
       Stun: true
       Sleep: true
       Burning: true
+      Protection: true
     EndOnStart:
       Aeterna: true
   - Status: Stun
@@ -144,6 +146,7 @@ Body:
       Inspiration: true
       Gvg_Stun: true
       Stun: true
+      Protection: true
   - Status: Sleep
     DurationLookup: NPC_SLEEPATTACK
     States:
@@ -162,9 +165,11 @@ Body:
       Inspiration: true
       Gvg_Sleep: true
       Sleep: true
+      Protection: true
   - Status: Poison
     DurationLookup: NPC_POISON
     CalcFlags:
+      Def: true
       Def2: true
       Regen: true
     Opt2:
@@ -179,6 +184,7 @@ Body:
       Inspiration: true
       Poison: true
       Dpoison: true
+      Protection: true
   - Status: Curse
     DurationLookup: NPC_WIDECURSE
     CalcFlags:
@@ -197,6 +203,7 @@ Body:
       Inspiration: true
       Gvg_Curse: true
       Curse: true
+      Protection: true
   - Status: Silence
     DurationLookup: NPC_SILENCEATTACK
     States:
@@ -213,6 +220,7 @@ Body:
       Inspiration: true
       Gvg_Silence: true
       Silence: true
+      Protection: true
   - Status: Confusion
     DurationLookup: NPC_WIDECONFUSE
     Flags:
@@ -222,6 +230,7 @@ Body:
     Fail:
       Refresh: true
       Inspiration: true
+      Protection: true
     EndReturn:
       Confusion: true
   - Status: Blind
@@ -241,6 +250,7 @@ Body:
       Fear: true
       Gvg_Blind: true
       Blind: true
+      Protection: true
   - Status: Bleeding
     Icon: EFST_BLOODING
     DurationLookup: NPC_BLEEDING
@@ -258,9 +268,11 @@ Body:
     Fail:
       Refresh: true
       Inspiration: true
+      Protection: true
   - Status: Dpoison
     DurationLookup: NPC_POISON
     CalcFlags:
+      Def: true
       Def2: true
       Regen: true
     Opt2:
@@ -784,7 +796,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveOnChangeMap: true
-    MinDuration: 5000
   - Status: Keeping
     DurationLookup: NPC_KEEPING
     CalcFlags:
@@ -998,6 +1009,7 @@ Body:
     Flags:
       SendOption: true
   - Status: Extremityfist
+    Icon: EFST_EXTREMITYFIST
     DurationLookup: MO_EXTREMITYFIST
     CalcFlags:
       Regen: true
@@ -1115,6 +1127,7 @@ Body:
     Icon: EFST_GROUNDMAGIC
     DurationLookup: SA_VOLCANO
     CalcFlags:
+      Batk: true
       Watk: true
       Matk: true
     Flags:
@@ -1139,8 +1152,14 @@ 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:
@@ -2163,7 +2182,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
   - Status: Inchitrate
-    DurationLookup: NPC_POWERUP
     CalcFlags:
       Hit: true
     Flags:
@@ -2182,7 +2200,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
   - Status: Incfleerate
-    DurationLookup: NPC_AGIUP
     CalcFlags:
       Flee: true
     Flags:
@@ -2583,13 +2600,17 @@ Body:
     DurationLookup: HLIF_AVOID
     CalcFlags:
       Speed: true
+    Flags:
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
   - Status: Change
     DurationLookup: HLIF_CHANGE
     CalcFlags:
       Vit: true
       Int: true
     Flags:
-      RemoveOnChangeMap: true
+      NoSave: true
+      RemoveFromHomOnMapWarp: true
     Fail:
       Change: true
   - Status: Bloodlust
@@ -2822,6 +2843,7 @@ Body:
     CalcFlags:
       Flee: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2830,6 +2852,7 @@ Body:
     CalcFlags:
       Watk: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2838,6 +2861,7 @@ Body:
     CalcFlags:
       MaxHp: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2846,6 +2870,7 @@ Body:
     CalcFlags:
       MaxSp: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2854,6 +2879,7 @@ Body:
     CalcFlags:
       Hit: true
     Flags:
+      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -2916,23 +2942,12 @@ 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:
@@ -5732,6 +5747,8 @@ Body:
     DurationLookup: RA_UNLIMIT
     Flags:
       DisplayPc: true
+      NoDispell: true
+      NoClearance: true
   - Status: Kings_Grace
     Icon: EFST_KINGS_GRACE
     DurationLookup: LG_KINGS_GRACE
@@ -6105,14 +6122,6 @@ Body:
       NoBanishingBuster: true
       NoDispell: true
       RemoveOnHermode: true
-  - Status: Extremityfist2
-    Icon: EFST_EXTREMITYFIST
-    DurationLookup: MO_EXTREMITYFIST
-    Flags:
-      NoRemoveOnDead: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
   - Status: Mtf_Aspd2
     Icon: EFST_MTF_ASPD2
     CalcFlags:
@@ -7633,7 +7642,7 @@ Body:
       RemoveOnDamaged: true
   - Status: Handicapstate_Lightningstrike
     Icon: EFST_HANDICAPSTATE_LIGHTNINGSTRIKE
-    DurationLookup: WH_SWIFTTRAP
+    DurationLookup: EM_LIGHTNING_LAND
     States:
       #NoMove: true
       #NoCast: true
@@ -7646,7 +7655,7 @@ Body:
       RemoveOnDamaged: true
   - Status: Handicapstate_Crystallization
     Icon: EFST_HANDICAPSTATE_CRYSTALLIZATION
-    DurationLookup: WH_SOLIDTRAP
+    DurationLookup: EM_TERRA_DRIVE
     States:
       #NoMove: true
       #NoCast: true
@@ -7660,7 +7669,7 @@ Body:
       RemoveOnDamaged: true
   - Status: Handicapstate_Conflagration
     Icon: EFST_HANDICAPSTATE_CONFLAGRATION
-    DurationLookup: WH_FLAMETRAP
+    DurationLookup: EM_CONFLAGRATION
     Flags:
       BlEffect: true
       DisplayPc: true
@@ -7888,6 +7897,8 @@ Body:
       BlEffect: true
       DisplayPc: true
       SendVal1: true
+      NoDispell: true
+      NoClearance: true
   - Status: Shadow_Weapon
     Icon: EFST_SHADOW_WEAPON
     DurationLookup: SHC_ENCHANTING_SHADOW
@@ -7933,6 +7944,9 @@ Body:
     Flags:
       BlEffect: true
       DisplayPc: true
+      NoBanishingBuster: true
+      NoDispell: true
+      NoClearance: true
   - Status: Ultimate_S
     Icon: EFST_ULTIMATE_S
     DurationLookup: IG_ULTIMATE_SACRIFICE
@@ -8745,9 +8759,192 @@ 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

doc/achievements.md

@@ -0,0 +1,165 @@
+# Achievement Database Structure
+
+# Table of contents
+1. [Id](#id)
+2. [Group](#group)
+    1. [Valid Groups](#valid-groups)
+4. [Name](#name)
+5. [Targets](#targets)
+6. [Condition](#condition)
+7. [Map](#map)
+8. [Dependents](#dependents)
+9. [Rewards](#rewards)
+10. [Score](#score)
+11. [Example](#example)
+
+### Id <a name="id"></a>
+
+Unique achievement ID.
+
+### Group <a name="group"></a>
+
+Achievement group type.
+Each achievement type calls a specific objective check.
+
+#### Valid groups <a name="valid-groups"></a>
+
+<ul>
+  <li><code>None</code> - Can be used for custom achievements that are given through a script with no trigger events.</li>
+  <li><code>Add_Friend</code> - Triggered when a player adds a friend.</li>
+  <li><code>Adventure</code> - Does not trigger automatically. These are triggered by the achievementcomplete script command.</li>
+  <li><code>Baby</code> - Triggered when a player becomes a baby job.</li>
+  <li><code>Battle</code> - Triggered when a player kills a monster.</li>
+  <li><code>Chatting</code> - Aegis uses this when talking to a NPC. These are triggered by the achievementupdate script command.</li>
+  <li><code>Chatting_Count</code> - Triggered when a player has a chatroom open and others join.</li>
+  <li><code>Chatting_Create</code> - Triggered when a player creates a chatroom.</li>
+  <li><code>Chatting_Dying</code> - Triggered when a player creates a chatroom and dies with it open.</li>
+  <li><code>Eat</code> - Unknown.</li>
+  <li><code>Get_Item</code> - Triggered when a player gets an item that has a specific sell value.</li>
+  <li><code>Get_Zeny</code> - Triggered when a player gets a specific amount of zeny at once.</li>
+  <li><code>Goal_Achieve</code> - Triggered when a player's achievement rank levels up.</li>
+  <li><code>Goal_Level</code> - Triggered when a player's base level or job level changes.</li>
+  <li><code>Goal_Status</code> - Triggered when a player's base stats changes.</li>
+  <li><code>Job_Change</code> - Triggered when a player's job changes.</li>
+  <li><code>Marry</code> - Triggered when two players get married.</li>
+  <li><code>Party</code> - Triggered when a player creates a party.</li>
+  <li><code>Enchant_Fail</code> - Triggered when a player fails to refine an equipment.</li>
+  <li><code>Enchant_Success</code> - Triggered when a player successfully refines an equipment.</li>
+  <li><code>Spend_Zeny</code> - Triggered when a player spends any amount of zeny on vendors.</li>
+  <li><code>Taming</code> - Triggered when a player tames a monster.</li>
+</ul>
+
+### Name <a name="name"></a>
+
+Achievement name. Used when sending rewards through RODEX.
+
+### Targets <a name="targets"></a>
+
+A list of monster names and count values that the achievement requires. The target count can also be used for
+achievements that keep a counter while not being related to monster kills. Capped at `MAX_ACHIEVEMENT_OBJECTIVES`. See
+examples below:
+
+Player must kill 5 Scorpions and 10 Porings
+
+```yml
+  Targets:
+    - Id: 0
+      Mob: SCORPION
+      Count: 5
+    - Id: 1
+      Mob: PORING
+      Count: 10
+```
+
+Player must have 100 or more of ARG0 value. Using the count target value is useful for achievements that are increased
+in increments and not checked for a total (UI_Type = 1). IE: In the achievement_list.lub file, UI_Type 0 is displayed as
+non-incremental while 1 shows a progress bar of completion for the achievement.
+
+```yml
+Condition: " ARG0 >= 100 "
+  Targets:
+    - Id: 0 // Array index value
+      Count: 100
+```
+
+### Condition <a name="condition"></a>
+
+A conditional statement that must be met for the achievement to be considered complete. Accepts script constants, player
+variables, and ARGX (where X is the argument vector value). The ARGX values are sent from the server to the achievement
+script engine on special events. See examples below:
+
+This function will send 1 argument (ARG0) with a value of i + 1 when a friend is added.
+
+```yml
+achievement_update_objective(f_sd, AG_ADD_FRIEND, 1, i + 1);
+```
+
+This function will send 2 arguments (ARG0 and ARG1) with values of weapon level and refine level, respectively, when an
+equipment is successfully refined.
+
+```yml
+achievement_update_objective(sd, AG_REFINE_SUCCESS, 2, sd->inventory_data[i]->wlv, sd->inventory.u.items_inventory[i].refine);
+```
+
+### Map <a name="map"></a>
+
+A map name that is used for the Chatting group which increments the counter based on the player's map.
+> NOTICE: This option is currently disabled until the official behavior is confirmed.
+
+### Dependents <a name="dependents"></a>
+
+A list of achievement IDs that need to be completed before this achievement is considered complete. See examples below:
+
+Player must complete achievements 10001 and 10002 first.
+
+```yml
+Dependents:
+  10001: true
+  10002: true
+```
+
+Used with the import, dependent achievements can be disabled. The player now only requires completion of achievement
+10001.
+
+```
+Dependents:
+  10002: false
+```
+
+### Rewards <a name="rewards"></a>
+
+A list of rewards that are given on completion. All fields are optional.
+
+```yml
+Item: Item Name
+Amount:
+  Amount of Item (Default: 1)
+Script: Bonus Script
+TitleId: Title ID
+```
+
+### Score <a name="score"></a>
+
+Achievement points that are given on completion.
+
+### Example <a name="example"></a>
+
+```yml
+ - Id: 99
+   Group: Baby
+   Name: Example Achieve
+   Targets:
+     - Id: 0
+       Mob: XM_CELINE_KIMI
+       Count: 1
+   Condition: " BaseLevel >= 99 "
+   Map: prontera
+   Dependents:
+     - Id: 100
+   Rewards:
+     Item: Shabby_Purse
+     Amount: 10
+     Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
+     TitleId: 1000
+   Score: 10
+```

doc/achievements.txt

@@ -1,115 +0,0 @@
-//===== rAthena Documentation ================================
-//= Achievement Database Structure
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Last Updated: ========================================
-//= 20200220
-//===== Description: =========================================
-//= Explanation of the achievements_db.yml file and structure.
-//============================================================
-
----------------------------------------
-
-Id: Unique achievement ID.
-
----------------------------------------
-
-Group: Achievement group type. Each achievement type calls a specific objective check.
-Valid groups:
-	None - Can be used for custom achievements that are given through a script with no trigger events.
-	Add_Friend - Triggered when a player adds a friend.
-	Adventure - Does not trigger automatically. These are triggered by the achievementcomplete script command.
-	Baby - Triggered when a player becomes a baby job.
-	Battle - Triggered when a player kills a monster.
-	Chatting - Aegis uses this when talking to a NPC. These are triggered by the achievementupdate script command.
-	Chatting_Count - Triggered when a player has a chatroom open and others join.
-	Chatting_Create - Triggered when a player creates a chatroom.
-	Chatting_Dying - Triggered when a player creates a chatroom and dies with it open.
-	Eat - Unknown.
-	Get_Item - Triggered when a player gets an item that has a specific sell value.
-	Get_Zeny - Triggered when a player gets a specific amount of zeny at once.
-	Goal_Achieve - Triggered when a player's achievement rank levels up.
-	Goal_Level - Triggered when a player's base level or job level changes.
-	Goal_Status - Triggered when a player's base stats changes.
-	Job_Change - Triggered when a player's job changes.
-	Marry - Triggered when two players get married.
-	Party - Triggered when a player creates a party.
-	Enchant_Fail - Triggered when a player fails to refine an equipment.
-	Enchant_Success - Triggered when a player successfully refines an equipment.
-	Spend_Zeny - Triggered when a player spends any amount of zeny on vendors.
-	Taming - Triggered when a player tames a monster.
-
----------------------------------------
-
-Name: Achievement name. Used when sending rewards through RODEX.
-
----------------------------------------
-
-Targets: A list of monster names and count values that the achievement requires.
-		The target count can also be used for achievements that keep a counter while not being related to monster kills.
-		Capped at MAX_ACHIEVEMENT_OBJECTIVES.
-
-Example:
-  // Player must kill 5 Scorpions and 10 Poring.
-  Targets:
-    - Id: 0
-      Mob: SCORPION
-      Count: 5
-    - Id: 1
-      Mob: PORING
-      Count: 10
-
-Example 2:
-  // Player must have 100 or more of ARG0 value. Using the count target value is useful for achievements that are increased in increments
-  // and not checked for a total (UI_Type = 1).
-  // IE: In the achievement_list.lub file, UI_Type 0 is displayed as non-incremental while 1 shows a progress bar of completion for the achievement.
-  Condition: " ARG0 >= 100 "
-  Targets:
-    - Id: 0 // Array index value
-      Count: 100
-
----------------------------------------
-
-Condition: A conditional statement that must be met for the achievement to be considered complete. Accepts script constants, player variables, and
-		   ARGX (where X is the argument vector value). The ARGX values are sent from the server to the achievement script engine on special events.
-		   Below are two examples of how the ARGX feature works.
-
-Example:
-	// This function will send 1 argument (ARG0) with a value of i + 1 when a friend is added.
-	achievement_update_objective(f_sd, AG_ADD_FRIEND, 1, i + 1);
-
-Example 2:
-	// This function will send 2 arguments (ARG0 and ARG1) with values of weapon level and refine level, respectively, when an equipment is
-	// successfully refined.
-	achievement_update_objective(sd, AG_REFINE_SUCCESS, 2, sd->inventory_data[i]->wlv, sd->inventory.u.items_inventory[i].refine);
-
----------------------------------------
-
-Map: A map name that is used for the Chatting group which increments the counter based on the player's map.
-NOTICE: This option is currently disabled until the official behavior is confirmed.
-
----------------------------------------
-
-Dependents: A list of achievement IDs that need to be completed before this achievement is considered complete.
-
-Example:
-  // Player must complete achievements 10001 and 10002 first.
-  Dependents:
-    10001: true
-    10002: true
-
-  // Used with the import, dependent achievements can be disabled. The player now only requires completion of achievement 10001.
-  Dependents:
-    10002: false
-
----------------------------------------
-
-Rewards: A list of rewards that are given on completion. All fields are optional.
-  Item: Item Name
-  Amount: Amount of Item (Default: 1)
-  Script: Bonus Script
-  TitleId: Title ID
-
----------------------------------------
-
-Score: Achievement points that are given on completion.

doc/atcommands.txt

@@ -780,6 +780,28 @@ 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.

doc/ea_job_system.txt

@@ -63,11 +63,12 @@ The eA Job System:
 	EAJL_2		0x300
 
 - The third category is type. Classes can either be normal, rebirth/advanced,
-  adopted, or third class.
+  adopted, third class or fourth class.
 
 	EAJL_UPPER	0x1000
 	EAJL_BABY	0x2000
 	EAJL_THIRD	0x4000
+	EAJL_FOURTH	0x8000
 
 So using these three categories, any job class can be constructed from the
 others. Let's take a swordman, for example.
@@ -143,6 +144,11 @@ EAJL_THIRD:
 	if(@eac&EAJL_THIRD)
 		mes "Wow, you've really grown!";
 
+EAJL_FOURTH:
+	Checks if a class is a fourth job.
+	if(@eac&EAJL_FOURTH)
+		mes "Wow, you've really grown!";
+
 EAJ_UPPERMASK:
 	The upper mask can be used to "strip" the upper/baby characteristics of a
 	class, used when you want to know if someone is a certain class regardless
@@ -169,13 +175,19 @@ EAJ_BASEMASK:
 	check will  always fail for the same reasons previously explained.
 
 EAJ_THIRDMASK:
-	This mask strips 3rd class attributes.  It will give the "normal" class of
+	This mask strips 3rd class attributes. It will give the "normal" class of
 	a third job, regardless of rebirth/adopted status.  When used on non-third
 	class characters, it will return the second job, or, if that also doesn't
 	exist, the first.
 	if ((@eac&EAJ_THIRDMASK) == EAJ_WARLOCK_T)
 		mes "You've gone through rebirth, I see.";
 
+EAJ_FOURTHMASK:
+	This mask strips 4th class attributes. Although currently there are none,
+	it is suggested to use this for checking.
+	if ((@eac&EAJ_FOURTHMASK) == EAJ_DRAGON_KNIGHT)
+		mes "Oh you are a Dragon Knight, I see.";
+
 The script commands eaclass, roclass:
 -------------------------------------------------------------------------------
 

doc/effect_list.md

@@ -0,0 +1,978 @@
+# List of client-side effects sorted by ID
+
+The following is a compiled list of visual and sound effects which the client
+can produce when receiving a packet with id `0x1f3 (01f3 <ID>.l <type>.l)`.
+Each list entry contains a number and a short description of the effect.
+You can produce these effects ingame by doing `"@effect <number>"`.
+It's also possible to attach effects to item/npc scripts by using `specialeffect` or `specialeffect2`.
+
+|Number|Constant|Description|
+|---|---|---|
+|0|EF_HIT1|	Regular Hit|
+|1|EF_HIT2|	Bash|
+|2|EF_HIT3|	Melee Skill Hit|
+|3|EF_HIT4|	Melee Skill Hit|
+|4|EF_HIT5|	Melee Skill Hit|
+|5|EF_HIT6|	Melee Skill Hit|
+|6|EF_ENTRY|Being Warped|
+|7|EF_EXIT|	Item Heal effect|
+|8|EF_WARP|	Yellow Ripple Effect|
+|9|EF_ENHANCE|Different Type of Heal|
+|10|EF_COIN|	Mammonite|
+|11|EF_ENDURE|Endure|
+|12|EF_BEGINSPELL|Yellow cast aura|
+|13|EF_GLASSWALL|Blue Box|
+|14|EF_HEALSP|Blue restoring effect|
+|15|EF_SOULSTRIKE|Soul Strike|
+|16|EF_BASH|	Hide|
+|17|EF_MAGNUMBREAK|Magnum Break|
+|18|EF_STEAL|Steal|
+|19|EF_HIDING|(Invalid)|
+|20|EF_PATTACK|Envenom/Poison|
+|21|EF_DETOXICATION|Detoxify|
+|22|EF_SIGHT|Sight|
+|23|EF_STONECURSE|Stone Curse|
+|24|EF_FIREBALL|Fire Ball|
+|25|EF_FIREWALL|Fire Wall|
+|26|EF_ICEARROW|A sound (a swipe?)|
+|27|EF_FROSTDIVER|Frost Diver (Traveling to Target)|
+|28|EF_FROSTDIVER2|Frost Diver (Hitting)|
+|29|EF_LIGHTBOLT|Lightning Bolt|
+|30|EF_THUNDERSTORM|Thunder Storm|
+|31|EF_FIREARROW|Weird bubbles launching from feet|
+|32|EF_NAPALMBEAT|Small clustered explosions|
+|33|EF_RUWACH|Ruwach|
+|34|EF_TELEPORTATION|Old Map Exit Animation (unused)|
+|35|EF_READYPORTAL|Old Warp Portal (unused)|
+|36|EF_PORTAL|Old Warp Portal (unused)|
+|37|EF_INCAGILITY|AGI Up|
+|38|EF_DECAGILITY|AGI Down|
+|39|EF_AQUA|Aqua Benedicta|
+|40|EF_SIGNUM|Signum Crucis|
+|41|EF_ANGELUS|Angelus|
+|42|EF_BLESSING|Blessing|
+|43|EF_INCAGIDEX|Dex + Agi Up|
+|44|EF_SMOKE|Little Fog Smoke.|
+|45|EF_FIREFLY|Faint Little Ball Things.|
+|46|EF_SANDWIND|Sand Wind|
+|47|EF_TORCH|Torch|
+|48|EF_SPRAYPOND|Small Piece of Glass|
+|49|EF_FIREHIT|Firebolt/Wall Hits|
+|50|EF_FIRESPLASHHIT|Spinning Fire Thing|
+|51|EF_COLDHIT|Ice Elemental Hit|
+|52|EF_WINDHIT|Wind Elemental Hit|
+|53|EF_POISONHIT|Puff of Purpulish Smoke?|
+|54|EF_BEGINSPELL2|Cast Initiation Aura (Water Element)|
+|55|EF_BEGINSPELL3|Cast Initiation Aura (Fire Element)|
+|56|EF_BEGINSPELL4|Cast Initiation Aura (Earth Element)|
+|57|EF_BEGINSPELL5|Cast Initiation Aura (Wind Element)|
+|58|EF_BEGINSPELL6|Cast Initiation Aura (Holy Element)|
+|59|EF_BEGINSPELL7|Cast Initiation Aura (Poison Element)|
+|60|EF_LOCKON|Cast target circle|
+|61|EF_WARPZONE|Old Warp Portal (NPC Warp, unused)|
+|62|EF_SIGHTRASHER|Sight Trasher|
+|63|EF_BARRIER|Moonlight Sphere|
+|64|EF_ARROWSHOT|Something Like Puruple/Yellow Light Bullet|
+|65|EF_INVENOM|Something Like Absorb of Power|
+|66|EF_CURE|	Cure|
+|67|EF_PROVOKE|Provoke|
+|68|EF_MVP|	MVP Banner|
+|69|EF_SKIDTRAP|Skid Trap|
+|70|EF_BRANDISHSPEAR|Brandish Spear|
+|71|EF_CONE|Spiral White balls|
+|72|EF_SPHERE|Bigger Spiral White balls|
+|73|EF_BOWLINGBASH|Blue/White Small Aura|
+|74|EF_ICEWALL|Ice Wall|
+|75|EF_GLORIA|Gloria|
+|76|EF_MAGNIFICAT|Magnificat|
+|77|EF_RESURRECTION|Resurrection|
+|78|EF_RECOVERY|Status Recovery|
+|79|EF_EARTHSPIKE|Earth Spike|
+|80|EF_SPEARBMR|Spear Boomerang|
+|81|EF_PIERCE|Skill hit|
+|82|EF_TURNUNDEAD|Turn Undead|
+|83|EF_SANCTUARY|Sanctuary|
+|84|EF_IMPOSITIO|Impositio Manus|
+|85|EF_LEXAETERNA|Lex Aeterna|
+|86|EF_ASPERSIO|Aspersio|
+|87|EF_LEXDIVINA|Lex Divina|
+|88|EF_SUFFRAGIUM|Suffragium|
+|89|EF_STORMGUST|Storm Gust|
+|90|EF_LORD|	Lord of Vermilion|
+|91|EF_BENEDICTIO|B. S. Sacramenti|
+|92|EF_METEORSTORM|Meteor Storm|
+|93|EF_YUFITEL|Jupitel Thunder (Ball)|
+|94|EF_YUFITELHIT|Jupitel Thunder (Hit)|
+|95|EF_QUAGMIRE|Quagmire|
+|96|EF_FIREPILLAR|Fire Pillar|
+|97|EF_FIREPILLARBOMB|	Fire Pillar/Land Mine hit|
+|98|EF_HASTEUP|Adrenaline Rush|
+|99|EF_FLASHER|Flasher Trap|
+|100|EF_REMOVETRAP|Yellow ball fountain|
+|101|EF_REPAIRWEAPON|Weapon Repair|
+|102|EF_CRASHEARTH|Hammerfall|
+|103|EF_PERFECTION|Weapon Perfection|
+|104|EF_MAXPOWER|Maximize Power|
+|105|EF_BLASTMINE|(nothing)|
+|106|EF_BLASTMINEBOMB|Blast Mine Trap|
+|107|EF_CLAYMORE|Claymore Trap|
+|108|EF_FREEZING|Freezing Trap|
+|109|EF_BUBBLE|Bailaban Blue bubble Map Effect|
+|110|EF_GASPUSH|Trap Used by Giearth|
+|111|EF_SPRINGTRAP|Spring Trap|
+|112|EF_KYRIE|Kyrie Eleison|
+|113|EF_MAGNUS|Magnus Exorcismus|
+|114|EF_BOTTOM|Old Magnus Exorcismus Map Unit (unused)|
+|115|EF_BLITZBEAT|Blitz Beat|
+|116|EF_WATERBALL|Fling Watersphere|
+|117|EF_WATERBALL2|Waterball|
+|118|EF_FIREIVY|Fling Firesphere|
+|119|EF_DETECTING|Detect|
+|120|EF_CLOAKING|Cloaking|
+|121|EF_SONICBLOW|Sonic Blow (Part 1/2)|
+|122|EF_SONICBLOWHIT|Multi hit effect|
+|123|EF_GRIMTOOTH|Grimtooth Cast|
+|124|EF_VENOMDUST|Venom Dust|
+|125|EF_ENCHANTPOISON|Enchant Poison|
+|126|EF_POISONREACT|Poison React|
+|127|EF_POISONREACT2|Small Posion React|
+|128|EF_OVERTHRUST|Over Thrust|
+|129|EF_SPLASHER|Venom Splasher Explosion|
+|130|EF_TWOHANDQUICKEN|Two-Hand Quicken|
+|131|EF_AUTOCOUNTER|Auto-Counter Hit|
+|132|EF_GRIMTOOTHATK|Grimtooth Hit|
+|133|EF_FREEZE|Ice Effect (Used by NPCs)|
+|134|EF_FREEZED|Ice Effect (Used by NPCs)|
+|135|EF_ICECRASH|Ice Effect (Used by NPCs)|
+|136|EF_SLOWPOISON|Slow Poison|
+|137|EF_BOTTOM2|Old Sanctuary Map Unit (unused)|
+|138|EF_FIREPILLARON|Fire pillar|
+|139|EF_SANDMAN|Sandman Trap|
+|140|EF_REVIVE|Ressurection Aura|
+|141|EF_PNEUMA|Pneuma|
+|142|EF_HEAVENSDRIVE|Heaven's Drive|
+|143|EF_SONICBLOW2|Sonic Blow (Part 2/2)|
+|144|EF_BRANDISH2|Brandish Spear Pre-Hit Effect|
+|145|EF_SHOCKWAVE|Shockwave Trap|
+|146|EF_SHOCKWAVEHIT|Shockwave Trap Hit|
+|147|EF_EARTHHIT|Pierce Hit|
+|148|EF_PIERCESELF|Pierce Cast Animation|
+|149|EF_BOWLINGSELF|Bowling Bash|
+|150|EF_SPEARSTABSELF|Pierce Cast Animation|
+|151|EF_SPEARBMRSELF|Spear Boomerang Cast|
+|152|EF_HOLYHIT|Turn Undead|
+|153|EF_CONCENTRATION|Increase Concentration|
+|154|EF_REFINEOK|Refine Success|
+|155|EF_REFINEFAIL|Refine Fail|
+|156|EF_JOBCHANGE|jobchange.str not found error|
+|157|EF_LVUP|levelup.str not found error|
+|158|EF_JOBLVUP|Job Level Up|
+|159|EF_TOPRANK|PvP circle|
+|160|EF_PARTY|PvP Party Circle|
+|161|EF_RAIN|(Nothing)|
+|162|EF_SNOW|Snow|
+|163|EF_SAKURA|White Sakura Leaves|
+|164|EF_STATUS_STATE|(Nothing)|
+|165|EF_BANJJAKII|Comodo Fireworks Ball|
+|166|EF_MAKEBLUR|Energy Coat (Visual Effect)|
+|167|EF_TAMINGSUCCESS|(Nothing)|
+|168|EF_TAMINGFAILED|(Nothing)|
+|169|EF_ENERGYCOAT|Energy Coat Animation|
+|170|EF_CARTREVOLUTION|Cart Revolution|
+|171|EF_VENOMDUST2|Venom Dust Map Unit|
+|172|EF_CHANGEDARK|Change Element (Dark)|
+|173|EF_CHANGEFIRE|Change Element (Fire)|
+|174|EF_CHANGECOLD|Change Element (Water)|
+|175|EF_CHANGEWIND|Change Element (Wind)|
+|176|EF_CHANGEFLAME|Change Element (Fire)|
+|177|EF_CHANGEEARTH|Change Element (Earth)|
+|178|EF_CHAINGEHOLY|Change Element (Holy)|
+|179|EF_CHANGEPOISON|Change Element (Poison)|
+|180|EF_HITDARK|Darkness Attack|
+|181|EF_MENTALBREAK|Mental Breaker|
+|182|EF_MAGICALATTHIT|Magical Hit|
+|183|EF_SUI_EXPLOSION|Self Destruction|
+|184|EF_DARKATTACK|(Nothing)|
+|185|EF_SUICIDE|(Nothing)|
+|186|EF_COMBOATTACK1|Combo Attack 1|
+|187|EF_COMBOATTACK2|Combo Attack 2|
+|188|EF_COMBOATTACK3|Combo Attack 3|
+|189|EF_COMBOATTACK4|Combo Attack 4|
+|190|EF_COMBOATTACK5|Combo Attack 5|
+|191|EF_GUIDEDATTACK|Guided Attack|
+|192|EF_POISONATTACK|Poison Attack|
+|193|EF_SILENCEATTACK|Silence Attack|
+|194|EF_STUNATTACK|Stun Attack|
+|195|EF_PETRIFYATTACK|Petrify Attack|
+|196|EF_CURSEATTACK|Curse Attack|
+|197|EF_SLEEPATTACK|Sleep Attack|
+|198|EF_TELEKHIT|(Nothing)|
+|199|EF_PONG|	Small Popping Bubble Map Effect|
+|200|EF_LEVEL99|Normal level 99 Aura (Middle)|
+|201|EF_LEVEL99_2|Normal level 99 Aura (Bottom)|
+|202|EF_LEVEL99_3|Lv 99 Aura Bubble|
+|203|EF_GUMGANG|Fury (Visual Effect)|
+|204|EF_POTION1|Red Herb/Potion|
+|205|EF_POTION2|Orange Potion|
+|206|EF_POTION3|Yellow Herb/Potion|
+|207|EF_POTION4|White Herb/Potion|
+|208|EF_POTION5|Blue Herb/Potion|
+|209|EF_POTION6|Green Herb/Potion|
+|210|EF_POTION7|Yellow Circle Healing Effect|
+|211|EF_POTION8|Blue Circle Healing Effect|
+|212|EF_DARKBREATH|Dark Breath|
+|213|EF_DEFFENDER|Defender|
+|214|EF_KEEPING|Keeping|
+|215|EF_SUMMONSLAVE|Summon Slave|
+|216|EF_BLOODDRAIN|Blood Drain|
+|217|EF_ENERGYDRAIN|Energy Drain|
+|218|EF_POTION_CON|Concentration Potion|
+|219|EF_POTION_|Awakening Potion|
+|220|EF_POTION_BERSERK|Berserk Potion|
+|221|EF_POTIONPILLAR|Intense light beam|
+|222|EF_DEFENDER|Defender (Crusader)|
+|223|EF_GANBANTEIN|Holy Cast Aura|
+|224|EF_WIND|	Wind (Map effect)|
+|225|EF_VOLCANO|Volcano casting effect|
+|226|EF_GRANDCROSS|Grand Cross Effect|
+|227|EF_INTIMIDATE|Snatch|
+|228|EF_CHOOKGI|(Nothing)|
+|229|EF_CLOUD|(Nothing)|
+|230|EF_CLOUD2|(Nothing)|
+|231|EF_MAPPILLAR|Map Light Pillar Animation 1|
+|232|EF_LINELINK|Sacrifice (Visual Effect)|
+|233|EF_CLOUD3|Fog|
+|234|EF_SPELLBREAKER|Spell Breaker|
+|235|EF_DISPELL|Dispell|
+|236|EF_DELUGE|Deluge Cast Aura|
+|237|EF_VIOLENTGALE|Violent Gale Cast Aura|
+|238|EF_LANDPROTECTOR|Magnetic Earth Cast Aura|
+|239|EF_BOTTOM_VO|Volcano (Visual Effect)|
+|240|EF_BOTTOM_DE|Deluge (Visual Effect)|
+|241|EF_BOTTOM_VI|Violent Gale (Visual Effect)|
+|242|EF_BOTTOM_LA|Magnetic Earth (Visual Effect)|
+|243|EF_FASTMOVE|(Invalid)|
+|244|EF_MAGICROD|Magic Rod|
+|245|EF_HOLYCROSS|Holy Cross|
+|246|EF_SHIELDCHARGE|Shield Charge|
+|247|EF_MAPPILLAR2|Map Light Pillar Animation 2|
+|248|EF_PROVIDENCE|Resistant Souls|
+|249|EF_SHIELDBOOMERANG|Shield Boomerang|
+|250|EF_SPEARQUICKEN|Spear Quicken|
+|251|EF_DEVOTION|Devotion|
+|252|EF_REFLECTSHIELD|Reflect Shield|
+|253|EF_ABSORBSPIRITS|Absorb Spirit Spheres|
+|254|EF_STEELBODY|Mental Strength (Visual Effect)|
+|255|EF_FLAMELAUNCHER|Elemental Endow (Fire)|
+|256|EF_FROSTWEAPON|Elemental Endow (Water)|
+|257|EF_LIGHTNINGLOADER|Elemental Endow (Wind)|
+|258|EF_SEISMICWEAPON|Elemental Endow (Earth)|
+|259|EF_MAPPILLAR3|Map Light Pillar Animation 3|
+|260|EF_MAPPILLAR4|Map Light Pillar Animation 4|
+|261|EF_GUMGANG2|Fury Cast Animation|
+|262|EF_TEIHIT1|Raging Quadruple Blow|
+|263|EF_GUMGANG3|Raging Quadruple Blow 2|
+|264|EF_TEIHIT2|(Nothing)|
+|265|EF_TANJI|Throw Spirit Sphere|
+|266|EF_TEIHIT1X|Raging Quadruple Blow 3|
+|267|EF_CHIMTO|Occult Impaction|
+|268|EF_STEALCOIN|Steal Coin|
+|269|EF_STRIPWEAPON|Divest Weapon|
+|270|EF_STRIPSHIELD|Divest Shield|
+|271|EF_STRIPARMOR|Divest Armor|
+|272|EF_STRIPHELM|Divest Helm|
+|273|EF_CHAINCOMBO|Raging Quadruple Blow 4|
+|274|EF_RG_COIN|Steal Coin Animation|
+|275|EF_BACKSTAP|Back Stab Animation|
+|276|EF_TEIHIT3|Raging Thrust|
+|277|EF_BOTTOM_DISSONANCE|Dissoance Map Unit|
+|278|EF_BOTTOM_LULLABY|Lullaby Map Unit|
+|279|EF_BOTTOM_RICHMANKIM|Mr Kim a Rich Man Map Unit|
+|280|EF_BOTTOM_ETERNALCHAOS|Eternal Chaos Map Unit|
+|281|EF_BOTTOM_DRUMBATTLEFIELD|A Drum on the Battlefield Map Unit|
+|282|EF_BOTTOM_RINGNIBELUNGEN|The Ring Of Nibelungen Map Unit|
+|283|EF_BOTTOM_ROKISWEIL|Loki's Veil Map Unit|
+|284|EF_BOTTOM_INTOABYSS|Into the Abyss Map Unit|
+|285|EF_BOTTOM_SIEGFRIED|Invunerable Siegfriend Map Unit|
+|286|EF_BOTTOM_WHISTLE|A Wistle Map Unit|
+|287|EF_BOTTOM_ASSASSINCROSS|Assassin Cross of Sunset Map Unit|
+|288|EF_BOTTOM_POEMBRAGI|A Poem of Bragi Map Unit|
+|289|EF_BOTTOM_APPLEIDUN|The Apple Of Idun Map Unit|
+|290|EF_BOTTOM_UGLYDANCE|Ugly Dance Map Unit|
+|291|EF_BOTTOM_HUMMING|Humming Map Unit|
+|292|EF_BOTTOM_DONTFORGETME|Please don't Forget Me Map Unit|
+|293|EF_BOTTOM_FORTUNEKISS|Fortune's Kiss Map Unit|
+|294|EF_BOTTOM_SERVICEFORYOU|Service For You Map Unit|
+|295|EF_TALK_FROSTJOKE|Frost Joke|
+|296|EF_TALK_SCREAM|Scream|
+|297|EF_POKJUK|Fire Works (Visual Effect)|
+|298|EF_THROWITEM|Acid Terror Animnation|
+|299|EF_THROWITEM2|(Nothing)|
+|300|EF_CHEMICALPROTECTION|Chemical Protection|
+|301|EF_POKJUK_SOUND|Fire Works (Sound Effect)|
+|302|EF_DEMONSTRATION|Bomb|
+|303|EF_CHEMICAL2|(Unused)|
+|304|EF_TELEPORTATION2|Teleportation Animation|
+|305|EF_PHARMACY_OK|Pharmacy Success|
+|306|EF_PHARMACY_FAIL|Pharmacy Failed|
+|307|EF_FORESTLIGHT|Forest Light 1|
+|308|EF_THROWITEM3|Throw Stone|
+|309|EF_FIRSTAID|First Aid|
+|310|EF_SPRINKLESAND|Sprinkle Sand|
+|311|EF_LOUD|	Crazy Uproar|
+|312|EF_HEAL|	Heal Effect|
+|313|EF_HEAL2|Heal Effect 2|
+|314|EF_EXIT2|Old Map Exit effect (Unused)|
+|315|EF_GLASSWALL2|Safety Wall|
+|316|EF_READYPORTAL2|Warp Portal Animation 1|
+|317|EF_PORTAL2|Warp Portal Animation 2|
+|318|EF_BOTTOM_MAG|Magnus Exorcisimus Map Unit|
+|319|EF_BOTTOM_SANC|Sanctuary Map Unit|
+|320|EF_HEAL3|Offensive Heal|
+|321|EF_WARPZONE2|Warp NPC|
+|322|EF_FORESTLIGHT2|Forest Light 2|
+|323|EF_FORESTLIGHT3|Forest Light 3|
+|324|EF_FORESTLIGHT4|Forest Light 4|
+|325|EF_HEAL4|Heal Effect 4|
+|326|EF_FOOT|	Chase Walk Left Foot|
+|327|EF_FOOT2|Chse Walk Right Foot|
+|328|EF_BEGINASURA|Monk Asura Strike|
+|329|EF_TRIPLEATTACK|Triple Strike|
+|330|EF_HITLINE|Combo Finish|
+|331|EF_HPTIME|Natural HP Regeneration|
+|332|EF_SPTIME|Natural SP Regeneration|
+|333|EF_MAPLE|Autumn Leaves|
+|334|EF_BLIND|Blind|
+|335|EF_POISON|Poison|
+|336|EF_GUARD|Kyrie Eleison/Parrying Shield|
+|337|EF_JOBLVUP50|Class Change|
+|338|EF_ANGEL2|Super Novice/Taekwon Level Up Angel|
+|339|EF_MAGNUM2|Spiral Pierce|
+|340|EF_CALLZONE|(Nothing)|
+|341|EF_PORTAL3|Wedding Warp Portal|
+|342|EF_COUPLECASTING|Wedding Skill|
+|343|EF_HEARTCASTING|Another Merry Skill|
+|344|EF_ENTRY2|Character map entry effect|
+|345|EF_SAINTWING|Wings (Animated)|
+|346|EF_SPHEREWIND|Like Moonlight But Blue|
+|347|EF_COLORPAPER|Wedding Ceremony|
+|348|EF_LIGHTSPHERE|Like 1000 Blade trepassing|
+|349|EF_WATERFALL|Waterfall (Horizonatal)|
+|350|EF_WATERFALL_90|Waterfall (Vertical)|
+|351|EF_WATERFALL_SMALL|Small Waterfall (Horizonatal)|
+|352|EF_WATERFALL_SMALL_90|Small Waterfall (Vertical)|
+|353|EF_WATERFALL_T2|Dark Waterfall (Horizonatal)|
+|354|EF_WATERFALL_T2_90|Dark Waterfall (Vertical)|
+|355|EF_WATERFALL_SMALL_T2|Dark Small Waterfall (Horizonatal)|
+|356|EF_WATERFALL_SMALL_T2_90|Dark Small Waterfall (Vertical)|
+|357|EF_MINI_TETRIS|(Nothing)|
+|358|EF_GHOST|Niflheim Ghost|
+|359|EF_BAT|	Niflheim Bat Slow|
+|360|EF_BAT2|	Niflheim Bat Fast|
+|361|EF_SOULBREAKER|Soul Destroyer|
+|362|EF_LEVEL99_4|Trancendant Level 99 Aura 1|
+|363|EF_VALLENTINE|Valentine Day Heart With Wings|
+|364|EF_VALLENTINE2|Valentine Day Heart|
+|365|EF_PRESSURE|Gloria Domini|
+|366|EF_BASH3D|Martyr's Reckoning|
+|367|EF_AURABLADE|Aura Blade|
+|368|EF_REDBODY|Berserk|
+|369|EF_LKCONCENTRATION|Concentration|
+|370|EF_BOTTOM_GOSPEL|Gospel Map Unit|
+|371|EF_ANGEL|Level Up|
+|372|EF_DEVIL|Death|
+|373|EF_DRAGONSMOKE|House Smoke|
+|374|EF_BOTTOM_BASILICA|Basilica|
+|375|EF_ASSUMPTIO|Assumptio (Visual Effect)|
+|376|EF_HITLINE2|Palm Strike|
+|377|EF_BASH3D2|Matyr's Reckoning 2|
+|378|EF_ENERGYDRAIN2|Soul Drain (1st Part)|
+|379|EF_TRANSBLUEBODY|Soul Drain (2nd Part)|
+|380|EF_MAGICCRASHER|Magic Crasher|
+|381|EF_LIGHTSPHERE2|Blue Starburst (Unknown use)|
+|382|EF_LIGHTBLADE|(Nothing)|
+|383|EF_ENERGYDRAIN3|Health Conversion|
+|384|EF_LINELINK2|Soul Change (Sound Effect)|
+|385|EF_LINKLIGHT|Soul Change (Visual Effect)|
+|386|EF_TRUESIGHT|True Sight|
+|387|EF_FALCONASSAULT|Falcon Assault|
+|388|EF_TRIPLEATTACK2|Focused Arrow Strike (Sound Effect)|
+|389|EF_PORTAL4|Wind Walk|
+|390|EF_MELTDOWN|Shattering Strike|
+|391|EF_CARTBOOST|Cart Boost|
+|392|EF_REJECTSWORD|Reject Sword|
+|393|EF_TRIPLEATTACK3|Arrow Vulcan|
+|394|EF_SPHEREWIND2|Sheltering Bliss|
+|395|EF_LINELINK3|Marionette Control (Sound Effect)|
+|396|EF_PINKBODY|Marionette Control (Visual Effect)|
+|397|EF_LEVEL99_5|Trancended 99 Aura (Middle)|
+|398|EF_LEVEL99_6|Trancended 99 Aura (Bottom)|
+|399|EF_BASH3D3|Head Crush|
+|400|EF_BASH3D4|Joint Beat|
+|401|EF_NAPALMVALCAN|Napalm Vulcan Sound|
+|402|EF_PORTAL5|Dangerous Soul Collect|
+|403|EF_MAGICCRASHER2|Mind Breaker|
+|404|EF_BOTTOM_SPIDER|Fiber Lock|
+|405|EF_BOTTOM_FOGWALL|Wall Of Fog|
+|406|EF_SOULBURN|Soul Burn|
+|407|EF_SOULCHANGE|Soul Change|
+|408|EF_BABY|	Mom, Dad, I love you! (Baby Skill)|
+|409|EF_SOULBREAKER2|Meteor Assault|
+|410|EF_RAINBOW|Rainbow|
+|411|EF_PEONG|Leap|
+|412|EF_TANJI2|Like Throw Spirit Sphere|
+|413|EF_PRESSEDBODY|Axe Kick|
+|414|EF_SPINEDBODY|Round Kick|
+|415|EF_KICKEDBODY|Counter Kick|
+|416|EF_AIRTEXTURE|(Nothing)|
+|417|EF_HITBODY|Flash|
+|418|EF_DOUBLEGUMGANG|Warmth Lightning|
+|419|EF_REFLECTBODY|Kaite (Visual Effect)|
+|420|EF_BABYBODY|Eswoo (Small) (Visual Effect)|
+|421|EF_BABYBODY2|Eswoo (Alt. Small) (Visual Effect)|
+|422|EF_GIANTBODY|Eswoo (Normal) (Visual Effect)|
+|423|EF_GIANTBODY2|Eswoo (Alt. Normal) (Visual Effect)|
+|424|EF_ASURABODY|Spirit Link (Visual Effect)|
+|425|EF_4WAYBODY|Esma Hit (Visual Effect)|
+|426|EF_QUAKEBODY|Sprint Collision (Visual Effect)|
+|427|EF_ASURABODY_MONSTER|(Nothing)|
+|428|EF_HITLINE3|(Nothing)|
+|429|EF_HITLINE4|Taekwon Kick Hit 1|
+|430|EF_HITLINE5|Taekwon Kick Hit 2|
+|431|EF_HITLINE6|Taekwon Kick Hit 3|
+|432|EF_ELECTRIC|Solar, Lunar and Stellar Perception (Visual Effect)|
+|433|EF_ELECTRIC2|Solar, Lunar and Stellar Opposition (Visual Effect)|
+|434|EF_STORMKICK|Taekwon Kick Hit 4|
+|435|EF_HITLINE7|Whirlwind Kick|
+|436|EF_STORMKICK|White Barrier (Unused)|
+|437|EF_HALFSPHERE|White barrier 2 (Unused)|
+|438|EF_ATTACKENERGY|Kaite Reflect Animation|
+|439|EF_ATTACKENERGY2|Flying Side Kick|
+|440|EF_ASSUMPTIO2|Assumptio (Animation)|
+|441|EF_BLUECASTING|Comfort Skills Cast Aura|
+|442|EF_RUN|Foot Prints caused by Sprint.|
+|443|EF_STOPRUN|(Nothing)|
+|444|EF_STOPEFFECT|Sprint Stop Animation|
+|445|EF_JUMPBODY|High Jump (Jump)|
+|446|EF_LANDBODY|High Jump (Return Down)|
+|447|EF_FOOT3|Running Left Foot|
+|448|EF_FOOT4|Running Right Foot|
+|449|EF_TAE_READY|KA-Spell (1st Part)|
+|450|EF_GRANDCROSS2|Darkcross|
+|451|EF_SOULSTRIKE2|Dark Strike|
+|452|EF_YUFITEL2|Something Like Jupitel Thunder|
+|453|EF_NPC_STOP|Paralized|
+|454|EF_DARKCASTING|Like Blind|
+|455|EF_GUMGANGNPC|Another Warmth Lightning|
+|456|EF_AGIUP|Power Up|
+|457|EF_JUMPKICK|Flying Side Kick (2nd Part)|
+|458|EF_QUAKEBODY2|Running/Sprint (running into a wall)|
+|459|EF_STORMKICK1|Brown tornado that spins sprite (unused)|
+|460|EF_STORMKICK2|Green tornado (unused)|
+|461|EF_STORMKICK3|Blue tornado (unused)|
+|462|EF_STORMKICK4|Kaupe Dodge Effect|
+|463|EF_STORMKICK5|Kaupe Dodge Effect|
+|464|EF_STORMKICK6|White tornado (unused)|
+|465|EF_STORMKICK7|Purple tornado (unused)|
+|466|EF_SPINEDBODY2|Another Round Kick|
+|467|EF_BEGINASURA1|Warm/Mild Wind (Earth)|
+|468|EF_BEGINASURA2|Warm/Mild Wind (Wind)|
+|469|EF_BEGINASURA3|Warm/Mild Wind (Water)|
+|470|EF_BEGINASURA4|Warm/Mild Wind (Fire)|
+|471|EF_BEGINASURA5|Warm/Mild Wind (Undead)|
+|472|EF_BEGINASURA6|Warm/Mild Wind (Shadow)|
+|473|EF_BEGINASURA7|Warm/Mild Wind (Holy)|
+|474|EF_AURABLADE2|(Nothing)|
+|475|EF_DEVIL1|Demon of The Sun Moon And Stars (Level 1)|
+|476|EF_DEVIL2|Demon of The Sun Moon And Stars (Level 2)|
+|477|EF_DEVIL3|Demon of The Sun Moon And Stars (Level 3)|
+|478|EF_DEVIL4|Demon of The Sun Moon And Stars (Level 4)|
+|479|EF_DEVIL5|Demon of The Sun Moon And Stars (Level 5)|
+|480|EF_DEVIL6|Demon of The Sun Moon And Stars (Level 6)|
+|481|EF_DEVIL7|Demon of The Sun Moon And Stars (Level 7)|
+|482|EF_DEVIL8|Demon of The Sun Moon And Stars (Level 8)|
+|483|EF_DEVIL9|Demon of The Sun Moon And Stars (Level 9)|
+|484|EF_DEVIL10|Demon of The Sun Moon And Stars (Level 10)|
+|485|EF_DOUBLEGUMGANG2|Mental Strength Lightning but White|
+|486|EF_DOUBLEGUMGANG3|Mental Strength Lightning|
+|487|EF_BLACKDEVIL|Demon of The Sun Moon And Stars Ground Effect|
+|488|EF_FLOWERCAST|Comfort Skills|
+|489|EF_FLOWERCAST2|(Nothing)|
+|490|EF_FLOWERCAST3|(Nothing)|
+|491|EF_MOCHI|Element Potions|
+|492|EF_LAMADAN|Cooking Foods|
+|493|EF_EDP|	Enchant Deadly Poison|
+|494|EF_SHIELDBOOMERANG2|Throwing Tomahawk|
+|495|EF_RG_COIN2|Full Strip Sound|
+|496|EF_GUARD2|Preserve|
+|497|EF_SLIM|	Twilight Alchemy 1|
+|498|EF_SLIM2|Twilight Alchemy 2|
+|499|EF_SLIM3|Twilight Alchemy 3|
+|500|EF_CHEMICALBODY|Player Become Blue with Blue Aura|
+|501|EF_CASTSPIN|Chase Walk Animation|
+|502|EF_PIERCEBODY|Player Become Yellow with Yellow Aura|
+|503|EF_SOULLINK|Soul Link Word|
+|504|EF_CHOOKGI2|(Nothing)|
+|505|EF_MEMORIZE|Memorize|
+|506|EF_SOULLIGHT|(Nothing)|
+|507|EF_MAPAE|Authoritative Badge|
+|508|EF_ITEMPOKJUK|Fire Cracker|
+|509|EF_05VAL|Valentine Day Hearth (Wings)|
+|510|EF_BEGINASURA11|Champion Asura Strike|
+|511|EF_NIGHT|(Nothing)|
+|512|EF_CHEMICAL2DASH|Chain Crush Combo|
+|513|EF_GROUNDSAMPLE|Area Cast|
+|514|EF_GI_EXPLOSION|Really Big Circle|
+|515|EF_CLOUD4|Einbroch Fog|
+|516|EF_CLOUD5|Airship Cloud|
+|517|EF_BOTTOM_HERMODE|(Nothing)|
+|518|EF_CARTTER|Cart Termination|
+|519|EF_ITEMFAST|Speed Down Potion|
+|520|EF_SHIELDBOOMERANG3|Shield Bumerang|
+|521|EF_DOUBLECASTBODY|Player Become Red with Red Aura|
+|522|EF_GRAVITATION|Gravitation Field|
+|523|EF_TAROTCARD1|Tarot Card of Fate (The Fool)|
+|524|EF_TAROTCARD2|Tarot Card of Fate (The Magician)|
+|525|EF_TAROTCARD3|Tarot Card of Fate (The High Priestess)|
+|526|EF_TAROTCARD4|Tarot Card of Fate (The Chariot)|
+|527|EF_TAROTCARD5|Tarot Card of Fate (Strength)|
+|528|EF_TAROTCARD6|Tarot Card of Fate (The Lovers)|
+|529|EF_TAROTCARD7|Tarot Card of Fate (The Wheel of Fortune)|
+|530|EF_TAROTCARD8|Tarot Card of Fate (The Hanged Man)|
+|531|EF_TAROTCARD9|Tarot Card of Fate (Death)|
+|532|EF_TAROTCARD10|Tarot Card of Fate (Temperance)|
+|533|EF_TAROTCARD11|Tarot Card of Fate (The Devil)|
+|534|EF_TAROTCARD12|Tarot Card of Fate (The Tower)|
+|535|EF_TAROTCARD13|Tarot Card of Fate (The Star)|
+|536|EF_TAROTCARD14|Tarot Card of Fate (The Sun)|
+|537|EF_ACIDDEMON|Acid Demonstration|
+|538|EF_GREENBODY|Player Become Green with Green Aura|
+|539|EF_THROWITEM4|Throw Random Bottle|
+|540|EF_BABYBODY_BACK|Instant Small->Normal|
+|541|EF_THROWITEM5|(Nothing)|
+|542|EF_BLUEBODY|KA-Spell (1st Part)|
+|543|EF_HATED|Kahii|
+|544|EF_REDLIGHTBODY|Warmth Red Sprite|
+|545|EF_RO2YEAR|Sound And... PUFF Client Crash :P|
+|546|EF_SMA_READY|Kaupe|
+|547|EF_STIN|	Estin|
+|548|EF_RED_HIT|Instant Red Sprite|
+|549|EF_BLUE_HIT|Instant Blue Sprite|
+|550|EF_QUAKEBODY3|Another Effect like Running Hit|
+|551|EF_SMA	|EFfect Like Estun but with Circle|
+|552|EF_SMA2|	(Nothing)|
+|553|EF_STIN2|Esma|
+|554|EF_HITTEXTURE|Large White Cloud|
+|555|EF_STIN3|Estun|
+|556|EF_SMA3|	(Nothing)|
+|557|EF_BLUEFALL|Juperos Energy Waterfall (Horizontal)|
+|558|EF_BLUEFALL_90|Juperos Energy Waterfall (Vertical)|
+|559|EF_FASTBLUEFALL|Juperos Energy Waterfall Fast (Horizontal)|
+|560|EF_FASTBLUEFALL_90|Juperos Energy Waterfall Fast (Vertical)|
+|561|EF_BIG_PORTAL|Juperos Warp|
+|562|EF_BIG_PORTAL2|Juperos Warp|
+|563|EF_SCREEN_QUAKE|Earthquake Effect (Juperos Elevator)|
+|564|EF_HOMUNCASTING|Wedding Cast|
+|565|EF_HFLIMOON1|Filir Moonlight Lvl 1|
+|566|EF_HFLIMOON2|Filir Moonlight Lvl 2|
+|567|EF_HFLIMOON3|Filir Moonlight Lvl 3|
+|568|EF_HO_UP|Another Job Level Up|
+|569|EF_HAMIDEFENCE|Amistr Bulwark|
+|570|EF_HAMICASTLE|Amistr Castling|
+|571|EF_HAMIBLOOD|Amistr Bloodlust|
+|572|EF_HATED2|Warmth Soul|
+|573|EF_TWILIGHT1|Twilight Alchemy 1|
+|574|EF_TWILIGHT2|Twilight Alchemy 2|
+|575|EF_TWILIGHT3|Twilight Alchemy 3|
+|576|EF_ITEM_THUNDER|Box Effect (Thunder)|
+|577|EF_ITEM_CLOUD|Box Effect (Cloud)|
+|578|EF_ITEM_CURSE|Box Effect (Curse)|
+|579|EF_ITEM_ZZZ|Box Effect (Sleep)|
+|580|EF_ITEM_RAIN|Box Effect (Rain)|
+|581|EF_ITEM_LIGHT|Box Effect (Sunlight)|
+|582|EF_ANGEL3|Another Super Novice/Taekwon Angel|
+|583|EF_M01|	Warmth Hit|
+|584|EF_M02|	Full Buster|
+|585|EF_M03|	5 Medium Size Explosion|
+|586|EF_M04|	Somatology Lab Mobs Aura|
+|587|EF_M05|	Big Purple Flame|
+|588|EF_M06|	Little Red Flame|
+|589|EF_M07|	Eswoo|
+|590|EF_KAIZEL|Running Stop|
+|591|EF_KAAHI|(Nothing)|
+|592|EF_CLOUD6|Thanatos Tower Bloody Clouds|
+|593|EF_FOOD01|Food Effect (STR)|
+|594|EF_FOOD02|Food Effect (INT)|
+|595|EF_FOOD03|Food Effect (VIT)|
+|596|EF_FOOD04|Food Effect (AGI)|
+|597|EF_FOOD05|Food Effect (DEX)|
+|598|EF_FOOD06|Food Effect (LUK)|
+|599|EF_SHRINK|Cast Time Sound and Flashing Animation on Player|
+|600|EF_THROWITEM6|Throw Venom Knife|
+|601|EF_SIGHT2|Sight Blaster|
+|602|EF_QUAKEBODY4|Close Confine (Grab Effect)|
+|603|EF_FIREHIT2|Spinning fire ball (like 50, but smaller)|
+|604|EF_NPC_STOP2|Close Confine (Ground Effect)|
+|605|EF_NPC_STOP2_DEL|(Nothing)|
+|606|EF_FVOICE|Pang Voice (Visual Effect)|
+|607|EF_WINK|Wink of Charm (Visual Effect)|
+|608|EF_COOKING_OK|Cooking Success|
+|609|EF_COOKING_FAIL|Cooking Failed|
+|610|EF_TEMP_OK|Success|
+|611|EF_TEMP_FAIL|Failed|
+|612|EF_HAPGYEOK|Korean Words and /no1 Emoticon|
+|613|EF_THROWITEM7|Throw Shuriken|
+|614|EF_THROWITEM8|Throw Kunai|
+|615|EF_THROWITEM9|Throw Fumma Shuriken|
+|616|EF_THROWITEM10|Throw Money|
+|617|EF_BUNSINJYUTSU|Illusionary Shadow|
+|618|EF_KOUENKA|Crimson Fire Bolossom|
+|619|EF_HYOUSENSOU|Lightning Spear Of Ice|
+|620|EF_BOTTOM_SUITON|Water Escape Technique|
+|621|EF_STIN4|Wind Blade|
+|622|EF_THUNDERSTORM2|Lightning Crash|
+|623|EF_CHEMICAL4|Piercing Shot|
+|624|EF_STIN5|Kamaitachi|
+|625|EF_MADNESS_BLUE|Madness Canceller|
+|626|EF_MADNESS_RED|Adjustment|
+|627|EF_RG_COIN3|Disarm (Sound Effect)|
+|628|EF_BASH3D5|Dust|
+|629|EF_CHOOKGI3|(Nothing)|
+|630|EF_KIRIKAGE|Shadow Slash|
+|631|EF_TATAMI|Reverse Tatami Map Unit|
+|632|EF_KASUMIKIRI|Mist Slash|
+|633|EF_ISSEN|Final Strike|
+|634|EF_KAEN|	Crimson Fire Formation|
+|635|EF_BAKU|	Dragon Fire Formation|
+|636|EF_HYOUSYOURAKU|Falling Ice Pillar|
+|637|EF_DESPERADO|Desperado|
+|638|EF_LIGHTNING_S|Ground Drift Grenade|
+|639|EF_BLIND_S|Ground Drift Grenade|
+|640|EF_POISON_S|Ground Drift Grenade|
+|641|EF_FREEZING_S|Ground Drift Grenade|
+|642|EF_FLARE_S|Ground Drift Grenade|
+|643|EF_RAPIDSHOWER|Rapid Shower|
+|644|EF_MAGICALBULLET|Magic Bullet|
+|645|EF_SPREADATTACK|Spread Attack|
+|646|EF_TRACKCASTING|Tracking (Shown While Casting)|
+|647|EF_TRACKING|Tracking|
+|648|EF_TRIPLEACTION|Triple Action|
+|649|EF_BULLSEYE|Bull's Eye|
+|650|EF_MAP_MAGICZONE|Ice Cave Level 4 Circle|
+|651|EF_MAP_MAGICZONE2|Ice Cave Level 4 Big Circle|
+|652|EF_DAMAGE1|Like Regeneration Number but Red with a Sound|
+|653|EF_DAMAGE1_2|Like Regeneration Number but Red|
+|654|EF_DAMAGE1_3|Like Regeneration Number but Purple|
+|655|EF_UNDEADBODY|Mobs Skill (Change Undead Element)|
+|656|EF_UNDEADBODY_DEL|Last animation before Change Undead Element finish|
+|657|EF_GREEN_NUMBER|(Nothing)|
+|658|EF_BLUE_NUMBER|(Nothing)|
+|659|EF_RED_NUMBER|(Nothing)|
+|660|EF_PURPLE_NUMBER|(Nothing)|
+|661|EF_BLACK_NUMBER|(Nothing)|
+|662|EF_WHITE_NUMBER|(Nothing)|
+|663|EF_YELLOW_NUMBER|(Nothing)|
+|664|EF_PINK_NUMBER|(Nothing)|
+|665|EF_BUBBLE_DROP|Little Blue Ball Falling From the Sky|
+|666|EF_NPC_EARTHQUAKE|Earthquake|
+|667|EF_DA_SPACE|(Nothing)|
+|668|EF_DRAGONFEAR|Dragonfear|
+|669|EF_BLEEDING|Wide Bleeding|
+|670|EF_WIDECONFUSE|Dragon fear (Visual Effect)|
+|671|EF_BOTTOM_RUNNER|The Japan Earth Symbol (like 'Seven Wind Lv1', but on the ground)|
+|672|EF_BOTTOM_TRANSFER|The Japan Wind Symbol (like 'Seven Wind Lv2', but on the ground)|
+|673|EF_CRYSTAL_BLUE|Map turns Blue (like Soul Link)|
+|674|EF_BOTTOM_EVILLAND|Evil Land Cell|
+|675|EF_GUARD3|Like Parrying/Kyrie Eleison barrier but Yellow with small Cross in every barrier piece|
+|676|EF_NPC_SLOWCAST|Slow Casting|
+|677|EF_CRITICALWOUND|Critical Wounds/Bleeding Attack|
+|678|EF_GREEN99_3|White 99 Aura Bubbles|
+|679|EF_GREEN99_5|Green Aura (Middle)|
+|680|EF_GREEN99_6|Green Aura (Bottom)|
+|681|EF_MAPSPHERE|Dimensional Gorge Map Effect|
+|682|EF_POK_LOVE|I Love You Banner|
+|683|EF_POK_WHITE|Happy White Day Banner|
+|684|EF_POK_VALEN|Happy Valentine Day Banner|
+|685|EF_POK_BIRTH|Happy Birthday Banner|
+|686|EF_POK_CHRISTMAS|Merry Christmas Banner|
+|687|EF_MAP_MAGICZONE3|Cast Circle-Like effect 1|
+|688|EF_MAP_MAGICZONE4|Cast Circle-Like effect 2|
+|689|EF_DUST|Endless Tower Map Effect|
+|690|EF_TORCH_RED|Burning Flame (Red)|
+|691|EF_TORCH_GREEN|Burning Flame (Green)|
+|692|EF_MAP_GHOST|Unknown Aura Bubbles (Small ghosts)|
+|693|EF_GLOW1|Translucent yellow circle|
+|694|EF_GLOW2|Translucent green circle|
+|695|EF_GLOW4|Rotating green light|
+|696|EF_TORCH_PURPLE|The same of 690 and 691 but Blue/Purple|
+|697|EF_CLOUD7|(Nothing)|
+|698|EF_CLOUD8|(Nothing)|
+|699|EF_FLOWERLEAF|Fall of powder from the sky and raise of some leaf|
+|700|EF_MAPSPHERE2|Big Colored Green Sphere.|
+|701|EF_GLOW11|Huge Blue Sphere|
+|702|EF_GLOW12|Little Colored Violet Sphere|
+|703|EF_CIRCLELIGHT|Light Infiltration with fall of pownder|
+|704|EF_ITEM315|Client Error (mobile_ef02.str)|
+|705|EF_ITEM316|Client Error (mobile_ef01.str)|
+|706|EF_ITEM317|Client Error (mobile_ef03.str)|
+|707|EF_ITEM318|Client Crash :P|
+|708|EF_STORM_MIN|Storm Gust (same as 89)|
+|709|EF_POK_JAP|A Firework that split in 4 mini fireworks|
+|710|EF_MAP_GREENLIGHT|A Sphere like Effect 701 but Green, and a bit more larger|
+|711|EF_MAP_MAGICWALL|A big violet wall|
+|712|EF_MAP_GREENLIGHT2|A Little Flame Sphere|
+|713|EF_YELLOWFLY1|A lot of Very Small and Yellow Sphere|
+|714|EF_YELLOWFLY2|(Nothing)|
+|715|EF_BOTTOM_BLUE|Little blue Basilica|
+|716|EF_BOTTOM_BLUE2|Same as 715|
+|717|EF_WEWISH|Christmas Carol (copy of Angelus)|
+|718|EF_FIREPILLARON2|Judex (Visual Effect)|
+|719|EF_FORESTLIGHT5|Renovatio (light beam)|
+|720|EF_SOULBREAKER3|Yellow version of Soul Breaker|
+|721|EF_ADO_STR|Adoramus (lightning bolt)|
+|722|EF_IGN_STR|Ignition Break (big explosion)|
+|723|EF_CHIMTO2|Hundred Spear (sound effect)|
+|724|EF_WINDCUTTER|Green version of Detecting|
+|725|EF_DETECT2|Oratorio (like Detecting)|
+|726|EF_FROSTMYSTY|Frost Misty (blue vapor and bubbles)|
+|727|EF_CRIMSON_STR|Crimson Rock|
+|728|EF_HELL_STR|Small fire (part of Hell Inferno)|
+|729|EF_SPR_MASH|Marsh of Abyss (like Close Confine)|
+|730|EF_SPR_SOULE|Small, cartoony explosion (part of Soul Expansion)|
+|731|EF_DHOWL_STR|Dragon Howling (blinking, expanding circle)|
+|732|EF_EARTHWALL|Spike from the ground|
+|733|EF_SOULBREAKER4|Fluffy Ball flying by|
+|734|EF_CHAINL_STR|Chain Lightning|
+|735|EF_CHOOKGI_FIRE|(Nothing)|
+|736|EF_CHOOKGI_WIND|(Nothing)|
+|737|EF_CHOOKGI_WATER|(Nothing)|
+|738|EF_CHOOKGI_GROUND|(Nothing)|
+|739|EF_MAGENTA_TRAP|Old Magenta Trap|
+|740|EF_COBALT_TRAP|Old Cobald Trap|
+|741|EF_MAIZE_TRAP|Old Maize Trap|
+|742|EF_VERDURE_TRAP|Old Verdure Trap|
+|743|EF_NORMAL_TRAP|White Ranger Trap|
+|744|EF_CLOAKING2|Camouflage|
+|745|EF_AIMED_STR|Aimed Bolt (crosshairs)|
+|746|EF_ARROWSTORM_STR|Arrow Storm|
+|747|EF_LAULAMUS_STR|Falling white feathers|
+|748|EF_LAUAGNUS_STR|Falling blue feathers|
+|749|EF_MILSHIELD_STR|Millennium Shield|
+|750|EF_CONCENTRATION2|Detonator (blue sparkles)|
+|751|EF_FIREBALL2|Releasing summoned warlock spheres|
+|752|EF_BUNSINJYUTSU2|Like Energy Coat, but not as dark|
+|753|EF_CLEARTIME|Clearance|
+|754|EF_GLASSWALL3|Green warp portal (root of Epiclesis)|
+|755|EF_ORATIO|Oratio (spinning blue symbol)|
+|756|EF_POTION_BERSERK2|Enchant Blade (like Berserk Potion)|
+|757|EF_CIRCLEPOWER|Third Class Aura (Middle)|
+|758|EF_ROLLING1|Rolling Cutter - Spin Count 1|
+|759|EF_ROLLING2|Rolling Cutter - Spin Count 2|
+|760|EF_ROLLING3|Rolling Cutter - Spin Count 3|
+|761|EF_ROLLING4|Rolling Cutter - Spin Count 4|
+|762|EF_ROLLING5|Rolling Cutter - Spin Count 5|
+|763|EF_ROLLING6|Rolling Cutter - Spin Count 6|
+|764|EF_ROLLING7|Rolling Cutter - Spin Count 7|
+|765|EF_ROLLING8|Rolling Cutter - Spin Count 8|
+|766|EF_ROLLING9|Rolling Cutter - Spin Count 9|
+|767|EF_ROLLING10|Rolling Cutter - Spin Count 10|
+|768|EF_PURPLEBODY|Blinking|
+|769|EF_STIN6|Cross Ripper Slasher (flying knives)|
+|770|EF_RG_COIN4|Strip sound|
+|771|EF_POISONWAV|Poison sound|
+|772|EF_POISONSMOKE|Poison particles|
+|773|EF_GUMGANG4|Expanding purple aura (part of Phantom Menace)|
+|774|EF_SHIELDBOOMERANG4|Axe Boomerang|
+|775|EF_CASTSPIN2|Spinning character sprite|
+|776|EF_VULCANWAV|Like Desperado sound effect|
+|777|EF_AGIUP2|Faded light from the ground [S]|
+|778|EF_DETECT3|Expanding white aura (like Clearance)|
+|779|EF_AGIUP3|Faded light from the ground [S]|
+|780|EF_DETECT4|Expanding red aura (from Infrared Scan)|
+|781|EF_ELECTRIC3|Magnetic Field (purple chains)|
+|782|EF_GUARD4|All-around shield [S]|
+|783|EF_BOTTOM_BARRIER|Yellow shaft of light|
+|784|EF_BOTTOM_STEALTH|White shaft of light|
+|785|EF_REPAIRTIME|Upward flying wrenches|
+|786|EF_NC_ANAL|Symbol with bleeping sound [S]|
+|787|EF_FIRETHROW|Flare Launcher (line of fire)|
+|788|EF_VENOMIMPRESS|Venom Impress (green skull)|
+|789|EF_FROSTMISTY|Freezing Status Effect (two ancillas)|
+|790|EF_BURNING|Burning Status Effect (flame symbol)|
+|791|EF_COLDTHROW|Two ice shots|
+|792|EF_MAKEHALLU|Upward streaming white particles|
+|793|EF_HALLUTIME|Same, but more brief|
+|794|EF_INFRAREDSCAN|Infrared Scan (red lasers)|
+|795|EF_CRASHAXE|Power Swing (axe crash)|
+|796|EF_GTHUNDER|Spinning blue triangles|
+|797|EF_STONERING|Stapo|
+|798|EF_INTIMIDATE2|Red triangles (like Intimidate)|
+|799|EF_STASIS|Stasis (expanding blue mist) [S]|
+|800|EF_REDLINE|Hell Inferno (red lights)|
+|801|EF_FROSTDIVER3|Jack Frost unit (ice spikes)|
+|802|EF_BOTTOM_BASILICA2|White Imprison|
+|803|EF_RECOGNIZED|Recognized Spell|
+|804|EF_TETRA|Tetra Vortex [S]|
+|805|EF_TETRACASTING|Tetra Vortex cast animation (blinking colors)|
+|806|EF_FIREBALL3|Flying by as fast as a rocket|
+|807|EF_INTIMIDATE3|Kidnapping sound|
+|808|EF_RECOGNIZED2|Like Recognized Spell, but one symbol|
+|809|EF_CLOAKING3|Shadowy filter [S]|
+|810|EF_INTIMIDATE4|Damp thud sound [S]|
+|811|EF_STRETCH|Body Painting|
+|812|EF_BLACKBODY|Black expanding aura|
+|813|EF_ENERVATION|Masquerade - Enervation|
+|814|EF_ENERVATION2|Masquerade - Groomy|
+|815|EF_ENERVATION3|Masquerade - Ignorance|
+|816|EF_ENERVATION4|Masquerade - Laziness|
+|817|EF_ENERVATION5|Masquerade - Unlucky|
+|818|EF_ENERVATION6|Masquerade - Weakness|
+|819|EF_LINELINK4|(Nothing)|
+|820|EF_RG_COIN5|Strip Accessory|
+|821|EF_WATERFALL_ANI|Waterfall|
+|822|EF_BOTTOM_MANHOLE|Dimension Door (spinning blue aura)|
+|823|EF_MANHOLE|In-the-manhole effect|
+|824|EF_MAKEFEINT|Some filter|
+|825|EF_FORESTLIGHT6|Dimension Door (aura + blue light)|
+|826|EF_DARKCASTING2|Expanding black casting anim.|
+|827|EF_BOTTOM_ANI|Chaos Panic (spinning brown aura)|
+|828|EF_BOTTOM_MAELSTROM|Maelstrom (spinning pink aura)|
+|829|EF_BOTTOM_BLOODYLUST|Bloody Lust (spinning red aura)|
+|830|EF_BEGINSPELL_N1|Blue aura (Arch Bishop cast animation)|
+|831|EF_BEGINSPELL_N2|Blue cone [S]|
+|832|EF_HEAL_N|Sonic Wave|
+|833|EF_CHOOKGI_N|(Nothing)|
+|834|EF_JOBLVUP50_2|Light shooting away circlish|
+|835|EF_CHEMICAL2DASH2|Fastness yellow-reddish|
+|836|EF_CHEMICAL2DASH3|Fastness yellow-pinkish|
+|837|EF_ROLLINGCAST|Casting [S]|
+|838|EF_WATER_BELOW|Watery aura|
+|839|EF_WATER_FADE|[Client Error]|
+|840|EF_BEGINSPELL_N3|Red cone|
+|841|EF_BEGINSPELL_N4|Green cone|
+|842|EF_BEGINSPELL_N5|Yellow cone|
+|843|EF_BEGINSPELL_N6|White cone|
+|844|EF_BEGINSPELL_N7|Purple cone|
+|845|EF_BEGINSPELL_N8|light-bluish turquoise cone|
+|846|EF_WATER_SMOKE|(Nothing)|
+|847|EF_DANCE1|Gloomy Day (white/red light rays)|
+|848|EF_DANCE2|Gloomy Day (white/blue light rays)|
+|849|EF_LINKPARTICLE|(Nothing)|
+|850|EF_SOULLIGHT2|(Nothing)|
+|851|EF_SPR_PARTICLE|Green mushy-foggy stuff (dull)|
+|852|EF_SPR_PARTICLE2|Green mushy-foggy stuff (bright)|
+|853|EF_SPR_PLANT|Bright green flower area|
+|854|EF_CHEMICAL_V|Blue beam of light with notes|
+|855|EF_SHOOTPARTICLE|(Nothing)|
+|856|EF_BOT_REVERB|Reverberation (red eighth notes)|
+|857|EF_RAIN_PARTICLE|Severe Rainstorm (falling red and blue beams)|
+|858|EF_CHEMICAL_V2|Deep Sleep Lullaby (two red beams and music notes)|
+|859|EF_SECRA|Holograph of text (blue)|
+|860|EF_BOT_REVERB2|Distorted note (blue)|
+|861|EF_CIRCLEPOWER2|Green aura (from Circle of Life's Melody)|
+|862|EF_SECRA2|Randomize Spell (holograph of text)|
+|863|EF_CHEMICAL_V3|Dominion Impulse (two spears of light)|
+|864|EF_ENERVATION7|Gloomy Day (colorful lines)|
+|865|EF_CIRCLEPOWER3|Blue aura (from Song of Mana)|
+|866|EF_SPR_PLANT2|Dance with a Warg (Wargs)|
+|867|EF_CIRCLEPOWER4|Yellow aura (from Dance with a Warg)|
+|868|EF_SPR_PLANT3|Song of Mana (Violies)|
+|869|EF_RG_COIN6|Strip sound [S]|
+|870|EF_SPR_PLANT4|Ghostly Succubuses of fire|
+|871|EF_CIRCLEPOWER5|Red aura (from Lerad's Dew)|
+|872|EF_SPR_PLANT5|Lerad's Dew (Minerals)|
+|873|EF_CIRCLEPOWER6|Stargate-wormhole stuff (bright purple)|
+|874|EF_SPR_PLANT6|Melody of Sink (Ktullanuxes)|
+|875|EF_CIRCLEPOWER7|Stargate-wormhole stuff (bright turquoise)|
+|876|EF_SPR_PLANT7|Warcry of Beyond (Garms)|
+|877|EF_CIRCLEPOWER8|Stargate-wormhole stuff (white)|
+|878|EF_SPR_PLANT8|Unlimited Humming Voice (Miyabi Ningyos)|
+|879|EF_HEARTASURA|Siren's Voice (heart-like)|
+|880|EF_BEGINSPELL_150|Bluish castish cone|
+|881|EF_LEVEL99_150|Blue aura|
+|882|EF_PRIMECHARGE|Whirl of fireflies (red)|
+|883|EF_GLASSWALL4|Epiclesis (transparent green tree)|
+|884|EF_GRADIUS_LASER|Green beam|
+|885|EF_BASH3D6|Blue light beams|
+|886|EF_GUMGANG5|Blue castish cone|
+|887|EF_HITLINE8|Wavy sparks|
+|888|EF_ELECTRIC4|Earth Shaker (same as 432)|
+|889|EF_TEIHIT1T|Fast light beams|
+|890|EF_SPINMOVE|Rotation|
+|891|EF_FIREBALL4|Magic shots [S]|
+|892|EF_TRIPLEATTACK4|Fastness with hitting sound[S]|
+|893|EF_CHEMICAL3S|Blue-white light passing by|
+|894|EF_GROUNDSHAKE|(Nothing)|
+|895|EF_DQ9_CHARGE|Big wheel of flat light beams|
+|896|EF_DQ9_CHARGE2|Still sun shaped lightning aura|
+|897|EF_DQ9_CHARGE3|Animated sun shaped lightning aura|
+|898|EF_DQ9_CHARGE4|Animated, curvy sun shaped lightning aura|
+|899|EF_BLUELINE|White/red light shots from below|
+|900|EF_SELFSCROLL|Animated, slow curvy sun shaped lightning aura|
+|901|EF_SPR_LIGHTPRINT|Explosion|
+|902|EF_PNG_TEST|Floating bedtable texture|
+|903|EF_BEGINSPELL_YB|	Castish flamey cone|
+|904|EF_CHEMICAL2DASH4|	Yellow/pink lights passing by|
+|905|EF_GROUNDSHAKE2|Expanding circle|
+|906|EF_PRESSURE2|Shield Press (falling shield)|
+|907|EF_RG_COIN7|Chainy, metalish sound [S]|
+|908|EF_PRIMECHARGE2|Prestige (sphere of yellow particles)|
+|909|EF_PRIMECHARGE3|Banding (sphere of red particles)|
+|910|EF_PRIMECHARGE4|Inspiration (sphere of blue particles)|
+|911|EF_GREENCASTING|Green castish animation [S]|
+|912|EF_WALLOFTHORN|Wall of Thorns unit (green fog cloud)|
+|913|EF_FIREBALL5|Magic projectiles|
+|914|EF_THROWITEM11|(Nothing)|
+|915|EF_SPR_PLANT9|Crazy Weed|
+|916|EF_DEMONICFIRE|Demonic Fire|
+|917|EF_DEMONICFIRE2|More angry, demonic flames|
+|918|EF_DEMONICFIRE3|Fire Insignia (demonic flames)|
+|919|EF_HELLSPLANT|Hell's Plant (green snapping plant)|
+|920|EF_FIREWALL2|Fire Walk unit|
+|921|EF_VACUUM|Vacuum Extreme (whirlwind)|
+|922|EF_SPR_PLANT10|Psychic Wave|
+|923|EF_SPR_LIGHTPRINT2|Poison Buster|
+|924|EF_POISONSMOKE2|Poisoning animation|
+|925|EF_MAKEHALLU2|Some filter|
+|926|EF_SHOCKWAVE2|Electric Walk unit|
+|927|EF_SPR_PLANT11|Earth Grave (speary roots)|
+|928|EF_COLDTHROW2|Ice cloud projectiles|
+|929|EF_DEMONICFIRE4|Warmer (field of flames)|
+|930|EF_PRESSURE3|Varetyr Spear (falling spear)|
+|931|EF_LINKPARTICLE2|	(Nothing)|
+|932|EF_SOULLIGHT3|Firefly|
+|933|EF_CHAREFFECT|[Client Crash]|
+|934|EF_GUMGANG6|White, castishly expanding cone|
+|935|EF_FIREBALL6|Green magic projectile|
+|936|EF_GUMGANG7|Red, castishly expanding cone|
+|937|EF_GUMGANG8|Yellow, castishly expanding cone|
+|938|EF_GUMGANG9|Dark-red, castishly expanding cone|
+|939|EF_BOTTOM_DE2|Blue, conish aura|
+|940|EF_COLDSTATUS|Snow flake|
+|941|EF_SPR_LIGHTPRINT3|Explosion of red, demonic fire|
+|942|EF_WATERBALL3|Expanding, white dome|
+|943|EF_HEAL_N2|Green, fluffy projectile|
+|944|EF_RAIN_PARTICLE2|Falling gems|
+|945|EF_CLOUD9|(Nothing)|
+|946|EF_YELLOWFLY3|Floating lights|
+|947|EF_EL_GUST|Blue lightning sphere|
+|948|EF_EL_BLAST|Two blue lightning spheres|
+|949|EF_EL_AQUAPLAY|Flat, spinning diamond|
+|950|EF_EL_UPHEAVAL|Circling, planetlike spheres|
+|951|EF_EL_WILD_STORM|	Three lightning spheres|
+|952|EF_EL_CHILLY_AIR|	Flat, spinning gem and two lightning spheres|
+|953|EF_EL_CURSED_SOIL|	Spinning, planetlike spheres|
+|954|EF_EL_COOLER|Two lightblue glowing spheres|
+|955|EF_EL_TROPIC|Three spinning flame spheres|
+|956|EF_EL_PYROTECHNIC|	Flame|
+|957|EF_EL_PETROLOGY|Spinning planetlike sphere|
+|958|EF_EL_HEATER|Two flames|
+|959|EF_POISON_MIST|Purple flame|
+|960|EF_ERASER_CUTTER|	Small yellow explosion|
+|961|EF_SILENT_BREEZE|	Cartoony whirlwind|
+|962|EF_MAGMA_FLOW|Rising fire|
+|963|EF_GRAYBODY|Dark filter (like Stone Curse)|
+|964|EF_LAVA_SLIDE|Same as 920|
+|965|EF_SONIC_CLAW|Small white explosion|
+|966|EF_TINDER_BREAKER|	Bone crack|
+|967|EF_MIDNIGHT_FRENZY|	Another little explosion|

doc/effect_list.txt

@@ -1,987 +0,0 @@
-//===== rAthena Documentation ================================
-//= Client Effects List
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Current Version: =====================================
-//= 20231007
-//===== Description: =========================================
-//= A list of client-side effects sorted by ID.
-//============================================================
-
-The following is a compiled list of visual and sound effects which the client
-can produce when receiving a packet with id 0x1f3 (01f3 <ID>.l <type>.l).
-Each list entry contains a number and a short description of the effect.
-You can produce these effects ingame by doing "@effect <number>".
-It's also possible to attach effects to item/npc scripts by using
-'specialeffect/specialeffect2'.
-
-Number	Constant		Description
-------	--------		-----------
-0.	EF_HIT1			Regular Hit
-1.	EF_HIT2			Bash
-2.	EF_HIT3			Melee Skill Hit
-3.	EF_HIT4			Melee Skill Hit
-4.	EF_HIT5			Melee Skill Hit
-5.	EF_HIT6			Melee Skill Hit
-6.	EF_ENTRY		Being Warped
-7.	EF_EXIT			Item Heal effect
-8.	EF_WARP			Yellow Ripple Effect
-9.	EF_ENHANCE		Different Type of Heal
-10.	EF_COIN			Mammonite
-11.	EF_ENDURE		Endure
-12.	EF_BEGINSPELL		Yellow cast aura
-13.	EF_GLASSWALL		Blue Box
-14.	EF_HEALSP		Blue restoring effect
-15.	EF_SOULSTRIKE		Soul Strike
-16.	EF_BASH			Hide
-17.	EF_MAGNUMBREAK		Magnum Break
-18.	EF_STEAL		Steal
-19.	EF_HIDING		(Invalid)
-20.	EF_PATTACK		Envenom/Poison
-21.	EF_DETOXICATION		Detoxify
-22.	EF_SIGHT		Sight
-23.	EF_STONECURSE		Stone Curse
-24.	EF_FIREBALL		Fire Ball
-25.	EF_FIREWALL		Fire Wall
-26.	EF_ICEARROW		A sound (a swipe?)
-27.	EF_FROSTDIVER		Frost Diver (Traveling to Target)
-28.	EF_FROSTDIVER2		Frost Diver (Hitting)
-29.	EF_LIGHTBOLT		Lightning Bolt
-30.	EF_THUNDERSTORM		Thunder Storm
-31.	EF_FIREARROW		Weird bubbles launching from feet
-32.	EF_NAPALMBEAT		Small clustered explosions
-33.	EF_RUWACH		Ruwach
-34.	EF_TELEPORTATION	Old Map Exit Animation (unused)
-35.	EF_READYPORTAL		Old Warp Portal (unused)
-36.	EF_PORTAL		Old Warp Portal (unused)
-37.	EF_INCAGILITY		AGI Up
-38.	EF_DECAGILITY		AGI Down
-39.	EF_AQUA	Aqua Benedicta
-40.	EF_SIGNUM		Signum Crucis
-41.	EF_ANGELUS		Angelus
-42.	EF_BLESSING		Blessing
-43.	EF_INCAGIDEX		Dex + Agi Up
-44.	EF_SMOKE		Little Fog Smoke.
-45.	EF_FIREFLY		Faint Little Ball Things.
-46.	EF_SANDWIND		Sand Wind
-47.	EF_TORCH		Torch
-48.	EF_SPRAYPOND		Small Piece of Glass
-49.	EF_FIREHIT		Firebolt/Wall Hits
-50.	EF_FIRESPLASHHIT	Spinning Fire Thing
-51.	EF_COLDHIT		Ice Elemental Hit
-52.	EF_WINDHIT		Wind Elemental Hit
-53.	EF_POISONHIT		Puff of Purpulish Smoke?
-54.	EF_BEGINSPELL2		Cast Initiation Aura (Water Element)
-55.	EF_BEGINSPELL3		Cast Initiation Aura (Fire Element)
-56.	EF_BEGINSPELL4		Cast Initiation Aura (Earth Element)
-57.	EF_BEGINSPELL5		Cast Initiation Aura (Wind Element)
-58.	EF_BEGINSPELL6		Cast Initiation Aura (Holy Element)
-59.	EF_BEGINSPELL7		Cast Initiation Aura (Poison Element)
-60.	EF_LOCKON		Cast target circle
-61.	EF_WARPZONE		Old Warp Portal (NPC Warp, unused)
-62.	EF_SIGHTRASHER		Sight Trasher
-63.	EF_BARRIER		Moonlight Sphere
-64.	EF_ARROWSHOT		Something Like Puruple/Yellow Light Bullet
-65.	EF_INVENOM		Something Like Absorb of Power
-66.	EF_CURE			Cure
-67.	EF_PROVOKE		Provoke
-68.	EF_MVP			MVP Banner
-69.	EF_SKIDTRAP		Skid Trap
-70.	EF_BRANDISHSPEAR	Brandish Spear
-71.	EF_CONE	Spiral White balls
-72.	EF_SPHERE		Bigger Spiral White balls
-73.	EF_BOWLINGBASH		Blue/White Small Aura
-74.	EF_ICEWALL		Ice Wall
-75.	EF_GLORIA		Gloria
-76.	EF_MAGNIFICAT		Magnificat
-77.	EF_RESURRECTION		Resurrection
-78.	EF_RECOVERY		Status Recovery
-79.	EF_EARTHSPIKE		Earth Spike
-80.	EF_SPEARBMR		Spear Boomerang
-81.	EF_PIERCE		Skill hit
-82.	EF_TURNUNDEAD		Turn Undead
-83.	EF_SANCTUARY		Sanctuary
-84.	EF_IMPOSITIO		Impositio Manus
-85.	EF_LEXAETERNA		Lex Aeterna
-86.	EF_ASPERSIO		Aspersio
-87.	EF_LEXDIVINA		Lex Divina
-88.	EF_SUFFRAGIUM		Suffragium
-89.	EF_STORMGUST		Storm Gust
-90.	EF_LORD			Lord of Vermilion
-91.	EF_BENEDICTIO		B. S. Sacramenti
-92.	EF_METEORSTORM		Meteor Storm
-93.	EF_YUFITEL		Jupitel Thunder (Ball)
-94.	EF_YUFITELHIT		Jupitel Thunder (Hit)
-95.	EF_QUAGMIRE		Quagmire
-96.	EF_FIREPILLAR		Fire Pillar
-97.	EF_FIREPILLARBOMB	Fire Pillar/Land Mine hit
-98.	EF_HASTEUP		Adrenaline Rush
-99.	EF_FLASHER		Flasher Trap
-100.	EF_REMOVETRAP		Yellow ball fountain
-101.	EF_REPAIRWEAPON		Weapon Repair
-102.	EF_CRASHEARTH		Hammerfall
-103.	EF_PERFECTION		Weapon Perfection
-104.	EF_MAXPOWER		Maximize Power
-105.	EF_BLASTMINE		(nothing)
-106.	EF_BLASTMINEBOMB	Blast Mine Trap
-107.	EF_CLAYMORE		Claymore Trap
-108.	EF_FREEZING		Freezing Trap
-109.	EF_BUBBLE		Bailaban Blue bubble Map Effect
-110.	EF_GASPUSH		Trap Used by Giearth
-111.	EF_SPRINGTRAP		Spring Trap
-112.	EF_KYRIE		Kyrie Eleison
-113.	EF_MAGNUS		Magnus Exorcismus
-114.	EF_BOTTOM		Old Magnus Exorcismus Map Unit (unused)
-115.	EF_BLITZBEAT		Blitz Beat
-116.	EF_WATERBALL		Fling Watersphere
-117.	EF_WATERBALL2		Waterball
-118.	EF_FIREIVY		Fling Firesphere
-119.	EF_DETECTING		Detect
-120.	EF_CLOAKING		Cloaking
-121.	EF_SONICBLOW		Sonic Blow (Part 1/2)
-122.	EF_SONICBLOWHIT		Multi hit effect
-123.	EF_GRIMTOOTH		Grimtooth Cast
-124.	EF_VENOMDUST		Venom Dust
-125.	EF_ENCHANTPOISON	Enchant Poison
-126.	EF_POISONREACT		Poison React
-127.	EF_POISONREACT2		Small Posion React
-128.	EF_OVERTHRUST		Over Thrust
-129.	EF_SPLASHER		Venom Splasher Explosion
-130.	EF_TWOHANDQUICKEN	Two-Hand Quicken
-131.	EF_AUTOCOUNTER		Auto-Counter Hit
-132.	EF_GRIMTOOTHATK		Grimtooth Hit
-133.	EF_FREEZE		Ice Effect (Used by NPCs)
-134.	EF_FREEZED		Ice Effect (Used by NPCs)
-135.	EF_ICECRASH		Ice Effect (Used by NPCs)
-136.	EF_SLOWPOISON		Slow Poison
-137.	EF_BOTTOM2		Old Sanctuary Map Unit (unused)
-138.	EF_FIREPILLARON		Fire pillar
-139.	EF_SANDMAN		Sandman Trap
-140.	EF_REVIVE		Ressurection Aura
-141.	EF_PNEUMA		Pneuma
-142.	EF_HEAVENSDRIVE		Heaven's Drive
-143.	EF_SONICBLOW2		Sonic Blow (Part 2/2)
-144.	EF_BRANDISH2		Brandish Spear Pre-Hit Effect
-145.	EF_SHOCKWAVE		Shockwave Trap
-146.	EF_SHOCKWAVEHIT		Shockwave Trap Hit
-147.	EF_EARTHHIT		Pierce Hit
-148.	EF_PIERCESELF		Pierce Cast Animation
-149.	EF_BOWLINGSELF		Bowling Bash
-150.	EF_SPEARSTABSELF	Pierce Cast Animation
-151.	EF_SPEARBMRSELF		Spear Boomerang Cast
-152.	EF_HOLYHIT		Turn Undead
-153.	EF_CONCENTRATION	Increase Concentration
-154.	EF_REFINEOK		Refine Success
-155.	EF_REFINEFAIL		Refine Fail
-156.	EF_JOBCHANGE		jobchange.str not found error
-157.	EF_LVUP			levelup.str not found error
-158.	EF_JOBLVUP		Job Level Up
-159.	EF_TOPRANK		PvP circle
-160.	EF_PARTY		PvP Party Circle
-161.	EF_RAIN			(Nothing)
-162.	EF_SNOW			Snow
-163.	EF_SAKURA		White Sakura Leaves
-164.	EF_STATUS_STATE		(Nothing)
-165.	EF_BANJJAKII		Comodo Fireworks Ball
-166.	EF_MAKEBLUR		Energy Coat (Visual Effect)
-167.	EF_TAMINGSUCCESS	(Nothing)
-168.	EF_TAMINGFAILED		(Nothing)
-169.	EF_ENERGYCOAT		Energy Coat Animation
-170.	EF_CARTREVOLUTION	Cart Revolution
-171.	EF_VENOMDUST2		Venom Dust Map Unit
-172.	EF_CHANGEDARK		Change Element (Dark)
-173.	EF_CHANGEFIRE		Change Element (Fire)
-174.	EF_CHANGECOLD		Change Element (Water)
-175.	EF_CHANGEWIND		Change Element (Wind)
-176.	EF_CHANGEFLAME		Change Element (Fire)
-177.	EF_CHANGEEARTH		Change Element (Earth)
-178.	EF_CHAINGEHOLY		Change Element (Holy)
-179.	EF_CHANGEPOISON		Change Element (Poison)
-180.	EF_HITDARK		Darkness Attack
-181.	EF_MENTALBREAK		Mental Breaker
-182.	EF_MAGICALATTHIT	Magical Hit
-183.	EF_SUI_EXPLOSION	Self Destruction
-184.	EF_DARKATTACK		(Nothing)
-185.	EF_SUICIDE		(Nothing)
-186.	EF_COMBOATTACK1		Combo Attack 1
-187.	EF_COMBOATTACK2		Combo Attack 2
-188.	EF_COMBOATTACK3		Combo Attack 3
-189.	EF_COMBOATTACK4		Combo Attack 4
-190.	EF_COMBOATTACK5		Combo Attack 5
-191.	EF_GUIDEDATTACK		Guided Attack
-192.	EF_POISONATTACK		Poison Attack
-193.	EF_SILENCEATTACK	Silence Attack
-194.	EF_STUNATTACK		Stun Attack
-195.	EF_PETRIFYATTACK	Petrify Attack
-196.	EF_CURSEATTACK		Curse Attack
-197.	EF_SLEEPATTACK		Sleep Attack
-198.	EF_TELEKHIT		(Nothing)
-199.	EF_PONG			Small Popping Bubble Map Effect
-200.	EF_LEVEL99		Normal level 99 Aura (Middle)
-201.	EF_LEVEL99_2		Normal level 99 Aura (Bottom)
-202.	EF_LEVEL99_3		Lv 99 Aura Bubble
-203.	EF_GUMGANG		Fury (Visual Effect)
-204.	EF_POTION1		Red Herb/Potion
-205.	EF_POTION2		Orange Potion
-206.	EF_POTION3		Yellow Herb/Potion
-207.	EF_POTION4		White Herb/Potion
-208.	EF_POTION5		Blue Herb/Potion
-209.	EF_POTION6		Green Herb/Potion
-210.	EF_POTION7		Yellow Circle Healing Effect
-211.	EF_POTION8		Blue Circle Healing Effect
-212.	EF_DARKBREATH		Dark Breath
-213.	EF_DEFFENDER		Defender
-214.	EF_KEEPING		Keeping
-215.	EF_SUMMONSLAVE		Summon Slave
-216.	EF_BLOODDRAIN		Blood Drain
-217.	EF_ENERGYDRAIN		Energy Drain
-218.	EF_POTION_CON		Concentration Potion
-219.	EF_POTION_		Awakening Potion
-220.	EF_POTION_BERSERK	Berserk Potion
-221.	EF_POTIONPILLAR		Intense light beam
-222.	EF_DEFENDER		Defender (Crusader)
-223.	EF_GANBANTEIN		Holy Cast Aura
-224.	EF_WIND			Wind (Map effect)
-225.	EF_VOLCANO		Volcano casting effect
-226.	EF_GRANDCROSS		Grand Cross Effect
-227.	EF_INTIMIDATE		Snatch
-228.	EF_CHOOKGI		(Nothing)
-229.	EF_CLOUD		(Nothing)
-230.	EF_CLOUD2		(Nothing)
-231.	EF_MAPPILLAR		Map Light Pillar Animation 1
-232.	EF_LINELINK		Sacrifice (Visual Effect)
-233.	EF_CLOUD3		Fog
-234.	EF_SPELLBREAKER		Spell Breaker
-235.	EF_DISPELL		Dispell
-236.	EF_DELUGE		Deluge Cast Aura
-237.	EF_VIOLENTGALE		Violent Gale Cast Aura
-238.	EF_LANDPROTECTOR	Magnetic Earth Cast Aura
-239.	EF_BOTTOM_VO		Volcano (Visual Effect)
-240.	EF_BOTTOM_DE		Deluge (Visual Effect)
-241.	EF_BOTTOM_VI		Violent Gale (Visual Effect)
-242.	EF_BOTTOM_LA		Magnetic Earth (Visual Effect)
-243.	EF_FASTMOVE		(Invalid)
-244.	EF_MAGICROD		Magic Rod
-245.	EF_HOLYCROSS		Holy Cross
-246.	EF_SHIELDCHARGE		Shield Charge
-247.	EF_MAPPILLAR2		Map Light Pillar Animation 2
-248.	EF_PROVIDENCE		Resistant Souls
-249.	EF_SHIELDBOOMERANG	Shield Boomerang
-250.	EF_SPEARQUICKEN		Spear Quicken
-251.	EF_DEVOTION		Devotion
-252.	EF_REFLECTSHIELD	Reflect Shield
-253.	EF_ABSORBSPIRITS	Absorb Spirit Spheres
-254.	EF_STEELBODY		Mental Strength (Visual Effect)
-255.	EF_FLAMELAUNCHER	Elemental Endow (Fire)
-256.	EF_FROSTWEAPON		Elemental Endow (Water)
-257.	EF_LIGHTNINGLOADER	Elemental Endow (Wind)
-258.	EF_SEISMICWEAPON	Elemental Endow (Earth)
-259.	EF_MAPPILLAR3		Map Light Pillar Animation 3
-260.	EF_MAPPILLAR4		Map Light Pillar Animation 4
-261.	EF_GUMGANG2		Fury Cast Animation
-262.	EF_TEIHIT1		Raging Quadruple Blow
-263.	EF_GUMGANG3		Raging Quadruple Blow 2
-264.	EF_TEIHIT2		(Nothing)
-265.	EF_TANJI		Throw Spirit Sphere
-266.	EF_TEIHIT1X		Raging Quadruple Blow 3
-267.	EF_CHIMTO		Occult Impaction
-268.	EF_STEALCOIN		Steal Coin
-269.	EF_STRIPWEAPON		Divest Weapon
-270.	EF_STRIPSHIELD		Divest Shield
-271.	EF_STRIPARMOR		Divest Armor
-272.	EF_STRIPHELM		Divest Helm
-273.	EF_CHAINCOMBO		Raging Quadruple Blow 4
-274.	EF_RG_COIN		Steal Coin Animation
-275.	EF_BACKSTAP		Back Stab Animation
-276.	EF_TEIHIT3		Raging Thrust
-277.	EF_BOTTOM_DISSONANCE	Dissoance Map Unit
-278.	EF_BOTTOM_LULLABY	Lullaby Map Unit
-279.	EF_BOTTOM_RICHMANKIM	Mr Kim a Rich Man Map Unit
-280.	EF_BOTTOM_ETERNALCHAOS	Eternal Chaos Map Unit
-281.	EF_BOTTOM_DRUMBATTLEFIELD	A Drum on the Battlefield Map Unit
-282.	EF_BOTTOM_RINGNIBELUNGEN	The Ring Of Nibelungen Map Unit
-283.	EF_BOTTOM_ROKISWEIL	Loki's Veil Map Unit
-284.	EF_BOTTOM_INTOABYSS	Into the Abyss Map Unit
-285.	EF_BOTTOM_SIEGFRIED	Invunerable Siegfriend Map Unit
-286.	EF_BOTTOM_WHISTLE	A Wistle Map Unit
-287.	EF_BOTTOM_ASSASSINCROSS	Assassin Cross of Sunset Map Unit
-288.	EF_BOTTOM_POEMBRAGI	A Poem of Bragi Map Unit
-289.	EF_BOTTOM_APPLEIDUN	The Apple Of Idun Map Unit
-290.	EF_BOTTOM_UGLYDANCE	Ugly Dance Map Unit
-291.	EF_BOTTOM_HUMMING	Humming Map Unit
-292.	EF_BOTTOM_DONTFORGETME	Please don't Forget Me Map Unit
-293.	EF_BOTTOM_FORTUNEKISS	Fortune's Kiss Map Unit
-294.	EF_BOTTOM_SERVICEFORYOU	Service For You Map Unit
-295.	EF_TALK_FROSTJOKE	Frost Joke
-296.	EF_TALK_SCREAM		Scream
-297.	EF_POKJUK		Fire Works (Visual Effect)
-298.	EF_THROWITEM		Acid Terror Animnation
-299.	EF_THROWITEM2		(Nothing)
-300.	EF_CHEMICALPROTECTION	Chemical Protection
-301.	EF_POKJUK_SOUND		Fire Works (Sound Effect)
-302.	EF_DEMONSTRATION	Bomb
-303.	EF_CHEMICAL2		(Unused)
-304.	EF_TELEPORTATION2	Teleportation Animation
-305.	EF_PHARMACY_OK		Pharmacy Success
-306.	EF_PHARMACY_FAIL	Pharmacy Failed
-307.	EF_FORESTLIGHT		Forest Light 1
-308.	EF_THROWITEM3		Throw Stone
-309.	EF_FIRSTAID		First Aid
-310.	EF_SPRINKLESAND		Sprinkle Sand
-311.	EF_LOUD			Crazy Uproar
-312.	EF_HEAL			Heal Effect
-313.	EF_HEAL2		Heal Effect 2
-314.	EF_EXIT2		Old Map Exit effect (Unused)
-315.	EF_GLASSWALL2		Safety Wall
-316.	EF_READYPORTAL2		Warp Portal Animation 1
-317.	EF_PORTAL2		Warp Portal Animation 2
-318.	EF_BOTTOM_MAG		Magnus Exorcisimus Map Unit
-319.	EF_BOTTOM_SANC		Sanctuary Map Unit
-320.	EF_HEAL3		Offensive Heal
-321.	EF_WARPZONE2		Warp NPC
-322.	EF_FORESTLIGHT2		Forest Light 2
-323.	EF_FORESTLIGHT3		Forest Light 3
-324.	EF_FORESTLIGHT4		Forest Light 4
-325.	EF_HEAL4		Heal Effect 4
-326.	EF_FOOT			Chase Walk Left Foot
-327.	EF_FOOT2		Chse Walk Right Foot
-328.	EF_BEGINASURA		Monk Asura Strike
-329.	EF_TRIPLEATTACK		Triple Strike
-330.	EF_HITLINE		Combo Finish
-331.	EF_HPTIME		Natural HP Regeneration
-332.	EF_SPTIME		Natural SP Regeneration
-333.	EF_MAPLE		Autumn Leaves
-334.	EF_BLIND		Blind
-335.	EF_POISON		Poison
-336.	EF_GUARD		Kyrie Eleison/Parrying Shield
-337.	EF_JOBLVUP50		Class Change
-338.	EF_ANGEL2		Super Novice/Taekwon Level Up Angel
-339.	EF_MAGNUM2		Spiral Pierce
-340.	EF_CALLZONE		(Nothing)
-341.	EF_PORTAL3		Wedding Warp Portal
-342.	EF_COUPLECASTING	Wedding Skill
-343.	EF_HEARTCASTING		Another Merry Skill
-344.	EF_ENTRY2		Character map entry effect
-345.	EF_SAINTWING		Wings (Animated)
-346.	EF_SPHEREWIND		Like Moonlight But Blue
-347.	EF_COLORPAPER		Wedding Ceremony
-348.	EF_LIGHTSPHERE		Like 1000 Blade trepassing
-349.	EF_WATERFALL		Waterfall (Horizonatal)
-350.	EF_WATERFALL_90		Waterfall (Vertical)
-351.	EF_WATERFALL_SMALL	Small Waterfall (Horizonatal)
-352.	EF_WATERFALL_SMALL_90	Small Waterfall (Vertical)
-353.	EF_WATERFALL_T2		Dark Waterfall (Horizonatal)
-354.	EF_WATERFALL_T2_90	Dark Waterfall (Vertical)
-355.	EF_WATERFALL_SMALL_T2	Dark Small Waterfall (Horizonatal)
-356.	EF_WATERFALL_SMALL_T2_90	Dark Small Waterfall (Vertical)
-357.	EF_MINI_TETRIS		(Nothing)
-358.	EF_GHOST		Niflheim Ghost
-359.	EF_BAT			Niflheim Bat Slow
-360.	EF_BAT2			Niflheim Bat Fast
-361.	EF_SOULBREAKER		Soul Destroyer
-362.	EF_LEVEL99_4		Trancendant Level 99 Aura 1
-363.	EF_VALLENTINE		Valentine Day Heart With Wings
-364.	EF_VALLENTINE2		Valentine Day Heart
-365.	EF_PRESSURE		Gloria Domini
-366.	EF_BASH3D		Martyr's Reckoning
-367.	EF_AURABLADE		Aura Blade
-368.	EF_REDBODY		Berserk
-369.	EF_LKCONCENTRATION	Concentration
-370.	EF_BOTTOM_GOSPEL	Gospel Map Unit
-371.	EF_ANGEL		Level Up
-372.	EF_DEVIL		Death
-373.	EF_DRAGONSMOKE		House Smoke
-374.	EF_BOTTOM_BASILICA	Basilica
-375.	EF_ASSUMPTIO		Assumptio (Visual Effect)
-376.	EF_HITLINE2		Palm Strike
-377.	EF_BASH3D2		Matyr's Reckoning 2
-378.	EF_ENERGYDRAIN2		Soul Drain (1st Part)
-379.	EF_TRANSBLUEBODY	Soul Drain (2nd Part)
-380.	EF_MAGICCRASHER		Magic Crasher
-381.	EF_LIGHTSPHERE2		Blue Starburst (Unknown use)
-382.	EF_LIGHTBLADE		(Nothing)
-383.	EF_ENERGYDRAIN3		Health Conversion
-384.	EF_LINELINK2		Soul Change (Sound Effect)
-385.	EF_LINKLIGHT		Soul Change (Visual Effect)
-386.	EF_TRUESIGHT		True Sight
-387.	EF_FALCONASSAULT	Falcon Assault
-388.	EF_TRIPLEATTACK2	Focused Arrow Strike (Sound Effect)
-389.	EF_PORTAL4		Wind Walk
-390.	EF_MELTDOWN		Shattering Strike
-391.	EF_CARTBOOST		Cart Boost
-392.	EF_REJECTSWORD		Reject Sword
-393.	EF_TRIPLEATTACK3	Arrow Vulcan
-394.	EF_SPHEREWIND2		Sheltering Bliss
-395.	EF_LINELINK3		Marionette Control (Sound Effect)
-396.	EF_PINKBODY		Marionette Control (Visual Effect)
-397.	EF_LEVEL99_5		Trancended 99 Aura (Middle)
-398.	EF_LEVEL99_6		Trancended 99 Aura (Bottom)
-399.	EF_BASH3D3		Head Crush
-400.	EF_BASH3D4		Joint Beat
-401.	EF_NAPALMVALCAN		Napalm Vulcan Sound
-402.	EF_PORTAL5		Dangerous Soul Collect
-403.	EF_MAGICCRASHER2	Mind Breaker
-404.	EF_BOTTOM_SPIDER	Fiber Lock
-405.	EF_BOTTOM_FOGWALL	Wall Of Fog
-406.	EF_SOULBURN		Soul Burn
-407.	EF_SOULCHANGE		Soul Change
-408.	EF_BABY			Mom, Dad, I love you! (Baby Skill)
-409.	EF_SOULBREAKER2		Meteor Assault
-410.	EF_RAINBOW		Rainbow
-411.	EF_PEONG		Leap
-412.	EF_TANJI2		Like Throw Spirit Sphere
-413.	EF_PRESSEDBODY		Axe Kick
-414.	EF_SPINEDBODY		Round Kick
-415.	EF_KICKEDBODY		Counter Kick
-416.	EF_AIRTEXTURE		(Nothing)
-417.	EF_HITBODY		Flash
-418.	EF_DOUBLEGUMGANG	Warmth Lightning
-419.	EF_REFLECTBODY		Kaite (Visual Effect)
-420.	EF_BABYBODY		Eswoo (Small) (Visual Effect)
-421.	EF_BABYBODY2		Eswoo (Alt. Small) (Visual Effect)
-422.	EF_GIANTBODY		Eswoo (Normal) (Visual Effect)
-423.	EF_GIANTBODY2		Eswoo (Alt. Normal) (Visual Effect)
-424.	EF_ASURABODY		Spirit Link (Visual Effect)
-425.	EF_4WAYBODY		Esma Hit (Visual Effect)
-426.	EF_QUAKEBODY		Sprint Collision (Visual Effect)
-427.	EF_ASURABODY_MONSTER	(Nothing)
-428.	EF_HITLINE3		(Nothing)
-429.	EF_HITLINE4		Taekwon Kick Hit 1
-430.	EF_HITLINE5		Taekwon Kick Hit 2
-431.	EF_HITLINE6		Taekwon Kick Hit 3
-432.	EF_ELECTRIC		Solar, Lunar and Stellar Perception (Visual Effect)
-433.	EF_ELECTRIC2		Solar, Lunar and Stellar Opposition (Visual Effect)
-434.	EF_STORMKICK		Taekwon Kick Hit 4
-435.	EF_HITLINE7		Whirlwind Kick
-436.	EF_STORMKICK		White Barrier (Unused)
-437.	EF_HALFSPHERE		White barrier 2 (Unused)
-438.	EF_ATTACKENERGY		Kaite Reflect Animation
-439.	EF_ATTACKENERGY2	Flying Side Kick
-440.	EF_ASSUMPTIO2		Assumptio (Animation)
-441.	EF_BLUECASTING		Comfort Skills Cast Aura
-442.	EF_RUN			Foot Prints caused by Sprint.
-443.	EF_STOPRUN		(Nothing)
-444.	EF_STOPEFFECT		Sprint Stop Animation
-445.	EF_JUMPBODY		High Jump (Jump)
-446.	EF_LANDBODY		High Jump (Return Down)
-447.	EF_FOOT3		Running Left Foot
-448.	EF_FOOT4		Running Right Foot
-449.	EF_TAE_READY		KA-Spell (1st Part)
-450.	EF_GRANDCROSS2		Darkcross
-451.	EF_SOULSTRIKE2		Dark Strike
-452.	EF_YUFITEL2		Something Like Jupitel Thunder
-453.	EF_NPC_STOP		Paralized
-454.	EF_DARKCASTING		Like Blind
-455.	EF_GUMGANGNPC		Another Warmth Lightning
-456.	EF_AGIUP		Power Up
-457.	EF_JUMPKICK		Flying Side Kick (2nd Part)
-458.	EF_QUAKEBODY2		Running/Sprint (running into a wall)
-459.	EF_STORMKICK1		Brown tornado that spins sprite (unused)
-460.	EF_STORMKICK2		Green tornado (unused)
-461.	EF_STORMKICK3		Blue tornado (unused)
-462.	EF_STORMKICK4		Kaupe Dodge Effect
-463.	EF_STORMKICK5		Kaupe Dodge Effect
-464.	EF_STORMKICK6		White tornado (unused)
-465.	EF_STORMKICK7		Purple tornado (unused)
-466.	EF_SPINEDBODY2		Another Round Kick
-467.	EF_BEGINASURA1		Warm/Mild Wind (Earth)
-468.	EF_BEGINASURA2		Warm/Mild Wind (Wind)
-469.	EF_BEGINASURA3		Warm/Mild Wind (Water)
-470.	EF_BEGINASURA4		Warm/Mild Wind (Fire)
-471.	EF_BEGINASURA5		Warm/Mild Wind (Undead)
-472.	EF_BEGINASURA6		Warm/Mild Wind (Shadow)
-473.	EF_BEGINASURA7		Warm/Mild Wind (Holy)
-474.	EF_AURABLADE2		(Nothing)
-475.	EF_DEVIL1		Demon of The Sun Moon And Stars (Level 1)
-476.	EF_DEVIL2		Demon of The Sun Moon And Stars (Level 2)
-477.	EF_DEVIL3		Demon of The Sun Moon And Stars (Level 3)
-478.	EF_DEVIL4		Demon of The Sun Moon And Stars (Level 4)
-479.	EF_DEVIL5		Demon of The Sun Moon And Stars (Level 5)
-480.	EF_DEVIL6		Demon of The Sun Moon And Stars (Level 6)
-481.	EF_DEVIL7		Demon of The Sun Moon And Stars (Level 7)
-482.	EF_DEVIL8		Demon of The Sun Moon And Stars (Level 8)
-483.	EF_DEVIL9		Demon of The Sun Moon And Stars (Level 9)
-484.	EF_DEVIL10		Demon of The Sun Moon And Stars (Level 10)
-485.	EF_DOUBLEGUMGANG2	Mental Strength Lightning but White
-486.	EF_DOUBLEGUMGANG3	Mental Strength Lightning
-487.	EF_BLACKDEVIL		Demon of The Sun Moon And Stars Ground Effect
-488.	EF_FLOWERCAST		Comfort Skills
-489.	EF_FLOWERCAST2		(Nothing)
-490.	EF_FLOWERCAST3		(Nothing)
-491.	EF_MOCHI		Element Potions
-492.	EF_LAMADAN		Cooking Foods
-493.	EF_EDP			Enchant Deadly Poison
-494.	EF_SHIELDBOOMERANG2	Throwing Tomahawk
-495.	EF_RG_COIN2		Full Strip Sound
-496.	EF_GUARD2		Preserve
-497.	EF_SLIM			Twilight Alchemy 1
-498.	EF_SLIM2		Twilight Alchemy 2
-499.	EF_SLIM3		Twilight Alchemy 3
-500.	EF_CHEMICALBODY		Player Become Blue with Blue Aura
-501.	EF_CASTSPIN		Chase Walk Animation
-502.	EF_PIERCEBODY		Player Become Yellow with Yellow Aura
-503.	EF_SOULLINK		Soul Link Word
-504.	EF_CHOOKGI2		(Nothing)
-505.	EF_MEMORIZE		Memorize
-506.	EF_SOULLIGHT		(Nothing)
-507.	EF_MAPAE		Authoritative Badge
-508.	EF_ITEMPOKJUK		Fire Cracker
-509.	EF_05VAL		Valentine Day Hearth (Wings)
-510.	EF_BEGINASURA11		Champion Asura Strike
-511.	EF_NIGHT		(Nothing)
-512.	EF_CHEMICAL2DASH	Chain Crush Combo
-513.	EF_GROUNDSAMPLE		Area Cast
-514.	EF_GI_EXPLOSION		Really Big Circle
-515.	EF_CLOUD4		Einbroch Fog
-516.	EF_CLOUD5		Airship Cloud
-517.	EF_BOTTOM_HERMODE	(Nothing)
-518.	EF_CARTTER		Cart Termination
-519.	EF_ITEMFAST		Speed Down Potion
-520.	EF_SHIELDBOOMERANG3	Shield Bumerang
-521.	EF_DOUBLECASTBODY	Player Become Red with Red Aura
-522.	EF_GRAVITATION		Gravitation Field
-523.	EF_TAROTCARD1		Tarot Card of Fate (The Fool)
-524.	EF_TAROTCARD2		Tarot Card of Fate (The Magician)
-525.	EF_TAROTCARD3		Tarot Card of Fate (The High Priestess)
-526.	EF_TAROTCARD4		Tarot Card of Fate (The Chariot)
-527.	EF_TAROTCARD5		Tarot Card of Fate (Strength)
-528.	EF_TAROTCARD6		Tarot Card of Fate (The Lovers)
-529.	EF_TAROTCARD7		Tarot Card of Fate (The Wheel of Fortune)
-530.	EF_TAROTCARD8		Tarot Card of Fate (The Hanged Man)
-531.	EF_TAROTCARD9		Tarot Card of Fate (Death)
-532.	EF_TAROTCARD10		Tarot Card of Fate (Temperance)
-533.	EF_TAROTCARD11		Tarot Card of Fate (The Devil)
-534.	EF_TAROTCARD12		Tarot Card of Fate (The Tower)
-535.	EF_TAROTCARD13		Tarot Card of Fate (The Star)
-536.	EF_TAROTCARD14		Tarot Card of Fate (The Sun)
-537.	EF_ACIDDEMON		Acid Demonstration
-538.	EF_GREENBODY		Player Become Green with Green Aura
-539.	EF_THROWITEM4		Throw Random Bottle
-540.	EF_BABYBODY_BACK	Instant Small->Normal
-541.	EF_THROWITEM5		(Nothing)
-542.	EF_BLUEBODY		KA-Spell (1st Part)
-543.	EF_HATED		Kahii
-544.	EF_REDLIGHTBODY		Warmth Red Sprite
-545.	EF_RO2YEAR		Sound And... PUFF Client Crash :P
-546.	EF_SMA_READY		Kaupe
-547.	EF_STIN			Estin
-548.	EF_RED_HIT		Instant Red Sprite
-549.	EF_BLUE_HIT		Instant Blue Sprite
-550.	EF_QUAKEBODY3		Another Effect like Running Hit
-551.	EF_SMA			Effect Like Estun but with Circle
-552.	EF_SMA2			(Nothing)
-553.	EF_STIN2		Esma
-554.	EF_HITTEXTURE		Large White Cloud
-555.	EF_STIN3		Estun
-556.	EF_SMA3			(Nothing)
-557.	EF_BLUEFALL		Juperos Energy Waterfall (Horizontal)
-558.	EF_BLUEFALL_90		Juperos Energy Waterfall (Vertical)
-559.	EF_FASTBLUEFALL		Juperos Energy Waterfall Fast (Horizontal)
-560.	EF_FASTBLUEFALL_90	Juperos Energy Waterfall Fast (Vertical)
-561.	EF_BIG_PORTAL		Juperos Warp
-562.	EF_BIG_PORTAL2		Juperos Warp
-563.	EF_SCREEN_QUAKE		Earthquake Effect (Juperos Elevator)
-564.	EF_HOMUNCASTING		Wedding Cast
-565.	EF_HFLIMOON1		Filir Moonlight Lvl 1
-566.	EF_HFLIMOON2		Filir Moonlight Lvl 2
-567.	EF_HFLIMOON3		Filir Moonlight Lvl 3
-568.	EF_HO_UP		Another Job Level Up
-569.	EF_HAMIDEFENCE		Amistr Bulwark
-570.	EF_HAMICASTLE		Amistr Castling
-571.	EF_HAMIBLOOD		Amistr Bloodlust
-572.	EF_HATED2		Warmth Soul
-573.	EF_TWILIGHT1		Twilight Alchemy 1
-574.	EF_TWILIGHT2		Twilight Alchemy 2
-575.	EF_TWILIGHT3		Twilight Alchemy 3
-576.	EF_ITEM_THUNDER		Box Effect (Thunder)
-577.	EF_ITEM_CLOUD		Box Effect (Cloud)
-578.	EF_ITEM_CURSE		Box Effect (Curse)
-579.	EF_ITEM_ZZZ		Box Effect (Sleep)
-580.	EF_ITEM_RAIN		Box Effect (Rain)
-581.	EF_ITEM_LIGHT		Box Effect (Sunlight)
-582.	EF_ANGEL3		Another Super Novice/Taekwon Angel
-583.	EF_M01			Warmth Hit
-584.	EF_M02			Full Buster
-585.	EF_M03			5 Medium Size Explosion
-586.	EF_M04			Somatology Lab Mobs Aura
-587.	EF_M05			Big Purple Flame
-588.	EF_M06			Little Red Flame
-589.	EF_M07			Eswoo
-590.	EF_KAIZEL		Running Stop
-591.	EF_KAAHI		(Nothing)
-592.	EF_CLOUD6		Thanatos Tower Bloody Clouds
-593.	EF_FOOD01		Food Effect (STR)
-594.	EF_FOOD02		Food Effect (INT)
-595.	EF_FOOD03		Food Effect (VIT)
-596.	EF_FOOD04		Food Effect (AGI)
-597.	EF_FOOD05		Food Effect (DEX)
-598.	EF_FOOD06		Food Effect (LUK)
-599.	EF_SHRINK		Cast Time Sound and Flashing Animation on Player
-600.	EF_THROWITEM6		Throw Venom Knife
-601.	EF_SIGHT2		Sight Blaster
-602.	EF_QUAKEBODY4		Close Confine (Grab Effect)
-603.	EF_FIREHIT2		Spinning fire ball (like 50, but smaller)
-604.	EF_NPC_STOP2		Close Confine (Ground Effect)
-605.	EF_NPC_STOP2_DEL	(Nothing)
-606.	EF_FVOICE		Pang Voice (Visual Effect)
-607.	EF_WINK	Wink of Charm (Visual Effect)
-608.	EF_COOKING_OK		Cooking Success
-609.	EF_COOKING_FAIL		Cooking Failed
-610.	EF_TEMP_OK		Success
-611.	EF_TEMP_FAIL		Failed
-612.	EF_HAPGYEOK		Korean Words and /no1 Emoticon
-613.	EF_THROWITEM7		Throw Shuriken
-614.	EF_THROWITEM8		Throw Kunai
-615.	EF_THROWITEM9		Throw Fumma Shuriken
-616.	EF_THROWITEM10		Throw Money
-617.	EF_BUNSINJYUTSU		Illusionary Shadow
-618.	EF_KOUENKA		Crimson Fire Bolossom
-619.	EF_HYOUSENSOU		Lightning Spear Of Ice
-620.	EF_BOTTOM_SUITON	Water Escape Technique
-621.	EF_STIN4		Wind Blade
-622.	EF_THUNDERSTORM2	Lightning Crash
-623.	EF_CHEMICAL4		Piercing Shot
-624.	EF_STIN5		Kamaitachi
-625.	EF_MADNESS_BLUE		Madness Canceller
-626.	EF_MADNESS_RED		Adjustment
-627.	EF_RG_COIN3		Disarm (Sound Effect)
-628.	EF_BASH3D5		Dust
-629.	EF_CHOOKGI3		(Nothing)
-630.	EF_KIRIKAGE		Shadow Slash
-631.	EF_TATAMI		Reverse Tatami Map Unit
-632.	EF_KASUMIKIRI		Mist Slash
-633.	EF_ISSEN		Final Strike
-634.	EF_KAEN			Crimson Fire Formation
-635.	EF_BAKU			Dragon Fire Formation
-636.	EF_HYOUSYOURAKU		Falling Ice Pillar
-637.	EF_DESPERADO		Desperado
-638.	EF_LIGHTNING_S		Ground Drift Grenade
-639.	EF_BLIND_S		Ground Drift Grenade
-640.	EF_POISON_S		Ground Drift Grenade
-641.	EF_FREEZING_S		Ground Drift Grenade
-642.	EF_FLARE_S		Ground Drift Grenade
-643.	EF_RAPIDSHOWER		Rapid Shower
-644.	EF_MAGICALBULLET	Magic Bullet
-645.	EF_SPREADATTACK		Spread Attack
-646.	EF_TRACKCASTING		Tracking (Shown While Casting)
-647.	EF_TRACKING		Tracking
-648.	EF_TRIPLEACTION		Triple Action
-649.	EF_BULLSEYE		Bull's Eye
-650.	EF_MAP_MAGICZONE	Ice Cave Level 4 Circle
-651.	EF_MAP_MAGICZONE2	Ice Cave Level 4 Big Circle
-652.	EF_DAMAGE1		Like Regeneration Number but Red with a Sound
-653.	EF_DAMAGE1_2		Like Regeneration Number but Red
-654.	EF_DAMAGE1_3		Like Regeneration Number but Purple
-655.	EF_UNDEADBODY		Mobs Skill (Change Undead Element)
-656.	EF_UNDEADBODY_DEL	Last animation before Change Undead Element finish
-657.	EF_GREEN_NUMBER		(Nothing)
-658.	EF_BLUE_NUMBER		(Nothing)
-659.	EF_RED_NUMBER		(Nothing)
-660.	EF_PURPLE_NUMBER	(Nothing)
-661.	EF_BLACK_NUMBER		(Nothing)
-662.	EF_WHITE_NUMBER		(Nothing)
-663.	EF_YELLOW_NUMBER	(Nothing)
-664.	EF_PINK_NUMBER		(Nothing)
-665.	EF_BUBBLE_DROP		Little Blue Ball Falling From the Sky
-666.	EF_NPC_EARTHQUAKE	Earthquake
-667.	EF_DA_SPACE		(Nothing)
-668.	EF_DRAGONFEAR		Dragonfear
-669.	EF_BLEEDING		Wide Bleeding
-670.	EF_WIDECONFUSE		Dragon fear (Visual Effect)
-671.	EF_BOTTOM_RUNNER	The Japan Earth Symbol (like 'Seven Wind Lv1', but on the ground)
-672.	EF_BOTTOM_TRANSFER	The Japan Wind Symbol (like 'Seven Wind Lv2', but on the ground)
-673.	EF_CRYSTAL_BLUE		Map turns Blue (like Soul Link)
-674.	EF_BOTTOM_EVILLAND	Evil Land Cell
-675.	EF_GUARD3		Like Parrying/Kyrie Eleison barrier but Yellow with small Cross in every barrier piece
-676.	EF_NPC_SLOWCAST		Slow Casting
-677.	EF_CRITICALWOUND	Critical Wounds/Bleeding Attack
-678.	EF_GREEN99_3		White 99 Aura Bubbles
-679.	EF_GREEN99_5		Green Aura (Middle)
-680.	EF_GREEN99_6		Green Aura (Bottom)
-681.	EF_MAPSPHERE		Dimensional Gorge Map Effect
-682.	EF_POK_LOVE		I Love You Banner
-683.	EF_POK_WHITE		Happy White Day Banner
-684.	EF_POK_VALEN		Happy Valentine Day Banner
-685.	EF_POK_BIRTH		Happy Birthday Banner
-686.	EF_POK_CHRISTMAS	Merry Christmas Banner
-687.	EF_MAP_MAGICZONE3	Cast Circle-Like effect 1
-688.	EF_MAP_MAGICZONE4	Cast Circle-Like effect 2
-689.	EF_DUST	Endless Tower Map Effect
-690.	EF_TORCH_RED		Burning Flame (Red)
-691.	EF_TORCH_GREEN		Burning Flame (Green)
-692.	EF_MAP_GHOST		Unknown Aura Bubbles (Small ghosts)
-693.	EF_GLOW1		Translucent yellow circle
-694.	EF_GLOW2		Translucent green circle
-695.	EF_GLOW4		Rotating green light
-696.	EF_TORCH_PURPLE		The same of 690 and 691 but Blue/Purple
-697.	EF_CLOUD7		(Nothing)
-698.	EF_CLOUD8		(Nothing)
-699.	EF_FLOWERLEAF		Fall of powder from the sky and raise of some leaf
-700.	EF_MAPSPHERE2		Big Colored Green Sphere.
-701.	EF_GLOW11		Huge Blue Sphere
-702.	EF_GLOW12		Little Colored Violet Sphere
-703.	EF_CIRCLELIGHT		Light Infiltration with fall of pownder
-704.	EF_ITEM315		Client Error (mobile_ef02.str)
-705.	EF_ITEM316		Client Error (mobile_ef01.str)
-706.	EF_ITEM317		Client Error (mobile_ef03.str)
-707.	EF_ITEM318		Client Crash :P
-708.	EF_STORM_MIN		Storm Gust (same as 89)
-709.	EF_POK_JAP		A Firework that split in 4 mini fireworks
-710.	EF_MAP_GREENLIGHT	A Sphere like Effect 701 but Green, and a bit more larger
-711.	EF_MAP_MAGICWALL	A big violet wall
-712.	EF_MAP_GREENLIGHT2	A Little Flame Sphere
-713.	EF_YELLOWFLY1		A lot of Very Small and Yellow Sphere
-714.	EF_YELLOWFLY2		(Nothing)
-715.	EF_BOTTOM_BLUE		Little blue Basilica
-716.	EF_BOTTOM_BLUE2		Same as 715
-717.	EF_WEWISH		Christmas Carol (copy of Angelus)
-718.	EF_FIREPILLARON2	Judex (Visual Effect)
-719.	EF_FORESTLIGHT5		Renovatio (light beam)
-720.	EF_SOULBREAKER3		Yellow version of Soul Breaker
-721.	EF_ADO_STR		Adoramus (lightning bolt)
-722.	EF_IGN_STR		Ignition Break (big explosion)
-723.	EF_CHIMTO2		Hundred Spear (sound effect)
-724.	EF_WINDCUTTER		Green version of Detecting
-725.	EF_DETECT2		Oratorio (like Detecting)
-726.	EF_FROSTMYSTY		Frost Misty (blue vapor and bubbles)
-727.	EF_CRIMSON_STR		Crimson Rock
-728.	EF_HELL_STR		Small fire (part of Hell Inferno)
-729.	EF_SPR_MASH		Marsh of Abyss (like Close Confine)
-730.	EF_SPR_SOULE		Small, cartoony explosion (part of Soul Expansion)
-731.	EF_DHOWL_STR		Dragon Howling (blinking, expanding circle)
-732.	EF_EARTHWALL		Spike from the ground
-733.	EF_SOULBREAKER4		Fluffy Ball flying by
-734.	EF_CHAINL_STR		Chain Lightning
-735.	EF_CHOOKGI_FIRE		(Nothing)
-736.	EF_CHOOKGI_WIND		(Nothing)
-737.	EF_CHOOKGI_WATER	(Nothing)
-738.	EF_CHOOKGI_GROUND	(Nothing)
-739.	EF_MAGENTA_TRAP		Old Magenta Trap
-740.	EF_COBALT_TRAP		Old Cobald Trap
-741.	EF_MAIZE_TRAP		Old Maize Trap
-742.	EF_VERDURE_TRAP		Old Verdure Trap
-743.	EF_NORMAL_TRAP		White Ranger Trap
-744.	EF_CLOAKING2		Camouflage
-745.	EF_AIMED_STR		Aimed Bolt (crosshairs)
-746.	EF_ARROWSTORM_STR	Arrow Storm
-747.	EF_LAULAMUS_STR		Falling white feathers
-748.	EF_LAUAGNUS_STR		Falling blue feathers
-749.	EF_MILSHIELD_STR	Millennium Shield
-750.	EF_CONCENTRATION2	Detonator (blue sparkles)
-751.	EF_FIREBALL2		Releasing summoned warlock spheres
-752.	EF_BUNSINJYUTSU2	Like Energy Coat, but not as dark
-753.	EF_CLEARTIME		Clearance
-754.	EF_GLASSWALL3		Green warp portal (root of Epiclesis)
-755.	EF_ORATIO		Oratio (spinning blue symbol)
-756.	EF_POTION_BERSERK2	Enchant Blade (like Berserk Potion)
-757.	EF_CIRCLEPOWER		Third Class Aura (Middle)
-758.	EF_ROLLING1		Rolling Cutter - Spin Count 1
-759.	EF_ROLLING2		Rolling Cutter - Spin Count 2
-760.	EF_ROLLING3		Rolling Cutter - Spin Count 3
-761.	EF_ROLLING4		Rolling Cutter - Spin Count 4
-762.	EF_ROLLING5		Rolling Cutter - Spin Count 5
-763.	EF_ROLLING6		Rolling Cutter - Spin Count 6
-764.	EF_ROLLING7		Rolling Cutter - Spin Count 7
-765.	EF_ROLLING8		Rolling Cutter - Spin Count 8
-766.	EF_ROLLING9		Rolling Cutter - Spin Count 9
-767.	EF_ROLLING10		Rolling Cutter - Spin Count 10
-768.	EF_PURPLEBODY		Blinking
-769.	EF_STIN6		Cross Ripper Slasher (flying knives)
-770.	EF_RG_COIN4		Strip sound
-771.	EF_POISONWAV		Poison sound
-772.	EF_POISONSMOKE		Poison particles
-773.	EF_GUMGANG4		Expanding purple aura (part of Phantom Menace)
-774.	EF_SHIELDBOOMERANG4	Axe Boomerang
-775.	EF_CASTSPIN2		Spinning character sprite
-776.	EF_VULCANWAV		Like Desperado sound effect
-777.	EF_AGIUP2		Faded light from the ground [S]
-778.	EF_DETECT3		Expanding white aura (like Clearance)
-779.	EF_AGIUP3		Faded light from the ground [S]
-780.	EF_DETECT4		Expanding red aura (from Infrared Scan)
-781.	EF_ELECTRIC3		Magnetic Field (purple chains)
-782.	EF_GUARD4		All-around shield [S]
-783.	EF_BOTTOM_BARRIER	Yellow shaft of light
-784.	EF_BOTTOM_STEALTH	White shaft of light
-785.	EF_REPAIRTIME		Upward flying wrenches
-786.	EF_NC_ANAL		Symbol with bleeping sound [S]
-787.	EF_FIRETHROW		Flare Launcher (line of fire)
-788.	EF_VENOMIMPRESS		Venom Impress (green skull)
-789.	EF_FROSTMISTY		Freezing Status Effect (two ancillas)
-790.	EF_BURNING		Burning Status Effect (flame symbol)
-791.	EF_COLDTHROW		Two ice shots
-792.	EF_MAKEHALLU		Upward streaming white particles
-793.	EF_HALLUTIME		Same, but more brief
-794.	EF_INFRAREDSCAN		Infrared Scan (red lasers)
-795.	EF_CRASHAXE		Power Swing (axe crash)
-796.	EF_GTHUNDER		Spinning blue triangles
-797.	EF_STONERING		Stapo
-798.	EF_INTIMIDATE2		Red triangles (like Intimidate)
-799.	EF_STASIS		Stasis (expanding blue mist) [S]
-800.	EF_REDLINE		Hell Inferno (red lights)
-801.	EF_FROSTDIVER3		Jack Frost unit (ice spikes)
-802.	EF_BOTTOM_BASILICA2	White Imprison
-803.	EF_RECOGNIZED		Recognized Spell
-804.	EF_TETRA		Tetra Vortex [S]
-805.	EF_TETRACASTING		Tetra Vortex cast animation (blinking colors)
-806.	EF_FIREBALL3		Flying by as fast as a rocket
-807.	EF_INTIMIDATE3		Kidnapping sound
-808.	EF_RECOGNIZED2		Like Recognized Spell, but one symbol
-809.	EF_CLOAKING3		Shadowy filter [S]
-810.	EF_INTIMIDATE4		Damp thud sound [S]
-811.	EF_STRETCH		Body Painting
-812.	EF_BLACKBODY		Black expanding aura
-813.	EF_ENERVATION		Masquerade - Enervation
-814.	EF_ENERVATION2		Masquerade - Groomy
-815.	EF_ENERVATION3		Masquerade - Ignorance
-816.	EF_ENERVATION4		Masquerade - Laziness
-817.	EF_ENERVATION5		Masquerade - Unlucky
-818.	EF_ENERVATION6		Masquerade - Weakness
-819.	EF_LINELINK4		(Nothing)
-820.	EF_RG_COIN5		Strip Accessory
-821.	EF_WATERFALL_ANI	Waterfall
-822.	EF_BOTTOM_MANHOLE	Dimension Door (spinning blue aura)
-823.	EF_MANHOLE		In-the-manhole effect
-824.	EF_MAKEFEINT		Some filter
-825.	EF_FORESTLIGHT6		Dimension Door (aura + blue light)
-826.	EF_DARKCASTING2		Expanding black casting anim.
-827.	EF_BOTTOM_ANI		Chaos Panic (spinning brown aura)
-828.	EF_BOTTOM_MAELSTROM	Maelstrom (spinning pink aura)
-829.	EF_BOTTOM_BLOODYLUST	Bloody Lust (spinning red aura)
-830.	EF_BEGINSPELL_N1	Blue aura (Arch Bishop cast animation)
-831.	EF_BEGINSPELL_N2	Blue cone [S]
-832.	EF_HEAL_N		Sonic Wave
-833.	EF_CHOOKGI_N		(Nothing)
-834.	EF_JOBLVUP50_2		Light shooting away circlish
-835.	EF_CHEMICAL2DASH2	Fastness yellow-reddish
-836.	EF_CHEMICAL2DASH3	Fastness yellow-pinkish
-837.	EF_ROLLINGCAST		Casting [S]
-838.	EF_WATER_BELOW		Watery aura
-839.	EF_WATER_FADE		[Client Error]
-840.	EF_BEGINSPELL_N3	Red cone
-841.	EF_BEGINSPELL_N4	Green cone
-842.	EF_BEGINSPELL_N5	Yellow cone
-843.	EF_BEGINSPELL_N6	White cone
-844.	EF_BEGINSPELL_N7	Purple cone
-845.	EF_BEGINSPELL_N8	light-bluish turquoise cone
-846.	EF_WATER_SMOKE		(Nothing)
-847.	EF_DANCE1		Gloomy Day (white/red light rays)
-848.	EF_DANCE2		Gloomy Day (white/blue light rays)
-849.	EF_LINKPARTICLE		(Nothing)
-850.	EF_SOULLIGHT2		(Nothing)
-851.	EF_SPR_PARTICLE		Green mushy-foggy stuff (dull)
-852.	EF_SPR_PARTICLE2	Green mushy-foggy stuff (bright)
-853.	EF_SPR_PLANT		Bright green flower area
-854.	EF_CHEMICAL_V		Blue beam of light with notes
-855.	EF_SHOOTPARTICLE	(Nothing)
-856.	EF_BOT_REVERB		Reverberation (red eighth notes)
-857.	EF_RAIN_PARTICLE	Severe Rainstorm (falling red and blue beams)
-858.	EF_CHEMICAL_V2		Deep Sleep Lullaby (two red beams and music notes)
-859.	EF_SECRA		Holograph of text (blue)
-860.	EF_BOT_REVERB2		Distorted note (blue)
-861.	EF_CIRCLEPOWER2		Green aura (from Circle of Life's Melody)
-862.	EF_SECRA2		Randomize Spell (holograph of text)
-863.	EF_CHEMICAL_V3		Dominion Impulse (two spears of light)
-864.	EF_ENERVATION7		Gloomy Day (colorful lines)
-865.	EF_CIRCLEPOWER3		Blue aura (from Song of Mana)
-866.	EF_SPR_PLANT2		Dance with a Warg (Wargs)
-867.	EF_CIRCLEPOWER4		Yellow aura (from Dance with a Warg)
-868.	EF_SPR_PLANT3		Song of Mana (Violies)
-869.	EF_RG_COIN6		Strip sound [S]
-870.	EF_SPR_PLANT4		Ghostly Succubuses of fire
-871.	EF_CIRCLEPOWER5		Red aura (from Lerad's Dew)
-872.	EF_SPR_PLANT5		Lerad's Dew (Minerals)
-873.	EF_CIRCLEPOWER6		Stargate-wormhole stuff (bright purple)
-874.	EF_SPR_PLANT6		Melody of Sink (Ktullanuxes)
-875.	EF_CIRCLEPOWER7		Stargate-wormhole stuff (bright turquoise)
-876.	EF_SPR_PLANT7		Warcry of Beyond (Garms)
-877.	EF_CIRCLEPOWER8		Stargate-wormhole stuff (white)
-878.	EF_SPR_PLANT8		Unlimited Humming Voice (Miyabi Ningyos)
-879.	EF_HEARTASURA		Siren's Voice (heart-like)
-880.	EF_BEGINSPELL_150	Bluish castish cone
-881.	EF_LEVEL99_150		Blue aura
-882.	EF_PRIMECHARGE		Whirl of fireflies (red)
-883.	EF_GLASSWALL4		Epiclesis (transparent green tree)
-884.	EF_GRADIUS_LASER	Green beam
-885.	EF_BASH3D6		Blue light beams
-886.	EF_GUMGANG5		Blue castish cone
-887.	EF_HITLINE8		Wavy sparks
-888.	EF_ELECTRIC4		Earth Shaker (same as 432)
-889.	EF_TEIHIT1T		Fast light beams
-890.	EF_SPINMOVE		Rotation
-891.	EF_FIREBALL4		Magic shots [S]
-892.	EF_TRIPLEATTACK4	Fastness with hitting sound[S]
-893.	EF_CHEMICAL3S		Blue-white light passing by
-894.	EF_GROUNDSHAKE		(Nothing)
-895.	EF_DQ9_CHARGE		Big wheel of flat light beams
-896.	EF_DQ9_CHARGE2		Still sun shaped lightning aura
-897.	EF_DQ9_CHARGE3		Animated sun shaped lightning aura
-898.	EF_DQ9_CHARGE4		Animated, curvy sun shaped lightning aura
-899.	EF_BLUELINE		White/red light shots from below
-900.	EF_SELFSCROLL		Animated, slow curvy sun shaped lightning aura
-901.	EF_SPR_LIGHTPRINT	Explosion
-902.	EF_PNG_TEST		Floating bedtable texture
-903.	EF_BEGINSPELL_YB	Castish flamey cone
-904.	EF_CHEMICAL2DASH4	Yellow/pink lights passing by
-905.	EF_GROUNDSHAKE2		Expanding circle
-906.	EF_PRESSURE2		Shield Press (falling shield)
-907.	EF_RG_COIN7		Chainy, metalish sound [S]
-908.	EF_PRIMECHARGE2		Prestige (sphere of yellow particles)
-909.	EF_PRIMECHARGE3		Banding (sphere of red particles)
-910.	EF_PRIMECHARGE4		Inspiration (sphere of blue particles)
-911.	EF_GREENCASTING		Green castish animation [S]
-912.	EF_WALLOFTHORN		Wall of Thorns unit (green fog cloud)
-913.	EF_FIREBALL5		Magic projectiles
-914.	EF_THROWITEM11		(Nothing)
-915.	EF_SPR_PLANT9		Crazy Weed
-916.	EF_DEMONICFIRE		Demonic Fire
-917.	EF_DEMONICFIRE2		More angry, demonic flames
-918.	EF_DEMONICFIRE3		Fire Insignia (demonic flames)
-919.	EF_HELLSPLANT		Hell's Plant (green snapping plant)
-920.	EF_FIREWALL2		Fire Walk unit
-921.	EF_VACUUM		Vacuum Extreme (whirlwind)
-922.	EF_SPR_PLANT10		Psychic Wave
-923.	EF_SPR_LIGHTPRINT2	Poison Buster
-924.	EF_POISONSMOKE2		Poisoning animation
-925.	EF_MAKEHALLU2		Some filter
-926.	EF_SHOCKWAVE2		Electric Walk unit
-927.	EF_SPR_PLANT11		Earth Grave (speary roots)
-928.	EF_COLDTHROW2		Ice cloud projectiles
-929.	EF_DEMONICFIRE4		Warmer (field of flames)
-930.	EF_PRESSURE3		Varetyr Spear (falling spear)
-931.	EF_LINKPARTICLE2	(Nothing)
-932.	EF_SOULLIGHT3		Firefly
-933.	EF_CHAREFFECT		[Client Crash]
-934.	EF_GUMGANG6		White, castishly expanding cone
-935.	EF_FIREBALL6		Green magic projectile
-936.	EF_GUMGANG7		Red, castishly expanding cone
-937.	EF_GUMGANG8		Yellow, castishly expanding cone
-938.	EF_GUMGANG9		Dark-red, castishly expanding cone
-939.	EF_BOTTOM_DE2		Blue, conish aura
-940.	EF_COLDSTATUS		Snow flake
-941.	EF_SPR_LIGHTPRINT3	Explosion of red, demonic fire
-942.	EF_WATERBALL3		Expanding, white dome
-943.	EF_HEAL_N2		Green, fluffy projectile
-944.	EF_RAIN_PARTICLE2	Falling gems
-945.	EF_CLOUD9		(Nothing)
-946.	EF_YELLOWFLY3		Floating lights
-947.	EF_EL_GUST		Blue lightning sphere
-948.	EF_EL_BLAST		Two blue lightning spheres
-949.	EF_EL_AQUAPLAY		Flat, spinning diamond
-950.	EF_EL_UPHEAVAL		Circling, planetlike spheres
-951.	EF_EL_WILD_STORM	Three lightning spheres
-952.	EF_EL_CHILLY_AIR	Flat, spinning gem and two lightning spheres
-953.	EF_EL_CURSED_SOIL	Spinning, planetlike spheres
-954.	EF_EL_COOLER		Two lightblue glowing spheres
-955.	EF_EL_TROPIC		Three spinning flame spheres
-956.	EF_EL_PYROTECHNIC	Flame
-957.	EF_EL_PETROLOGY		Spinning planetlike sphere
-958.	EF_EL_HEATER		Two flames
-959.	EF_POISON_MIST		Purple flame
-960.	EF_ERASER_CUTTER	Small yellow explosion
-961.	EF_SILENT_BREEZE	Cartoony whirlwind
-962.	EF_MAGMA_FLOW		Rising fire
-963.	EF_GRAYBODY		Dark filter (like Stone Curse)
-964.	EF_LAVA_SLIDE		Same as 920
-965.	EF_SONIC_CLAW		Small white explosion
-966.	EF_TINDER_BREAKER	Bone crack
-967.	EF_MIDNIGHT_FRENZY	Another little explosion

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_Heat, Eff_Deepsleep, Eff_WhiteImprison, Eff_Hallucination
 
 * 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_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda, RC2_Illusion_Frozen, RC2_Illusion_Moonlight
 
 * Class (c)
 	Class_Normal, Class_Boss, Class_Guardian, Class_All

doc/mob_db.txt

@@ -204,6 +204,18 @@ 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.
 
 ---------------------------------------

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 level.
-The following lists explains the skill specialities and the corresponding level
+level above the maximum player skill level.
+The following list 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

doc/packet_struct_notation.md

@@ -0,0 +1,132 @@
+# Packet Structure Notation
+
+This document specifies how packets are and should be documented, to
+keep packet structure comments consistent in the entire codebase. It
+also serves as a guide to those, who are unfamiliar with the general
+packet layout.
+
+All mentioned data types are assumed to be little-endian (least-
+significant byte first, least significant bit last) and of same size
+regardless of architecture.
+
+### Typical description of a packet
+
+```
+Notifies the client about entering a chatroom.  
+00db <packet len>.W <chat id>.L { <role>.L <name>.24B }* (ZC_ENTER_ROOM)
+role:  
+  0 = owner (menu)  
+  1 = normal  
+```
+
+The first line contains a brief description of what the packet does,
+or what it is good for, followed by it's `AEGIS` name in parentheses;
+first two letters of the `AEGIS` name specify origin (first letter)
+and destination (second letter) of the packet. If the packet's name
+is not known or is not applicable (rAthena server-server packets),
+specify at least these two letters to indicate the direction of the
+packet. Do not use `S(end)/R(ecv)` for this, as it is inaccurate and
+location dependent (if the description is copied to different server
+or other RO-related projects, it might change it's meaning).
+
+If there are multiple versions of the packet, the `AEGIS` name is
+appended to the end of the packet's structure instead. If the name
+did not change between versions, a `PACKETVER` expression is appended,
+such as `(PACKETVER >= 20111111)`.
+
+Second line describes the packet's field structure, beginning with a
+`%04x` formatted packet type, followed by the individual fields and
+their types. Each field begins with it's name enclosed in angle
+brackets ( `<field name>` ) followed by a dot and the data size type.
+Field names should be lower-case and without underscores. If other
+packets already have a field in common, use that name, rather than
+inventing your own (ex. "packet len" and "account id"). Repeated and
+optional fields are designated with curly and square brackets
+respectively, padded with a single space at each side.
+
+Further lines are optional and either include details about the
+the packet's mechanics or further explanation on the packet fields'
+values.
+
+### Packet field data size type
+
+ |Field name|Field description|Field size|
+ |---|---|---|
+ |B|byte|1 byte|
+ |W|word|2 bytes|
+ |L|long, dword|4 bytes|
+ |F|float|4 bytes|
+ |Q|quad|8 bytes|
+
+### Variable cases
+ 
+ |Field name|Field description|
+ |---|---|
+ |nB|n bytes|
+ |?B|variable/unknown amount of bytes|
+ |nS|n bytes, zero-terminated|
+ |?S|variable/unknown amount of bytes, zero-terminated|
+
+### Repetition of packet fields
+ 
+ |Field name|Field description|
+ |---|---|
+ |{}|repeated block|
+ |{}*|variable/unknown amount of consecutive blocks|
+ |{}*n|n times repeated block|
+ |[]|optional fields|
+
+### Packet origin and destination letters
+ 
+ |Origin|Destination|
+ |---|---|
+ |A|Account (Login)|
+ |C|Client|
+ |H|Character|
+ |I|Inter|
+ |S|Server (any type of server)|
+ |Z|Zone (Map)|
+
+### Examples
+
+- Packet with nested repetition blocks:
+ 
+```
+/// Presents a textual list of producable items.
+/// 018d <packet len>.W { <name id>.W { <material id>.W }*3 }* (ZC_MAKABLEITEMLIST)
+/// material id:
+///     unused by the client
+```
+
+- Packet with multiple versions identified with different AEGIS names:
+
+```
+/// Request for server's tick.
+/// 007e <client tick>.L (CZ_REQUEST_TIME)
+/// 0360 <client tick>.L (CZ_REQUEST_TIME2)
+```
+
+- Packet with multiple versions identified with same AEGIS name:
+
+```
+/// Cashshop Buy Ack.
+/// 0289 <cash point>.L <error>.W (ZC_PC_CASH_POINT_UPDATE)
+/// 0289 <cash point>.L <kafra point>.L <error>.W (PACKETVER >= 20070711) (ZC_PC_CASH_POINT_UPDATE)
+```
+
+- Packet with combination of both different AEGIS names and different versions with same name:
+
+```
+/// Sends hotkey bar.
+/// 02b9 { <is skill>.B <id>.L <count>.W }*27 (ZC_SHORTCUT_KEY_LIST)
+/// 07d9 { <is skill>.B <id>.L <count>.W }*36 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090603)
+/// 07d9 { <is skill>.B <id>.L <count>.W }*38 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090617)
+```
+ 
+- Packet for a client command:
+
+```
+/// /item /monster.
+/// Request to make items or spawn monsters.
+/// 013f <item/mob name>.24B (CZ_ITEM_CREATE)
+```

doc/packet_struct_notation.txt

@@ -1,119 +0,0 @@
-//===== rAthena Documentation ================================
-//= Packet Structure Notation
-//===== By: ==================================================
-//= Ai4rei
-//===== Last Updated: ========================================
-//= 20120810
-//===== Description: =========================================
-//= Explanation how packets are and should be documented.
-//============================================================
-
-This document specifies how packets are and should be documented, to
-keep packet structure comments consistent in the entire codebase. It
-also serves as a guide to those, who are unfamiliar with the general
-packet layout.
-
-All mentioned data types are assumed to be little-endian (least-
-significant byte first, least significant bit last) and of same size
-regardless of architecture.
-
-= Typical description of a packet =
-
- /// Notifies the client about entering a chatroom (ZC_ENTER_ROOM).
- /// 00db <packet len>.W <chat id>.L { <role>.L <name>.24B }*
- /// role:
- ///     0 = owner (menu)
- ///     1 = normal
-
-The first line contains a brief description of what the packet does,
-or what it is good for, followed by it's AEGIS name in parentheses;
-first two letters of the AEGIS name specify origin (first letter)
-and destination (second letter) of the packet. If the packet's name
-is not known or is not applicable (rAthena server-server packets),
-specify at least these two letters to indicate the direction of the
-packet. Do not use S(end)/R(ecv) for this, as it is inaccurate and
-location dependent (if the description is copied to different server
-or other RO-related projects, it might change it's meaning).
-
-If there are multiple versions of the packet, the AEGIS name is
-appended to the end of the packet's structure instead. If the name
-did not change between versions, a PACKETVER expression is appended,
-such as (PACKETVER >= 20111111).
-
-Second line describes the packet's field structure, beginning with a
-%04x formatted packet type, followed by the individual fields and
-their types. Each field begins with it's name enclosed in angle
-brackets ( <field name> ) followed by a dot and the data size type.
-Field names should be lower-case and without underscores. If other
-packets already have a field in common, use that name, rather than
-inventing your own (ex. "packet len" and "account id"). Repeated and
-optional fields are designated with curly and square brackets
-respectively, padded with a single space at each side.
-
-Further lines are optional and either include details about the
-the packet's mechanics or further explanation on the packet fields'
-values.
-
-= Packet field data size type =
-
- B = 1 byte (byte)
- W = 2 bytes (word)
- L = 4 bytes (long, dword)
- F = 4 bytes (float)
- Q = 8 bytes (quad)
-
- nB = n bytes
- ?B = variable/unknown amount of bytes
- nS = n bytes, zero-terminated
- ?S = variable/unknown amount of bytes, zero-terminated
-
-= Repetition of packet fields =
-
- {} = repeated block
- {}* = variable/unknown amount of consecutive blocks
- {}*n = n times repeated block
- [] = optional fields
-
-= Packet origin and destination letters =
-
- A = Account (Login)
- C = Client
- H = Character
- I = Inter
- S = Server (any type of server)
- Z = Zone (Map)
-
-= Examples =
-
-Packet with nested repetition blocks:
-
- /// Presents a textual list of producable items (ZC_MAKABLEITEMLIST).
- /// 018d <packet len>.W { <name id>.W { <material id>.W }*3 }*
- /// material id:
- ///     unused by the client
-
-Packet with multiple versions identified with different AEGIS names:
-
- /// Request for server's tick.
- /// 007e <client tick>.L (CZ_REQUEST_TIME)
- /// 0360 <client tick>.L (CZ_REQUEST_TIME2)
-
-Packet with multiple versions identified with same AEGIS name:
-
- /// Cashshop Buy Ack (ZC_PC_CASH_POINT_UPDATE).
- /// 0289 <cash point>.L <error>.W
- /// 0289 <cash point>.L <kafra point>.L <error>.W (PACKETVER >= 20070711)
-
-Packet with combination of both different AEGIS names and different
-versions with same name:
-
- /// Sends hotkey bar.
- /// 02b9 { <is skill>.B <id>.L <count>.W }*27 (ZC_SHORTCUT_KEY_LIST)
- /// 07d9 { <is skill>.B <id>.L <count>.W }*36 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090603)
- /// 07d9 { <is skill>.B <id>.L <count>.W }*38 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090617)
-
-Packet for a client command:
-
- /// /item /monster (CZ_ITEM_CREATE).
- /// Request to make items or spawn monsters.
- /// 013f <item/mob name>.24B

doc/permissions.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20130613
+//= 20240414
 //===== Description: =========================================
 //= List of available permissions and their functions.
 //============================================================
@@ -11,6 +11,12 @@
 This file describes the functions of player group permissions,
 configured in '/conf/groups.conf' under the "permissions" bracket.
 
+The permission name used in '/conf/groups.conf' goes after the asterisk "*",
+while the constant name used in scripts and src goes between the parentheses "()"
+in the following format:
+
+*permission_name (PC_PERM_CONSTANT_NAME)
+
 To search for a permission, write "*" before its name.
 The format of this file is as follows:
 	1. Basic Permissions
@@ -22,20 +28,20 @@ The format of this file is as follows:
 ========================
 ---------------------------------------
 
-*can_trade
+*can_trade (PC_PERM_TRADE)
 
 Allows player to distribute items, such as through trades, dropping,
 vending, storage, mail, etc.
 
 ---------------------------------------
 
-*can_party
+*can_party (PC_PERM_PARTY)
 
 Allows player to create and join parties.
 
 ---------------------------------------
 
-*attendance
+*attendance (PC_PERM_ATTENDANCE)
 
 Allows player to use the daily attendance system.
 
@@ -46,78 +52,78 @@ Allows player to use the daily attendance system.
 ===========================
 ---------------------------------------
 
-*all_skill
+*all_skill (PC_PERM_ALL_SKILL)
 
 Grants player all available skills in the player's skill tree.
 
 ---------------------------------------
 
-*all_equipment
+*all_equipment (PC_PERM_USE_ALL_EQUIPMENT)
 
 Allows player to equip any item, regardless of requirements (class, level,
 etc.). Note that this can cause client errors if a sprite does not exist.
 
 ---------------------------------------
 
-*skill_unconditional
+*skill_unconditional (PC_PERM_SKILL_UNCONDITIONAL)
 
 Allows player to use any skill, regardless of required conditions (SP,
 items, etc.).
 
 ---------------------------------------
 
-*join_chat
+*join_chat (PC_PERM_JOIN_ALL_CHAT)
 
 Allows player to join password-protected chatrooms.
 
 ---------------------------------------
 
-*kick_chat
+*kick_chat (PC_PERM_NO_CHAT_KICK)
 
 Prevents player from being kicked from a chatroom.
 
 ---------------------------------------
 
-*view_hpmeter
+*view_hpmeter (PC_PERM_VIEW_HPMETER)
 
 Allows player to see the HP bar of every player.
 
 ---------------------------------------
 
-*view_equipment
+*view_equipment (PC_PERM_VIEW_EQUIPMENT)
 
 Allows player to view the equipment of every player, regardless of that
 player's setting.
 
 ---------------------------------------
 
-*hack_info
+*hack_info (PC_PERM_RECEIVE_HACK_INFO)
 
 Allows player to receive all information about players who try to hack,
 spoof a name, etc.
 
 ---------------------------------------
 
-*disable_pvm
+*disable_pvm (PC_PERM_DISABLE_PVM)
 
 Prevents player from attacking monsters.
 
 ---------------------------------------
 
-*disable_pvp
+*disable_pvp (PC_PERM_DISABLE_PVP)
 
 Prevents player from attacking other players.
 
 ---------------------------------------
 
-*can_trade_bounded
+*can_trade_bounded (PC_PERM_TRADE_BOUNDED)
 
 Allows player to do normal item actions with bounded items (drop, sell,
 trade, etc.).
 
 ---------------------------------------
  
-*item_unconditional
+*item_unconditional (PC_PERM_ITEM_UNCONDITIONAL)
 
 Allows player to consume any consumable item regardless the requirements
 (bypass noitemconsumption mapflag, item's class, gender, status changes,
@@ -125,37 +131,43 @@ 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
+*all_commands (PC_PERM_USE_ALL_COMMANDS)
 
 Allows usage of all atcommands and charcommands.
 
 ---------------------------------------
 
-*disable_commands_when_dead
+*disable_commands_when_dead (PC_PERM_DISABLE_CMD_DEAD)
 
 Disables usage of atcommands when player is dead.
 
 ---------------------------------------
 
-*hide_session
+*hide_session (PC_PERM_HIDE_SESSION)
 
 Hides player session from being displayed by atcommands (@who, @whomap,
 etc.).
 
 ---------------------------------------
 
-*who_display_aid
+*who_display_aid (PC_PERM_WHO_DISPLAY_AID)
 
 Displays all GMs and character/account IDs in the @who command.
 
 ---------------------------------------
 
-*any_warp
+*any_warp (PC_PERM_WARP_ANYWHERE)
 
 Allows player to bypass 'nowarp', 'nowarpto', 'noteleport', and 'nomemo'
 mapflags in commands which modify a character's map or coordinates (@memo,
@@ -163,64 +175,64 @@ mapflags in commands which modify a character's map or coordinates (@memo,
 
 ---------------------------------------
 
-*receive_requests
+*receive_requests (PC_PERM_RECEIVE_REQUESTS)
 
 Allows player to receive requests through the @requests command.
 
 ---------------------------------------
 
-*show_bossmobs
+*show_bossmobs (PC_PERM_SHOW_BOSS)
 
 Displays boss mobs in the @showmobs command.
 
 ---------------------------------------
 
-*channel_admin
+*channel_admin (PC_PERM_CHANNEL_ADMIN)
 
 Allows player to modify #channel settings regardless of ownership and to
 join password-protected channels without a password.
 
 ---------------------------------------
 
-*use_check
+*use_check (PC_PERM_USE_CHECK)
 
 Allows player to use the client command /check (displays character status).
 
 ---------------------------------------
 
-*use_changemaptype
+*use_changemaptype (PC_PERM_USE_CHANGEMAPTYPE)
 
 Allows player to use the client command /changemaptype.
 
 ---------------------------------------
 
-*command_enable
+*command_enable (PC_PERM_ENABLE_COMMAND)
 
 Enable to use atcommand while talking with NPC.
 
 ---------------------------------------
 
-*bypass_stat_onclone
+*bypass_stat_onclone (PC_PERM_BYPASS_STAT_ONCLONE)
 
 Bypass max parameter limit while using @clonestat
 
 ---------------------------------------
 
-*bypass_max_stat
+*bypass_max_stat (PC_PERM_BYPASS_MAX_STAT)
 
 Allow to bypass the maximum stat parameter (at conf/player.conf) to
 maximum value 32,767.
 
 ---------------------------------------
 
-*macro_detect
+*macro_detect (PC_PERM_MACRO_DETECT)
 
 Allows player to use the client command /macro_detector.
 
 ---------------------------------------
 
-*macro_register
+*macro_register (PC_PERM_MACRO_REGISTER)
 
-Allows player to use the client commands /maco_register (used to add new captcha) and /macro_preview (used to preview captcha by ID).
+Allows player to use the client commands /macro_register (used to add new captcha) and /macro_preview (used to preview captcha by ID).
 
 ---------------------------------------

doc/quest_db.txt

@@ -20,11 +20,30 @@ Title: Quest title.
 
 TimeLimit: Amount of time before 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).
 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).
+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).
 
-Please note the number before "d" only shifts the exact timer to the given day(s).
+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
 
 ---------------------------------------
 

doc/script_commands.txt

@@ -1,4 +1,4 @@
-//===== rAthena Documentation================================
+//===== rAthena Documentation================================
 //= rAthena Script Commands
 //===== By:==================================================
 //= rAthena Dev Team
@@ -135,11 +135,26 @@ 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. 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.
+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.
+
 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
@@ -188,6 +203,8 @@ 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
 
@@ -4212,7 +4229,11 @@ 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>" ]
+    [ 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> ]
  Account ID: If type is Account ID, attach the specified account ID.
 
 <flag> can prevent certain players from being attached:
@@ -5673,22 +5694,35 @@ Example:
 
 ---------------------------------------
 
-*searchstores <uses>,<effect>;
+*searchstores <uses>,<effect>{,"<map name>"};
 
 Invokes the store search window, which allows to search for both vending
-and buying stores. Parameter uses indicates, how many searches can be
-started, before the window has to be reopened. Effect value affects,
-what happens, when a result item is double-clicked and can be one of the
-following:
+and buying stores.
 
-	0 = Shows the store's position on the mini-map and highlights the
-	    shop sign with yellow color, when the store is on same map
-	    as the invoking player.
-	1 = Directly opens the shop, regardless of distance.
+Parameter <uses> indicates how many searches can be started
+before the window has to be reopened.
 
-Example:
-	// Item Universal_Catalog_Gold (10 uses, effect: open shop)
-	searchstores 10,1;
+Parameter <effect> affects what happens when a result item is double-clicked
+and can be one of the following:
+
+	SEARCHSTORE_EFFECT_NORMAL : Shows the store's position on the mini-map and highlights the
+								shop sign with yellow color, when the store is on same map
+								as the invoking player.
+	SEARCHSTORE_EFFECT_REMOTE : Directly opens the shop, regardless of distance.
+	
+Optional parameter <map name> indicates the name of map where the stores will be searched.
+If not set, the search will be on the map the invoking character is currently on.
+Special values for <map name> are:
+
+	"this" : Will search for stores on the map where the invoking character is currently on. (default)
+	"all"  : Will search for stores on all maps.
+
+Examples:
+	// Item Vending_Search_Scroll (10 uses, effect: show mark on minimap, current map)
+	searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
+	
+	// Search stores (1 use, effect: open shop, all maps on the server)
+	searchstores 1, SEARCHSTORE_EFFECT_REMOTE, "all";
 
 ---------------------------------------
 
@@ -6587,7 +6621,8 @@ 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_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				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_ALL				Sum of all the flags.
 
 Examples:
@@ -6616,8 +6651,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>.
 
@@ -6638,6 +6673,46 @@ Example:
 
 ---------------------------------------
 
+*permission_check(<permission>{,<char_id>});
+
+This command will return true if the attached character has the specified permission, false otherwise.
+If <char_id> is given, it will check the permission for that character instead.
+
+A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
+full permissions documentation can be found in 'doc/permissions.txt'.
+
+
+Example:
+	if (permission_check(PC_PERM_TRADE)) {
+		mes "You have permission to trade!";
+	}
+	else {
+		mes "You do not have permission to trade!";
+	}
+	end;
+
+---------------------------------------
+
+*permission_add(<permission>{,<char_id>});
+*permission_remove(<permission>{,<char_id>});
+
+These commands will temporarily add or remove the specified permission to the attached character,
+or the given <char_id> until the player logs out.
+
+A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
+full permissions documentation can be found in 'doc/permissions.txt'.
+
+Examples:
+	// Adds the 'can_trade' permission to the attached character,
+	// allowing them to trade, drop, sell, store and mail items.
+	permission_add(PC_PERM_TRADE);
+
+	// Removes the 'can_party' permission from the attached character,
+	// preventing them from joining or creating parties.
+	permission_remove(PC_PERM_PARTY);
+
+---------------------------------------
+
 ==================================
 |5.- Mob / NPC -related commands.|
 ==================================
@@ -7477,10 +7552,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 if not found.
+The function returns 1 if shop was updated successfully, or 0 on failure.
 
 NOTES:
- - That you cannot use -1 to specify default selling price!
+ - That you cannot use -1 to specify default selling price for cashshops, pointshops, or itemshops.
  - 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.
 
 ---------------------------------------
@@ -7492,10 +7567,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 if not found.
+The function returns 1 if shop was updated successfully, or 0 on failure.
 
 NOTES:
- - That you cannot use -1 to specify default selling price!
+ - That you cannot use -1 to specify default selling price for cashshops, pointshops, or itemshops.
  - 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.
 
@@ -7539,6 +7614,13 @@ 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>}}}}};
@@ -7933,17 +8015,15 @@ Return values:
 //
 ---------------------------------------
 
-*npcspeed <speed value>;
-*npcwalkto <x>,<y>;
-*npcstop;
+*npcspeed( <speed value> {,"<npc name>"} );
+*npcwalkto( <x>,<y> {,"<npc name>"} } );
+*npcstop( {"<npc name>", {"<flag>"}});
 
-These commands will make the NPC object in question move around the map. As they
-currently are, they are a bit buggy and are not useful for much more than making
-an NPC move randomly around the map.
+These commands will make the NPC object in question move around the map.
 
-'npcspeed' will set the NPCs walking speed to a specified value. As in the
-@speed GM command, 200 is the slowest possible speed while 0 is the fastest
-possible (instant motion). 100 is the default character walking speed.
+'npcspeed' will permanently set the NPCs walking speed to a specified value. As in the
+@speed GM command, MAX_WALK_SPEED (1000) is the slowest possible speed while MIN_WALK_SPEED (20) is the fastest
+possible (instant motion). DEFAULT_NPC_WALK_SPEED (200) is the default NPC walking speed.
 
 'npcwalkto' will start the NPC sprite moving towards the specified coordinates
 on the same map it is currently on. The script proceeds immediately after the
@@ -7951,10 +8031,17 @@ NPC begins moving.
 
 'npcstop' will stop the motion.
 
+The <flag> value in npcstop affects how the unit is stopped. The following flags are bitwise values (can be combined using the pipe operator):
+	USW_NONE = Unit will keep walking to their original destination.
+	USW_FIXPOS = Issue a fixpos packet afterwards.
+	USW_MOVE_ONCE = Force the unit to move one cell if it hasn't yet.
+	USW_MOVE_FULL_CELL = Enable moving to the next cell when unit was already half-way there (may cause on-touch/place side-effects, such as a scripted map change).
+	USW_FORCE_STOP = Force stop moving.
+Default: USW_FIXPOS | USW_MOVE_FULL_CELL | USW_FORCE_STOP
+
 While in transit, the NPC will be clickable, but invoking it will cause it to
 stop moving, which will make its coordinates different from what the client
-computed based on the speed and motion coordinates. The effect is rather
-unnerving.
+computed based on the speed and motion coordinates.
 
 Only a few NPC sprites have walking animations, and those that do, do not get
 the animation invoked when moving the NPC, due to the problem in the NPC walking
@@ -8413,6 +8500,14 @@ 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.
+
 ---------------------------------------
 \\
 6,1.- Unit-related commands
@@ -8947,8 +9042,9 @@ Get info of elemental of attached player or player by char_id.
 Other info can be obtained by 'getunitdata' command.
 
 Valid types are:
-   0: Elemental ID
-   1: Elemental Game ID
+   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)
 
 ---------------------------------------
 \\
@@ -9760,6 +9856,7 @@ For details on the other parameters, see 'announce'.
 
 This function checks if a party meets certain requirements, returning 1 if all
 conditions are met and 0 otherwise. It will only check online characters.
+The command returns 0 is the party ID does not exist.
 
 amount - number of online party members (default is 1).
 min    - minimum level of all characters in the party (default is 1).
@@ -10013,7 +10110,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 of the <ID2> to the the quest log, and the state is "active".
+Add quest <ID2> to the quest log, and the state is "active".
 
 ---------------------------------------
 
@@ -11117,7 +11214,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 the channel owner.
+will be the channel owner.
 
 Returns 1 on success.
 
@@ -11132,6 +11229,17 @@ 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.
@@ -11359,3 +11467,60 @@ 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.
+
+---------------------------------------

doc/skill_db.txt

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

doc/status.txt

@@ -254,6 +254,9 @@ Flags: Various status flags for specific status change events.
 	SuperNoviceAngel      - Status that is given from Super Novice Angel.
 	TaekwonAngel          - Status that is given from Taekwon Angel.
 
+	RemoveFromHomOnWarp    - Removes the status from the Homunculus when teleporting or warping to another map.
+	RemoveFromHomOnMapWarp - Removes the status from the Homunculus when warping to another map.
+
 ---------------------------------------
 
 MinDuration: Minimum duration, in milliseconds, after reduction calculation for status resistance.

doc/status_change.txt

@@ -1001,13 +1001,16 @@ SC_FLING	()
 	desc:
 	val1:
 
-SC_AVOID	()
-	desc:
-	val1:
+SC_AVOID	(EFST_HLIF_AVOID)
+	desc: Increase walkspeed for Players and Homunculus
+	val1: Skill Level
+	val2: Walkspeed increase (10 * val1 for Players, 40 * val1 for Homunculus)
 
-SC_CHANGE	()
-	desc:
-	val1:
+SC_CHANGE	(EFST_HLIF_CHANGE)
+	desc: Increase some Homunculus' statuses (VIT, INT); Uses MATK for damage calculation; Sets Homunculus' HP and SP to 10 on expiration; On Pre-Renewal, sets Homunculus' HP and SP to 100% on cast
+	val1: Skill Level
+	val2: VIT increase (20 * val1)
+	val3: INT increase (30 * val1)
 
 SC_BLOODLUST	()
 	desc:
@@ -2832,3 +2835,13 @@ 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

doc/yaml/db/license.yml

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2023 rAthena Development Team
+#   Copyright(C) 2024 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify

doc/yaml/db/mob_db.yml

@@ -39,6 +39,7 @@
 #   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)

doc/yaml/sql/mob_db.sql

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

doc/yaml/sql/mob_db2.sql

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

doc/yaml/sql/mob_db2_re.sql

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

doc/yaml/sql/mob_db_re.sql

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

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 loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Meltz]";

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 loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Erundek]";