Small correction

* Moved the emotion in NPC_EMOTION and NPC_EMOTION_ON skills in a separated field
** "...always,0,9,0x308D,,,,," : the emotion "9" is now saved in emotion2, this emotion coming from another table != the "global" emotion
* the corrections on NPC_EMOTION and NPC_EMOTION_ON are reverted, the corrections will be made in next PR after merge of mob skill DB

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: type:bug
+assignees: ''
+
+---
+
+<!-- NOTE: Anything within these brackets will be hidden on the preview of the Issue. -->
+
+* **rAthena Hash**: 
+
+<!-- Please specify the rAthena [GitHub hash](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) on which you encountered this issue. 
+How to get your GitHub Hash:
+1. cd your/rAthena/directory/
+2. git rev-parse --short HEAD
+3. Copy the resulting hash.
+-->
+
+* **Client Date**: 
+
+<!-- Please specify the client date you used. -->
+
+* **Server Mode**: 
+
+<!-- Which mode does your server use: Pre-Renewal or Renewal? -->
+
+* **Description of Issue**: 
+  * Result: <!-- Describe the issue that you experienced in detail. -->
+  * Expected Result: <!-- Describe what you would expect to happen in detail. -->
+  * How to Reproduce: <!-- If you have not stated in the description of the result already, please give us a short guide how we can reproduce your issue. -->
+  * Official Information: <!-- If possible, provide information from official servers (kRO or other sources) which prove that the result is wrong. Please take into account that iRO (especially iRO Wiki) is not always the same as kRO. -->
+  <!-- * _NOTE: Make sure you quote ``` `@atcommands` ``` just like this so that you do not tag uninvolved GitHub users!_ -->
+
+* **Modifications that may affect results**: 
+  <!-- * Please provide any information that could influence the expected result. -->
+  <!-- * This can be either configurations you changed, database values you changed, or even external source modifications. -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,81 +0,0 @@
-name: Bug Report
-description: Create an Issue that details broken or unexpected behaviour
-labels: ["type:bug"]
-body:
-  - type: input
-    id: hash
-    attributes:
-      label: rAthena Hash
-      description: |
-        Please specify the rAthena [GitHub hash](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) on which you encountered this issue.
-        One way to get your hash is to type `git rev-parse --short HEAD` on your console.
-    validations:
-      required: true
-  - type: input
-    id: date
-    attributes:
-      label: Client Date
-      description: Specify the client date you are using when this Issue occured.
-      placeholder: YYYY-MM-DD
-    validations:
-      required: true
-  - type: dropdown
-    id: mode
-    attributes:
-      label: Server Mode
-      description: Specify the server-mode you are using when this Issue occured.
-      multiple: true
-      options:
-        - Pre-Renewal
-        - Renewal
-    validations:
-      required: true
-  - type: textarea
-    id: result
-    attributes:
-      label: Result
-      description: Describe the issue that you experienced in detail.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Trigger event '...'
-        4. See error...
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant Log Output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: Shell
-    validations:
-      required: false
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected Result
-      description: Describe what you would expect to happen in detail.
-    validations:
-      required: true
-  - type: textarea
-    id: howto
-    attributes:
-      label: How to Reproduce
-      description: If you have not stated in the description of the result already, please give us a short guide how we can reproduce your issue.
-    validations:
-      required: true
-  - type: textarea
-    id: info
-    attributes:
-      label: Official Information
-      description: If possible, provide information from official servers (kRO or other sources) which prove that the result is wrong. Please take into account that iRO (especially iRO Wiki) is not always the same as kRO.
-    validations:
-      required: true
-  - type: textarea
-    id: modifications
-    attributes:
-      label: Modifications that may affect results
-      description: |
-        If you are using any modifications, especially in /src/, you must type them here.
-        Even the smallest changes can cause things to break. We need to know what you have customized.
-        This can be either configurations you changed, database values you changed, or even external source modifications.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: rAthena Community Support
-    url: https://rathena.org/board/forum/3-support-releases/
-    about: Please ask and answer questions here in our forum.
-  - name: rAthena Discord
-    url: https://rathena.org/board/discord/
-    about: Chat with us in the Discord support channel.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,35 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: type:enhancement
+assignees: ''
+
+---
+
+<!-- NOTE: Anything within these brackets will be hidden on the preview of the Feature Request. -->
+
+**Is your request related to a missing feature?**
+
+<!--
+  Provide a clear and concise description of what the feature pertains to.
+-->
+
+**Describe the solution you'd like**
+
+<!--
+  Provide a clear and concise description of what you want to happen.
+-->
+
+**Describe alternatives you've considered**
+
+<!--
+  Let us know about other solutions you've tried or researched.
+-->
+
+**Additional context**
+
+<!--
+  Is there anything else you can add about the proposal?
+  You might want to link to related issues here if you haven't already.
+-->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,32 +0,0 @@
-name: Feature Request
-description: Suggest an idea for this project
-labels: ["type:enhancement"]
-body:
-  - type: dropdown
-    id: missing
-    attributes:
-      label: Is your request related to a missing official feature?
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: Describe the solution you'd like
-      description: Provide a clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Describe alternatives you've considered
-      description: Let us know about other solutions you've tried or researched.
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: |
-        Is there anything else you can add about the proposal?
-        You might want to link to related issues here if you haven't already.

.github/workflows/build_servers_clang.yml

@@ -1,10 +1,6 @@
 name: Build servers with Clang
 # build_servers_clang.yml
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -26,11 +22,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
-          os: [ubuntu-20.04]
+          # The ubuntu-latest label currently points to ubuntu-18.04.
+          # Available: ubuntu-20.04, ubuntu-18.04
+          os: [ubuntu-18.04]
           # Version list can be found on https://github.com/marketplace/actions/install-clang
-          clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13']
+          clang: ['3.9', '4.0', '5.0', '6.0', '7', '8', '9', '10', '11'] #, '12', '13']
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/build_servers_cmake.yml

@@ -1,10 +1,6 @@
 name: Build servers with CMake
 # build_servers_cmake.yml
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -26,8 +22,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
+          # The ubuntu-latest label currently points to ubuntu-18.04.
+          # Available: ubuntu-20.04, ubuntu-18.04
           os: [ubuntu-latest]
 
     steps:

.github/workflows/build_servers_gcc.yml

@@ -1,10 +1,6 @@
 name: Build servers with GCC
 # build_servers_gcc.yml
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -26,11 +22,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
+          # The ubuntu-latest label currently points to ubuntu-18.04.
+          # Available: ubuntu-20.04, ubuntu-18.04
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['9', '10', '11']
+          gcc: ['7', '8', '9', '10']
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/build_servers_modes.yml

@@ -1,10 +1,6 @@
 name: Build servers in Pre-Renewal and Renewal
 # build_servers_modes.yml
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -26,11 +22,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
+          # The ubuntu-latest label currently points to ubuntu-18.04.
+          # Available: ubuntu-20.04, ubuntu-18.04	
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['11']
+          gcc: ['10']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE','RE']
 

.github/workflows/build_servers_msbuild.yml

@@ -1,10 +1,6 @@
 name: Build servers with MSVS
 # build_servers_msbuild.yml
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:

.github/workflows/build_servers_packetversions.yml

@@ -1,10 +1,6 @@
 name: Build servers with different packet versions
 # build_servers_packetversions.yml
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -26,11 +22,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
+          # The ubuntu-latest label currently points to ubuntu-18.04.
+          # Available: ubuntu-20.04, ubuntu-18.04	
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['11']
+          gcc: ['10']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE','RE']
           # Check build success for different packet-versions

.github/workflows/build_servers_vip.yml

@@ -1,10 +1,6 @@
 name: Build servers in VIP mode
 # build_servers_vip.yml
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -26,11 +22,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
+          # The ubuntu-latest label currently points to ubuntu-18.04.
+          # Available: ubuntu-20.04, ubuntu-18.04	
           os: [ubuntu-latest]
           # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['11']
+          gcc: ['10']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE', 'RE']
 

.github/workflows/npc_db_validation.yml

@@ -4,10 +4,6 @@ name: Validate NPC Scripts and DB Changes
 # For NPC and DB validation we only need two builds: one of Renewal and one for Pre-Renewal checks.
 # NPC scripts and database files are not platform dependent, so we can achieve this validation using only a simple linux setup.
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches:
@@ -29,11 +25,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
+          # The ubuntu-latest label currently points to ubuntu-18.04.
+          # Available: ubuntu-20.04, ubuntu-18.04	
           os: [ubuntu-latest]
           # Only a single version of GCC is required for validating NPC scripts and database changes.
-          gcc: ['11']
+          gcc: ['10']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE', 'RE']
 

.gitignore

@@ -1,5 +1,6 @@
-autom4te.cache/
-
+/autom4te.cache/output.0
+/autom4te.cache/requests
+/autom4te.cache/traces.0
 #Global
 .vscode
 .Apple*
@@ -39,10 +40,8 @@ Thumbs.db
 /Makefile
 /Makefile.cache
 /map-server
-/map-server-generator
 /mapcache
 /nbproject
-/web-server
 /yaml2sql
 /yamlupgrade
 
@@ -57,10 +56,6 @@ Thumbs.db
 # /3rdparty/yaml-cpp/
 /3rdparty/yaml-cpp/Makefile
 
-# /3rdparty/httplib/
-/3rdparty/httplib/Makefile
-/3rdparty/httplib/obj
-
 # /db/
 /db/import
 
@@ -97,10 +92,6 @@ Thumbs.db
 /src/map/obj_sql
 /src/map/pcre.hpp
 
-# /src/web
-/src/web/Makefile
-/src/web/obj
-
 # /src/tool/
 /src/tool/Makefile
 /src/tool/obj_all
@@ -134,10 +125,8 @@ Thumbs.db
 /mapserv.bat
 /runserver.bat
 /serv.bat
-/webserv.bat
 /yaml2sql.bat
 /yamlupgrade.bat
-/navigenerator.bat
 
 # dlls
 /libmysql.dll
@@ -146,6 +135,3 @@ Thumbs.db
 
 # CMakeFiles
 /CMakeFiles/
-
-# generated files
-generated

3rdparty/CMakeLists.txt

@@ -47,8 +47,6 @@ macro( CONFIGURE_WITH_LOCAL_OR_SYSTEM name )
 endmacro( CONFIGURE_WITH_LOCAL_OR_SYSTEM )
 
 
-add_subdirectory( httplib )
-add_subdirectory( json )
 add_subdirectory( libconfig )
 add_subdirectory( mysql )
 add_subdirectory( pcre )

3rdparty/README.txt

@@ -1,9 +1,7 @@
 This folder contains everything related to 3rdparty code or tools.
 
 cmake - scripts for the cmake build system (http://www.cmake.org)
-httplib - library for http web service (https://github.com/yhirose/cpp-httplib/commit/a9cf09795170a72372cbeb3feef3851b859c0e33)
 libconfig - library for processing structured configuration files (http://www.hyperrealm.com/libconfig/)
 mysql - library for MySQL Community Server (http://www.mysql.com)
 pcre - library for Perl Compatible Regular Expressions (http://www.pcre.org)
 zlib - library for DEFLATE lossless compression algorithm (http://www.zlib.net)
-json - library for nlohmann json (https://github.com/nlohmann/json/tree/4b2c8ce6bcfe7f39f2bb9e680c1e7a4d67c2dd48)

3rdparty/httplib/CMakeLists.txt

@@ -1,38 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-if ( NOT ENABLE_WEB_SERVER )
-    return()
-endif( NOT ENABLE_WEB_SERVER )
-
-SET (this_target httplib)
-PROJECT(${this_target})
-
-find_path ( HTTPLIB_INCLUDE_DIRS "httplib.h"
-    PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
-    NO_DEFAULT_PATH )
-
-find_path ( HTTPLIB_SOURCE_DIR "httplib.cc"
-    PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
-    NO_DEFAULT_PATH )
-
-mark_as_advanced( HTTPLIB_INCLUDE_DIRS )
-mark_as_advanced( HTTPLIB_SOURCE_DIR )
-
-set ( HTTPLIB_HEADERS
-    "${HTTPLIB_INCLUDE_DIRS}/httplib.h"
-    CACHE INTERNAL "httplib headers" )
-
-set ( HTTPLIB_SOURCES
-    "${HTTPLIB_SOURCE_DIR}/httplib.cc"
-    CACHE INTERNAL "httplib sources" )
-
-set ( HTTPLIB_DEFINITIONS
-    "-std=c++11"
-    CACHE INTERNAL "http definitions" )
-include_directories( ${HTTPLIB_INCLUDE_DIRS} ${HTTPLIB_SOURCE_DIR} )
-
-ADD_LIBRARY( ${this_target} STATIC ${HTTPLIB_SOURCES} )
-
-if (NOT WIN32)
-    target_compile_definitions(${this_target} PUBLIC "CPPHTTPLIB_SEND_FLAGS=MSG_NOSIGNAL")
-endif()

3rdparty/httplib/Makefile.in

@@ -1,43 +0,0 @@
-
-HTTPLIB_OBJ =  $(shell find * -type f -name "*.cc" | sed -e "s/\.cc/\.o/g")
-HTTPLIB_DIR_OBJ = $(HTTPLIB_OBJ:%=obj/%)
-HTTPLIB_H =  $(shell find * -type f -name "*.h")
-HTTPLIB_AR = obj/httplib.a
-
-CXXFLAG =-std=c++11
-
-HTTPLIB_DEPENDS=httplib
-
-@SET_MAKE@
-
-#####################################################################
-.PHONY : all clean help httplib
-
-all: $(HTTPLIB_DEPENDS)
-
-clean:
-	@echo "	CLEAN	httplib"
-	@rm -rf obj *.o
-
-help:
-	@echo "possible targets are 'all' 'clean' 'help'"
-	@echo "'httplib' - build $(HTTPLIB_AR)
-	@echo "'all'       - builds $(HTTPLIB_DIR_OBJ)"
-	@echo "'clean'     - deletes $(HTTPLIB_DIR_OBJ)"
-	@echo "'help'      - outputs this message"
-
-#####################################################################
-
-obj:
-	@echo "	MKDIR	obj"
-	@mkdir -p obj
-	
-obj/%.o: %.cc $(HTTPLIB_H)
-	@echo "	CXX	$<"
-	@@CXX@ $(CXXFLAG) @CFLAGS_AR@ @CPPFLAGS@ -DCPPHTTPLIB_SEND_FLAGS=MSG_NOSIGNAL -g -c $(OUTPUT_OPTION) $<
-
-httplib: obj $(HTTPLIB_DIR_OBJ) $(HTTPLIB_AR)
-
-$(HTTPLIB_AR): $(HTTPLIB_DIR_OBJ)
-	@echo "	AR	$@"
-	@@AR@ rcs obj/httplib.a $(HTTPLIB_DIR_OBJ)

3rdparty/httplib/httplib.vcxproj

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="httplib.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="httplib.cc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libconfig</RootNamespace>
-    <ProjectGuid>{7A1A25BC-2CF7-44B2-8CAF-B4273B510FC6}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir).vs\build\</OutDir>
-    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir).vs\build\</OutDir>
-    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir).vs\build\</OutDir>
-    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir).vs\build\</OutDir>
-    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

3rdparty/httplib/httplib.vcxproj.filters

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="httplib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="httplib.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

3rdparty/json/CMakeLists.txt

@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set (JSON_INCLUDE_DIRS
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    CACHE INTERNAL "json include dir" )
-
-mark_as_advanced( JSON_INCLUDE_DIRS )

3rdparty/json/LICENSE.MIT

@@ -1,21 +0,0 @@
-MIT License 
-
-Copyright (c) 2013-2022 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

3rdparty/json/include/nlohmann/json_fwd.hpp

@@ -1,177 +0,0 @@
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-// #include <nlohmann/detail/abi_macros.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// This file contains all macro definitions affecting or depending on the ABI
-
-#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
-    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
-        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2
-            #warning "Already included a different version of the library!"
-        #endif
-    #endif
-#endif
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_PATCH 2   // NOLINT(modernize-macro-to-enum)
-
-#ifndef JSON_DIAGNOSTICS
-    #define JSON_DIAGNOSTICS 0
-#endif
-
-#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
-#endif
-
-#if JSON_DIAGNOSTICS
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
-#else
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
-#endif
-
-#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
-#else
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
-    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
-#endif
-
-// Construct the namespace ABI tags component
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
-
-#define NLOHMANN_JSON_ABI_TAGS                                       \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
-            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
-            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
-
-// Construct the namespace version component
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
-    _v ## major ## _ ## minor ## _ ## patch
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
-
-#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
-#define NLOHMANN_JSON_NAMESPACE_VERSION
-#else
-#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
-                                           NLOHMANN_JSON_VERSION_MINOR, \
-                                           NLOHMANN_JSON_VERSION_PATCH)
-#endif
-
-// Combine namespace components
-#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
-#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
-    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
-
-#ifndef NLOHMANN_JSON_NAMESPACE
-#define NLOHMANN_JSON_NAMESPACE               \
-    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
-            NLOHMANN_JSON_ABI_TAGS,           \
-            NLOHMANN_JSON_NAMESPACE_VERSION)
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
-#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
-    namespace nlohmann                               \
-    {                                                \
-    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
-                NLOHMANN_JSON_ABI_TAGS,              \
-                NLOHMANN_JSON_NAMESPACE_VERSION)     \
-    {
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_END
-#define NLOHMANN_JSON_NAMESPACE_END                                     \
-    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
-    }  // namespace nlohmann
-#endif
-
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-/// a class to store JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
-         class CustomBaseClass = void>
-class basic_json;
-
-/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-/// @sa https://json.nlohmann.me/api/json_pointer/
-template<typename RefStringType>
-class json_pointer;
-
-/*!
-@brief default specialization
-@sa https://json.nlohmann.me/api/json/
-*/
-using json = basic_json<>;
-
-/// @brief a minimal map-like container that preserves insertion order
-/// @sa https://json.nlohmann.me/api/ordered_map/
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/// @brief specialization that maintains the insertion order of object keys
-/// @sa https://json.nlohmann.me/api/ordered_json/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-NLOHMANN_JSON_NAMESPACE_END
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
-

CMakeLists.txt

@@ -226,10 +226,6 @@ endif()
 message( STATUS "Detecting networking library (socket/nsl/ws2_32) - done" )
 endif()
 
-#
-# enable web server?
-#
-option( ENABLE_WEB_SERVER "Build web-server (default=ON)" ON )
 
 #
 # Test for big endian

CODE_OF_CONDUCT.md

@@ -1,126 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, posting on the forums with an account in a Staff group, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement via
-the Report Center on our forums. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. In the event that a user is uncontactable through normal means, the offending content will be hidden. A second infraction from a user with no means of communication will result in immediate Temporary Ban. See section 3.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[Contributor Covenant](https://www.contributor-covenant.org)
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

Makefile.in

@@ -4,12 +4,11 @@ HAVE_MYSQL=@HAVE_MYSQL@
 OMAP=@OMAP@
 ifeq ($(HAVE_MYSQL),yes)
 	ALL_DEPENDS=server tools
-	SERVER_DEPENDS=common login char map web import
+	SERVER_DEPENDS=common login char map import
 	COMMON_DEPENDS=libconfig rapidyaml yaml-cpp
 	LOGIN_DEPENDS=libconfig common
 	CHAR_DEPENDS=libconfig common rapidyaml
 	MAP_DEPENDS=libconfig common rapidyaml
-	WEB_DEPENDS=libconfig common yaml-cpp httplib
 else
 	ALL_DEPENDS=needs_mysql
 	SERVER_DEPENDS=needs_mysql
@@ -17,7 +16,6 @@ else
 	LOGIN_DEPENDS=needs_mysql
 	CHAR_DEPENDS=needs_mysql
 	MAP_DEPENDS=needs_mysql
-	WEB_DEPENDS=needs_mysql
 endif
 
 
@@ -27,7 +25,6 @@ endif
 	login \
 	char \
 	map \
-	web \
 	tools \
 	import \
 	clean help \
@@ -52,15 +49,11 @@ char: $(CHAR_DEPENDS)
 map: $(MAP_DEPENDS)
 	@$(MAKE) -C src/map server
 
-web: $(WEB_DEPENDS)
-	@$(MAKE) -C src/web server
-
 libconfig:
 	@$(MAKE) -C 3rdparty/libconfig
 
 tools:
 	@$(MAKE) -C src/tool
-	@$(MAKE) -C src/map tools
 
 rapidyaml:
 	@$(MAKE) -C 3rdparty/rapidyaml
@@ -68,9 +61,6 @@ rapidyaml:
 yaml-cpp:
 	@$(MAKE) -C 3rdparty/yaml-cpp
 
-httplib:
-	@$(MAKE) -C 3rdparty/httplib
-
 import:
 # 1) create conf/import folder
 # 2) add missing files
@@ -91,11 +81,9 @@ clean:
 	@$(MAKE) -C 3rdparty/libconfig $@
 	@$(MAKE) -C 3rdparty/rapidyaml $@
 	@$(MAKE) -C 3rdparty/yaml-cpp $@
-	@$(MAKE) -C 3rdparty/httplib $@
 	@$(MAKE) -C src/login $@
 	@$(MAKE) -C src/char $@
 	@$(MAKE) -C src/map $@
-	@$(MAKE) -C src/web $@
 	@$(MAKE) -C src/tool $@
 
 help:
@@ -105,11 +93,9 @@ help:
 	@echo "'libconfig'   - builds object files of libconfig"
 	@echo "'rapidyaml'   - builds object files of rapidyaml"
 	@echo "'yaml-cpp'    - builds object files of yaml-cpp"
-	@echo "'httplib'     - builds object files of httplib"
 	@echo "'login'       - builds login server"
 	@echo "'char'        - builds char server"
 	@echo "'map'         - builds map server"
-	@echo "'web'         - builds web server"
 	@echo "'tools'       - builds all the tools in src/tools"
 	@echo "'import'      - builds conf/import, conf/msg_conf/import and db/import folders from their template folders (x-tmpl)"
 	@echo "'all'         - builds all the above targets"

athena-start

@@ -20,7 +20,8 @@ print_start() {
 get_status(){
 	PIDFILE=.$1.pid
 	if [ -e ${PIDFILE} ]; then
-		PSRUN=$(pgrep -F ${PIDFILE})
+		ISRUN=$(ps ax | grep $(cat ${PIDFILE}) | grep $1)
+		PSRUN=$(echo "$ISRUN" | awk '{ print $1 }')
 	fi
 	#return ${PSRUN} #seems to cause an issue for some os
 }
@@ -35,11 +36,11 @@ start_serv(){
 		echo "stat_serv, log is enabled"
 		echo "My logfile=${LOGFILE}"
 		if [ -z ${PSRUN} ]; then
-			if [ -e ./${FIFO} ]; then rm "$FIFO"; fi
+		if [ -e ./${FIFO} ]; then rm "$FIFO"; fi
 			mkfifo "$FIFO"; tee "$LOGRUN" < "$FIFO" & "./$1" > "$FIFO" 2>&1 & PID=$!
 			#"./$1" > >(tee "$LOGRUN") 2>&1 & PID=$! #bash only
 			echo "$PID" > .$1.pid
-			echo "Server '$1' started at $(date +"%m-%d-%H:%M-%S")" | tee ${LOGFILE}
+			echo "Server '$1' started at `date +"%m-%d-%H:%M-%S"`" | tee ${LOGFILE}
 		else
 			echo "Cannot start '$1', because it is already running p${PSRUN}" | tee ${LOGFILE}
 		fi
@@ -47,7 +48,7 @@ start_serv(){
 		if [ -z ${PSRUN} ]; then
 			./$1&
 			echo "$!" > .$1.pid
-			echo "Server '$1' started at $(date +"%m-%d-%H:%M-%S")"
+			echo "Server '$1' started at `date +"%m-%d-%H:%M-%S"`"
 		else
 			echo "Cannot start '$1', because it is already running p${PSRUN}"
 		fi
@@ -60,25 +61,25 @@ watch_serv(){
 	#now checking status and looping
 	count=0;
 	while true; do
-		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV}
 		do
 			LOGFILE="$LOG_DIR/$i.launch.log"
 			LOGRUN="$LOG_DIR/$i.log"
 			FIFO=$i"_fifo"
-
-			get_status ${i}
+	
+			get_status $i
 			#echo "Echo id of $i is ${PSRUN}"
 			if [ -z ${PSRUN} ]; then
 				count=$((count+1))
 				#echo "fifo=$FIFO"
 				echo "server '$i' is down"
 				echo "server '$i' is down" >> ${LOGFILE}
-				echo "restarting server at time at $(date +"%m-%d-%H:%M-%S")"
-				echo "restarting server at time at $(date +"%m-%d-%H:%M-%S")" >> ${LOGFILE}
+				echo "restarting server at time at `date +"%m-%d-%H:%M-%S"`" 
+				echo "restarting server at time at `date +"%m-%d-%H:%M-%S"`" >> ${LOGFILE}
 				if [ -e $FIFO ]; then rm $FIFO; fi
 				mkfifo "$FIFO"; tee "$LOGRUN" < "$FIFO" & "./$i" > "$FIFO" 2>&1 & PID=$!
 				echo "$PID" > .$i.pid
-				if [ $2 ] && [ $2 -lt $count ]; then break; fi
+				if [ $2 ] && [ $2 -lt $count ]; then break; fi   
 			fi
 		done
 		sleep $1
@@ -88,7 +89,7 @@ watch_serv(){
 restart(){
 	$0 stop
 	if [ $1 ]; then sleep $1; fi
-	for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
+	for i in ${L_SRV} ${C_SRV} ${M_SRV}
 	do
 		FIFO="$1_fifo"
 		while true; do
@@ -100,11 +101,11 @@ restart(){
 			fi
 		done
 	done
-	$0 start
+  $0 start
 }
 
 case $1 in
-	'start')
+    'start')
 		print_start
 		check_files
 		echo "Check complete."
@@ -116,26 +117,26 @@ case $1 in
 		else
 		 echo "Logging is disabled"
 		fi
-		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV}
 		do
 			start_serv $i $ENLOG
 		done
 		echo "rAthena was started."
 	;;
-	'watch')
+    'watch')
 		if [ ! -d "$LOG_DIR" ]; then mkdir -p $LOG_DIR; fi
 		if [ -z $2 ]; then Restart_count=10; else Restart_count=$2; fi
 		if [ -z $3 ]; then Restart_sleep=3; else Restart_sleep=$3; fi
 		echo "Going to watch rAthena for restart_count = $Restart_count, restart_sleep = $Restart_sleep"
-		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV}
 		do
 			start_serv $i 1
 		done
 		watch_serv $Restart_count $Restart_sleep
 		echo "Watching rAthena now."
-	;;
+	;;	
 	'stop')
-		for i in ${W_SRV} ${M_SRV} ${C_SRV} ${L_SRV}
+		for i in ${M_SRV} ${C_SRV} ${L_SRV}
 		do
 			PIDFILE=.${i}.pid
 			if [ -e ./${PIDFILE} ]; then
@@ -154,23 +155,23 @@ case $1 in
 		done
 	;;
 	'restart')
-		 restart "$@"
+		 restart
 	;;
 	'status')
-		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV}
 		do
 			get_status ${i}
 			if [ ${PSRUN} ]; then echo "'${i}' is running p${PSRUN}"; else echo "'${i}' seems to be down"; fi
 		done
 	;;
 	'val_runonce')
-		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV}
 		do
 			valgrind --leak-check=full --show-leak-kinds=all ./$i --run-once > "log/$i.runonce.leak"
 		done
 	;;
 	'valchk')
-		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV}
 		do
 			valgrind --leak-check=full --show-leak-kinds=all ./$i > "log/$i.runonce.leak"
 		done
@@ -180,7 +181,7 @@ case $1 in
 			'start')
 				echo "syntax: 'start {--enlog}'"
 				echo "This option will start the servers"
-				echo "--enlog will write all terminal output into a log/\$servname.log file"
+				echo "--enlog will write all terminal output into a log/$servname.log file"
 			;;
 			'stop')
 				echo "This option will shut the servers down"
@@ -204,11 +205,11 @@ case $1 in
 			;;
 			'val_runonce')
 				echo "syntax: 'val_runonce'"
-				echo "This option will run valgrind with run-once to check the servers"
+				echo "This option will run valgrin with run-once to check the servers"
 			;;
 			'valchk')
 				echo "syntax: 'valchk'"
-				echo "This option will run valgrind with the servers"
+				echo "This option will run valgrin with the servers"
 			;;
 			*)
 				echo "Please specify a command you would like more info on { start | stop | restart | status | watch }"

conf/atcommands.yml

@@ -664,9 +664,6 @@ Body:
   - Command: refine
     Help: |
       Params: <equip position> <+/- amount>
-  - Command: grade
-    Help: |
-      Params: <equip position> <+/- amount>
   - Command: produce
     Help: |
       Params: <equip name or equip ID> <element> <# of very's>
@@ -1016,9 +1013,6 @@ Body:
   - Command: enchantgradeui
     Help: |
       Opens the enchantgrade UI.
-  - Command: roulette
-    Help: |
-      Opens the roulette UI.
 
 Footer:
   Imports:

conf/battle/client.conf

@@ -118,6 +118,12 @@ client_reshuffle_dice: yes
 // NOTE: Enabling this option degrades performance.
 client_sort_storage: no
 
+// Do we allow to change guilde emblem during woe_time?
+emblem_woe_change: yes
+
+// How many transparent pixel can be found in emblem before detected as invalid? (Note 2)
+emblem_transparency_limit: 80
+
 // Update enemy position while in invisible state? (Note 1)
 // NOTE: Set to 'no' will make client won't update enemy position unless the players have "Intravision" effect.
 //       So that will help client handling WPE - Maya Purple Hack stuff.
@@ -148,13 +154,3 @@ show_skill_scale: yes
 // Note: Enabling this is known to cause problems on clients that make use of REST API calls.
 // Official: no
 drop_connection_on_quit: no
-
-// Macro Detector retries
-// Number of times someone can fail the macro detection before being banned.
-// Official: 3 (minimum: 1)
-macro_detection_retry: 3
-
-// Macro Detector timeout
-// Amount of time in milliseconds before the macro detection will fail and the user will be banned.
-// Official: 60000
-macro_detection_timeout: 60000

conf/battle/feature.conf

@@ -56,7 +56,7 @@ feature.autotrade_head_direction: 0
 //  1 = Sitting
 feature.autotrade_sit: 1
 
-// Delay in milliseconds to open vending/buyingsotre after player logged in.
+// Delay in miliseconds to open vending/buyingsotre after player logged in.
 feature.autotrade_open_delay: 5000
 
 // Battlegrounds queue interface. Makes it possible to queue for a battleground anywhere using the battle menu.
@@ -119,26 +119,3 @@ feature.barter: on
 // Extended Barter Shop System (Note 1)
 // Requires: 2019-11-06RagexeRE or later
 feature.barter_extended: on
-
-// The timeout in milliseconds when a dynamic NPC will be despawned if not used.
-// Default: 60000 (60s)
-feature.dynamicnpc_timeout: 60000
-
-// The x range in which the dynamic NPC will be spawned relative to the player.
-// Default: 2
-feature.dynamicnpc_rangex: 2
-
-// The y range in which the dynamic NPC will be spawned relative to the player.
-// Default: 2
-feature.dynamicnpc_rangey: 2
-
-// Should the dynamic NPCs look into the direction of the player? (Note 1)
-// Default: no
-feature.dynamicnpc_direction: no
-
-// Itemlink System on informational related commands (Note 1)
-// Generates <ITEML> string for an item and can be used for npctalk, message,
-// dispbottom, and broadcast commands. The result is clickable-item name just
-// like from SHIFT+Click from player's inventory/cart/equipment window.
-// Requires: 2010-00-00RagexeRE or later
-feature.itemlink: on

conf/battle/guild.conf

@@ -17,13 +17,7 @@ guild_exp_limit: 50
 guild_max_castles: 0
 
 // Activate guild skills delay by relog?
-// 0 - Save cooldown and resume on relog.
-// 1 - Don't save cooldown and restart the timer on relog.
-// Default on official servers: 1 for Pre-renewal, 0 for Renewal
-//guild_skill_relog_type: 0
-
-// Delay in milliseconds that are applied to guild skills.
-// Official setting is 5 minutes (300000 ms).
+// Official setting is 5 minutes (300000 ms), otherwise allow guild leaders to relog to cancel the 5 minute delay.
 // Note: This was changed in renewal in favor of individual skill cooldown.
 guild_skill_relog_delay: 300000
 

conf/battle/items.conf

@@ -116,7 +116,7 @@ default_bind_on_equip: 4
 allow_bound_sell: 0x0
 
 // Hide n last characters of player's name with asterisk (*) when the player
-// obtained an item with special broadcast flag or refined an item at a level with broadcast flag.
+// obtained an item with special broadcast flag.
 // Note: Players with short names can be fully converted to asterisks if this
 // config value is set high.
 broadcast_hide_name: 2

conf/char_athena.conf

@@ -121,8 +121,7 @@ start_point_doram: lasa_fild01,48,297
 // Format: <id>,<amount>,<position>{:<id>,<amount>,<position>...}
 // To auto-equip an item, include the position where it will be equipped; otherwise, use zero.
 // NOTE: For Doram, this requires client 20151001 or newer.
-start_items: 1201,1,2:2301,1,16:23484,1,0
-start_items_pre: 1201,1,2:2301,1,16
+start_items: 1201,1,2:2301,1,16
 start_items_doram: 1681,1,2:2301,1,16
 
 // Starting zeny for new characters

conf/groups.yml

@@ -216,7 +216,6 @@ Body:
       hack_info: true
       any_warp: true
       view_hpmeter: true
-      macro_detect: true
   - Id: 99
     Name: Admin
     Level: 99
@@ -239,7 +238,6 @@ Body:
       item_unconditional: false
       bypass_stat_onclone: true
       bypass_max_stat: true
-      macro_register: true
       #all_permission: true
 
 Footer:

conf/inter_athena.conf

@@ -15,12 +15,6 @@ party_share_level: 15
 // Amount of status points a new character will start with
 start_status_points: 48
 
-// Do we allow to change guild emblem during woe_time?
-emblem_woe_change: yes
-
-// How many transparent pixel can be found in emblem before detected as invalid? (Note 2)
-emblem_transparency_limit: 80
-
 // You can specify the codepage to use in your MySQL tables here.
 // (Note that this feature requires MySQL 4.1+)
 //default_codepage:
@@ -64,13 +58,6 @@ map_server_id: ragnarok
 map_server_pw: ragnarok
 map_server_db: ragnarok
 
-// MySQL Web Server
-web_server_ip: 127.0.0.1
-web_server_port: 3306
-web_server_id: ragnarok
-web_server_pw: ragnarok
-web_server_db: ragnarok
-
 // MySQL Log Database
 log_db_ip: 127.0.0.1
 log_db_port: 3306
@@ -165,14 +152,6 @@ market_table: market
 roulette_table: db_roulette
 guild_storage_log: guild_storage_log
 
-// Web Database Tables
-// NOTE: The web server reads the login (login) and char (guild) tables, so it needs
-//       the ability to connect to those databases.
-guild_emblems: guild_emblems
-user_configs: user_configs
-char_configs: char_configs
-merchant_configs: merchant_configs
-
 // Use SQL item_db, mob_db and mob_skill_db for the map server? (yes/no)
 use_sql_db: no
 

conf/login_athena.conf

@@ -167,11 +167,6 @@ client_hash_check: off
 // This is required for new clients that get data via an additional API over HTTP
 use_web_auth_token: yes
 
-// Delay (in milliseconds) disabling webtoken after character logs off
-// There's a race condition when the client logs off. The char-server could revoke the token before
-// the client can save the changed configs.
-disable_webtoken_delay: 10000
-
 // Client MD5 hashes
 // The client with the specified hash can be used to log in by players with
 // a group_id equal to or greater than the given value.

conf/maps_athena.conf

@@ -1503,60 +1503,5 @@ map: 1@jorchs
 map: 1@jorlab
 map: 1@whl
 
-// Extended Jobs
-map: 1@exhn
-map: 1@exds
-map: 2@exds
-map: 1@exse
-map: 1@exnw
-map: 1@exsr
-map: 1@exsh
-
-// Varmundt's Biosphere
-map: bl_grass
-map: bl_lava
-map: bl_ice
-map: bl_death
-
-// Clock Tower: Unknown Basement
-map: clock_01
-
-// Ragnarok Festival
-map: rag_fes
-map: rag_fes_a
-
-// 20th Anniversary
-map: memohall
-map: 1@dime
-
-// Fantasy maps
-map: prt_elib
-map: 1@vrcas
-map: 1@vrev
-map: 1@vrgen
-map: 1@vrpo
-
-// ??
-map: 1@pdb
-map: airplane2
-map: vr_bob
-
-// Heroria
-map: hero_dun1
-map: hero_ent1
-map: hero_ent2
-map: hero_ent3
-map: hero_in1
-map: hero_in2
-map: hero_in3
-map: hero_in4
-map: hero_lb
-map: hero_out1
-map: hero_out2
-map: hero_out3
-map: hero_out4
-map: hero_tra
-map: herosria
-
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------

conf/msg_conf/map_msg.conf

@@ -924,10 +924,7 @@
 // General packet version check messages
 828: This command requires packet version %s or newer.
 
-// Enchant UI
-829: Enchanting is not possible for your item's enchant grade.
-
-//830-899 free
+//829-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1789,9 +1786,5 @@
 1517: Cannot add fame to class '%s'.
 1518: %d points were added to '%s'.
 
-// @grade
-1519: Please enter a position and an amount (usage: @grade <equip position> <+/- amount>).
-1520: %d items have been graded.
-
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt

conf/msg_conf/web_msg.conf

@@ -1,3 +0,0 @@
-// rAthena msg_athena.conf
-// Message Configuration of web-server
-// -----------------------

conf/web_athena.conf

@@ -1,56 +0,0 @@
-// rAthena Web Server configuration file.
-
-// Note: "Comments" are all text on the right side of a double slash "//"
-// Whatever text is commented will not be parsed by the servers, and serves
-// only as information/reference.
-
-// The web server listens on the interface with this IP address.
-// NOTE: This allows you to run multiple servers on multiple interfaces
-// while using the same ports for each server.
-//bind_ip: 127.0.0.1
- 
-// Web Server Port
-web_port: 8888
-
-//Time-stamp format which will be printed before all messages.
-//Can at most be 20 characters long.
-//Common formats:
-// %I:%M:%S %p (hour:minute:second 12 hour, AM/PM format)
-// %H:%M:%S (hour:minute:second, 24 hour format)
-// %d/%b/%Y (day/Month/year)
-//For full format information, consult the strftime() manual.
-//timestamp_format: [%d/%b %H:%M]
-
-//If redirected output contains escape sequences (color codes)
-stdout_with_ansisequence: no
-
-//Makes server log selected message types to a file in the /log/ folder
-//1: Log Warning Messages
-//2: Log Error and SQL Error messages.
-//4: Log Debug Messages
-//Example: "console_msg_log: 7" logs all 3 kinds
-//Messages logged by this overrides console_silent setting
-console_msg_log: 0
-
-// File path to store the console messages above
-console_log_filepath: ./log/web-msg_log.log
-
-//Makes server output more silent by omitting certain types of messages:
-//1: Hide Information messages
-//2: Hide Status messages
-//4: Hide Notice Messages
-//8: Hide Warning Messages
-//16: Hide Error and SQL Error messages.
-//32: Hide Debug Messages
-//Example: "console_silent: 7" Hides information, status and notice messages (1+2+4)
-console_silent: 0
-
-// Print requests and responses?
-// This is useful for debugging purposes, it will print the entire
-// request and response for each transaction.
-print_req_res: off
-
-// Allow GIF images to be uploaded as guild emblem?
-allow_gifs: yes
-
-import: conf/import/web_conf.txt

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision.
+# From configure.in Revision.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -642,7 +642,6 @@ ac_ct_CC
 CFLAGS
 CC
 SET_MAKE
-OWEB
 OMAP
 OCHR
 OLOG
@@ -675,7 +674,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -714,7 +712,6 @@ with_maxconn
 with_outputlogin
 with_outputchar
 with_outputmap
-with_outputweb
 with_mysql
 with_MYSQL_CFLAGS
 with_MYSQL_LIBS
@@ -771,7 +768,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1024,15 +1020,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1170,7 +1157,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1323,7 +1310,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1381,10 +1367,9 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-maxconn[=ARG]    optionally set the maximum connections the core can
-                          handle. By default the system header value will be
-                          used. This will only be the compile time limit, make
-                          sure you set the correct limit with ulimit on your
-                          OS.
+                          handle. By default the system header value will be used.
+                          This will only be the compile time limit, make sure
+                          you set the correct limit with ulimit on your OS.
   --with-outputlogin[=ARG]
                           Specify the login-serv output name (defaults to
                           login-server)
@@ -1392,8 +1377,6 @@ Optional Packages:
                           char-server)
   --with-outputmap[=ARG]  Specify the map-serv output name (defaults to
                           map-server)
-  --with-outputweb[=ARG]  Specify the web-serv output name (defaults to
-                          web-server)
   --with-mysql[=ARG]      optionally specify the path to the mysql_config
                           executable
   --with-MYSQL_CFLAGS=ARG specify MYSQL_CFLAGS manually (instead of using
@@ -1735,6 +1718,44 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_cxx_check_header_compile
 
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
 # ac_fn_cxx_try_link LINENO
 # -------------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1781,44 +1802,6 @@ fi
 
 } # ac_fn_cxx_try_link
 
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
 # ac_fn_cxx_check_func LINENO FUNC VAR
 # ------------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2757,14 +2740,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_config_files="$ac_config_files Makefile src/common/Makefile"
 
-ac_config_files="$ac_config_files 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile 3rdparty/rapidyaml/Makefile 3rdparty/httplib/Makefile"
+ac_config_files="$ac_config_files 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile 3rdparty/rapidyaml/Makefile"
 
 ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile"
 
 ac_config_files="$ac_config_files src/map/Makefile src/tool/Makefile"
 
-ac_config_files="$ac_config_files src/web/Makefile"
-
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -3303,10 +3284,11 @@ rm -f core conftest.err conftest.$ac_objext \
 $as_echo "$have_linux_epoll" >&6; }
 fi
 if test x$enable_epoll,$have_linux_epoll = xyes,no; then
-	as_fn_error $? "epoll support explicitly enabled but not available" "$LINENO" 5
+    as_fn_error $? "epoll support explicitly enabled but not available" "$LINENO" 5
 fi
 
 
+
 #
 # debug
 #
@@ -3482,24 +3464,18 @@ fi
 
 
 #
-# Optionally set the maximum number of network connections
-# the core will be able to handle
+# Optionally set the max number of network conenctions
+# the core will be support
 #
 
 # Check whether --with-maxconn was given.
 if test "${with_maxconn+set}" = set; then :
   withval=$with_maxconn;
-		if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
-			as_fn_error $? "Invalid argument --with-maxconn=$withval ... stopping" "$LINENO" 5
-		else
-			CPPFLAGS="$CPPFLAGS -DMAXCONN=$withval"
-		fi
-
-else
-
-		CPPFLAGS="$CPPFLAGS"
-
-
+	if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
+		as_fn_error $? "Invalid argument --with-maxconn=$withval ... stopping" "$LINENO" 5
+	else
+		CPPFLAGS="$CPPFLAGS -DMAXCONN=$withval"
+	fi
 fi
 
 
@@ -3544,18 +3520,6 @@ OMAP=$output_map
 
 
 
-# Check whether --with-outputweb was given.
-if test "${with_outputweb+set}" = set; then :
-  withval=$with_outputweb; output_web="$withval"
-else
-  output_web="web-server"
-
-fi
-
-OWEB=$output_web
-
-
-
 #
 # Optionally specify the path to mysql_config
 #
@@ -7063,6 +7027,7 @@ fi
 
 
 
+
 #
 # Host specific stuff
 #
@@ -7127,8 +7092,8 @@ $as_echo "$as_me: CFLAGS_AR= $CFLAGS_AR" >&6;}
 $as_echo "$as_me: LDFLAGS= $LDFLAGS" >&6;}
 #AC_MSG_NOTICE([PROD_WARN= $PROD_WARN])
 #AC_MSG_NOTICE([EXTRA_WARN= $EXTRA_WARN])
-{ $as_echo "$as_me:${as_lineno-$LINENO}: output name =  $output_login, $output_char, $output_map, $output_web" >&5
-$as_echo "$as_me: output name =  $output_login, $output_char, $output_map, $output_web" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: output name =  $output_login, $output_char, $output_map" >&5
+$as_echo "$as_me: output name =  $output_login, $output_char, $output_map" >&6;}
 
 ###############################################################################
 cat >confcache <<\_ACEOF
@@ -7842,12 +7807,10 @@ do
     "3rdparty/libconfig/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/libconfig/Makefile" ;;
     "3rdparty/yaml-cpp/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/yaml-cpp/Makefile" ;;
     "3rdparty/rapidyaml/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/rapidyaml/Makefile" ;;
-    "3rdparty/httplib/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/httplib/Makefile" ;;
     "src/char/Makefile") CONFIG_FILES="$CONFIG_FILES src/char/Makefile" ;;
     "src/login/Makefile") CONFIG_FILES="$CONFIG_FILES src/login/Makefile" ;;
     "src/map/Makefile") CONFIG_FILES="$CONFIG_FILES src/map/Makefile" ;;
     "src/tool/Makefile") CONFIG_FILES="$CONFIG_FILES src/tool/Makefile" ;;
-    "src/web/Makefile") CONFIG_FILES="$CONFIG_FILES src/web/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.in

@@ -8,10 +8,9 @@ AC_LANG([C++])
 AC_LANG_COMPILER_REQUIRE
 AC_CONFIG_SRCDIR([src/common/cbasetypes.hpp])
 AC_CONFIG_FILES([Makefile src/common/Makefile])
-AC_CONFIG_FILES([3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile 3rdparty/rapidyaml/Makefile 3rdparty/httplib/Makefile])
+AC_CONFIG_FILES([3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile 3rdparty/rapidyaml/Makefile])
 AC_CONFIG_FILES([src/char/Makefile src/login/Makefile])
 AC_CONFIG_FILES([src/map/Makefile src/tool/Makefile])
-AC_CONFIG_FILES([src/web/Makefile])
 
 AC_GNU_SOURCE
 
@@ -47,7 +46,7 @@ AC_ARG_ENABLE(
 	[packetver],
 	AC_HELP_STRING(
 		[--enable-packetver=ARG],
-		[Sets the PACKETVER define. (see src/common/mmo.hpp)]
+		[Sets the PACKETVER define. (see src/common/mmo.h)]
 	),
 	[enable_packetver="$enableval"],
 	[enable_packetver=""]
@@ -303,8 +302,7 @@ AC_ARG_WITH(
 	[maxconn],
 	AC_HELP_STRING(
 		[--with-maxconn@<:@=ARG@:>@],
-		[optionally set the maximum connections the core can handle. By default the system header value will be used.
-		 This will only be the compile time limit, make sure you set the correct limit with ulimit on your OS.]
+		[optionally set the maximum connections the core can handle. By default the system header value is used.]
 	),
 	[
 		if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
@@ -355,17 +353,6 @@ AC_ARG_WITH(
 )
 AC_SUBST([OMAP],$output_map)
 
-AC_ARG_WITH(
-	[outputweb],
-	AC_HELP_STRING(
-		[--with-outputweb@<:@=ARG@:>@],
-		[Specify the web-serv output name (defaults to web-server)]
-	),
-	[output_web="$withval"],
-	[output_web="web-server"]
-)
-AC_SUBST([OWEB],$output_web)
-
 
 #
 # Optionally specify the path to mysql_config
@@ -648,7 +635,7 @@ if test "$enable_lto" != "no" ; then
 fi
 
 
-AC_DEFUN([AC_CHECK_COMPILER_WFLAG],
+AC_DEFUN(AC_CHECK_COMPILER_WFLAG,
 	[
 		AC_MSG_CHECKING([whether $CC supports -W$1])
 		OLD_CFLAGS="$CFLAGS"
@@ -683,7 +670,7 @@ AC_DEFUN([AC_CHECK_COMPILER_WFLAG],
 	]
 )
 
-AC_DEFUN([AC_CHECK_COMPILER_WNOFLAG],
+AC_DEFUN(AC_CHECK_COMPILER_WNOFLAG,
 	[
 		AC_MSG_CHECKING([whether $CC supports -Wno-$1])
 		OLD_CFLAGS="$CFLAGS"
@@ -1314,6 +1301,7 @@ AC_SUBST([PCRE_VERSION])
 AC_SUBST([PCRE_LIBS])
 AC_SUBST([PCRE_CFLAGS])
 
+
 #
 # Host specific stuff
 #
@@ -1368,7 +1356,7 @@ AC_MSG_NOTICE([CFLAGS_AR= $CFLAGS_AR])
 AC_MSG_NOTICE([LDFLAGS= $LDFLAGS])
 #AC_MSG_NOTICE([PROD_WARN= $PROD_WARN])
 #AC_MSG_NOTICE([EXTRA_WARN= $EXTRA_WARN])
-AC_MSG_NOTICE([output name =  $output_login, $output_char, $output_map, $output_web])
+AC_MSG_NOTICE([output name =  $output_login, $output_char, $output_map])
 
 ###############################################################################
 AC_OUTPUT

db/captcha_db.yml

@@ -1,37 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Captcha Database Table
-###########################################################################
-#
-# Captcha Database Settings
-#
-###########################################################################
-# - Id                Index value.
-#   Filename          Name of the BMP image file (with location).
-#   Answer            Correct answer for the captcha (case-sensitive).
-#   Bonus             Bonus Script ran on success. (Default: Level 10 Blessing and Increase Agility)
-###########################################################################
-
-Header:
-  Type: CAPTCHA_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/import/captcha_db.yml

db/enchantgrade.yml

@@ -30,9 +30,7 @@
 #           Refine                      Required refine level.
 #           Chance                      Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
-#           AnnounceSuccess             Announce on upgrade success. (Default: true)
-#           AnnounceFail                Announce on upgrade failure. (Default: false)
-#           Announce                    Announce on upgrade success and failure.
+#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
 #           Catalyst:                   Catalyst item to increase chance of success.
 #             Item                      The item that can be used.
 #             AmountPerStep             Amount of Item needed.
@@ -51,7 +49,7 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 2
+  Version: 1
 
 Footer:
   Imports:

db/import-tmpl/captcha_db.yml

@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Captcha Database Table
-###########################################################################
-#
-# Captcha Database Settings
-#
-###########################################################################
-# - Id                Index value.
-#   Filename          Name of the BMP image file (with location).
-#   Answer            Correct answer for the captcha (case-sensitive).
-#   Bonus             Bonus Script ran on success. (Default: Level 10 Blessing and Increase Agility)
-###########################################################################
-
-Header:
-  Type: CAPTCHA_DB
-  Version: 1

db/import-tmpl/enchantgrade.yml

@@ -30,9 +30,7 @@
 #           Refine                      Required refine level.
 #           Chance                      Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
-#           AnnounceSuccess             Announce on upgrade success. (Default: true)
-#           AnnounceFail                Announce on upgrade failure. (Default: false)
-#           Announce                    Announce on upgrade success and failure.
+#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
 #           Catalyst:                   Catalyst item to increase chance of success.
 #             Item                      The item that can be used.
 #             AmountPerStep             Amount of Item needed.
@@ -51,4 +49,4 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 2
+  Version: 1

db/import-tmpl/item_db.yml

@@ -44,7 +44,6 @@
 #   EquipLevelMin           Minimum required level to equip. (Default: 0)
 #   EquipLevelMax           Maximum level that can equip. (Default: 0)
 #   Refineable              If the item can be refined. (Default: false)
-#   Gradable                If the item can be graded. (Default: false)
 #   View                    View sprite of an item. (Default: 0)
 #   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
 #   Flags:                  Item flags. (Default: null)
@@ -86,7 +85,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 3
+  Version: 2
 
 #Body:
 # THQ Quest Items

db/import-tmpl/item_enchant.yml

@@ -1,72 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Enchant Database
-###########################################################################
-#
-# Item Enchant Settings
-#
-###########################################################################
-# - Id                         Client side LUA index.
-#   TargetItems:               List of possible target items.
-#     <item name>              Item name of possible target item.
-#   MinimumRefine              Minimum refine of the target item. (Default: 0)
-#   MinimumEnchantgrade        Minimum enchant grade of the target item. (Default: 0)
-#   AllowRandomOptions         Enable random options in the target item. (Default: true)
-#   Reset:                     Reset options. (Default: null)
-#     Chance                   Chance of successful reset. (Default: 0)
-#     Price                    Price for resetting enchants. (Default: 0)
-#     Materials:               Items required for resetting enchants. (Default: null)
-#       - Material             Item name of the required item.
-#         Amount               Amount of the required item. (Default: 1)
-#   Order:                     Order in which the slots can be enchanted.
-#                              Overwriting via import will clear the currently defined order.
-#     - Slot                   Number of the slot (0-3).
-#   Slots:                     Enchant options.
-#     - Slot                   Number of the slot (0-3).
-#       Price                  Price required for the normal enchant process. (Default: 0)
-#       Materials:             Items required for the normal enchant process. (Default: null)
-#         - Material           Item name of the required item.
-#           Amount             Amount of the required item. (Default: 1)
-#       Chance                 Base chance for the normal enchant process. (Default: 100000)
-#       EnchantgradeBonus:     Additional bonus chance increase per enchant grade. (Default: null)
-#         - Enchantgrade       Enchant grade required for the bonus.
-#           Chance             Additional chance that is added to the base chance.
-#       Enchants:              Available enchants for the normal enchant process per enchant grade. (Default: null)
-#         - Enchantgrade       Enchant grade of the item to be enchanted.
-#           Items:             Available enchants for the normal enchant process on the given enchant grade. (Default: null)
-#             - Item           Item name of the available enchant item.
-#               Chance         Chance to get this specific enchant item.
-#       PerfectEnchants:       Available perfect enchants (100% chance + selectable) for this slot. (Default: null)
-#         - Item               Item name of the available enchant item.
-#           Price              Price required for this perfect enchant. (Default: 0)
-#           Materials:         Items required for this perfect enchant. (Default: null)
-#             - Material       Item name of the required item.
-#               Amount         Amount of the required item. (Default: 1)
-#       Upgrades:              Available enchant upgrades for this slot. (Default: null)
-#         - Enchant            Item name of the enchant item available for upgrade.
-#           Upgrade            Item name of the enchant it can be upgrade to.
-#           Price              Price required for this enchant upgrade. (Default: 0)
-#           Materials:         Items required for this enchant upgrade (Default: null)
-#             - Material       Item name of the required item.
-#               Amount         Amount of the required item. (Default: 1)
-###########################################################################
-
-Header:
-  Type: ITEM_ENCHANT_DB
-  Version: 1

db/import-tmpl/item_packages.yml

@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Package Database
-###########################################################################
-#
-# Item Package Settings
-#
-###########################################################################
-# - Item                       Item that triggers Item Package Selection.
-#   Groups:                    Groups that can be selected.
-#     - Group                  Group ID that can be selected (has to match the client's LUA file).
-#       Items:                 Items that will be given out.
-#         - Item               Item that will be given out.
-#           Amount             Amount of the item. (Default: 1)
-#                              To remove an item via import set amount to 0.
-#           RentalHours        Rental time in hours. (Default: 0)
-#           Refine             Refine level of the item. (Default: 0)
-#           RandomOptionGroup  Name of the random option group that will be applied. (Default: none)
-###########################################################################
-
-Header:
-  Type: ITEM_PACKAGE_DB
-  Version: 1

db/import-tmpl/item_reform.yml

@@ -1,44 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Reform Database
-###########################################################################
-#
-# Item Reform Settings
-#
-###########################################################################
-# - Item                       Item that triggers Item Reform UI.
-#   BaseItems:                 Items that can be reformed.
-#     - BaseItem               Item that can be reformed.
-#       MinimumRefine          Minimum refine level of the required items. (Default: 0)
-#       MaximumRefine          Maximum refine level of the required items. (Default: MAX_REFINE)
-#       RequiredRandomOptions  Amount of random options have to be in the item. (Default: 0)
-#       CardsAllowed           Allow cards in the target item. (Default: true)
-#       Materials:             Additional items needed for the reformation. (Default: none)
-#         - Material           Material item that is needed.
-#           Amount             Amount of the material item that is needed. (Default: 1)
-#       ResultItem             Item after the reform.
-#       ChangeRefine           Increase or decrease the refine during reformation. (Default: 0)
-#       RandomOptionGroup      Name of the random option group that will be applied. (Default: none)
-#       ClearSlots             Remove cards and socket enchants during reformation. (Default: false)
-#       RemoveEnchantgrade     Remove enchantgrade during reformation. (Default: false)
-###########################################################################
-
-Header:
-  Type: ITEM_REFORM_DB
-  Version: 1

db/import-tmpl/map_drops.yml

@@ -1,44 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Map Drop Database
-###########################################################################
-#
-# Map Drop Settings
-#
-###########################################################################
-# - Map                             Name of the map.
-#   GlobalDrops                     Drops for all monsters on this map. (Default: empty)
-#                                   These drops are unaffected by server drop rate and cannot be stolen.
-#     - Index                       Unique index of the drop.
-#       Item                        Item name.
-#       Rate                        Drop rate of item.
-#       RandomOptionGroup           Random Option Group applied to item on drop. (Default: None)
-#   SpecificDrops                   Drops for specific monsters on this map. (Default: empty)
-#     - Monster                     Monster name.
-#       Drops                       Drops for this specific monster. (Default: empty)
-#                                   These drops are unaffected by server drop rate and cannot be stolen.
-#         - Index                   Unique index of the drop.
-#           Item                    Item name.
-#           Rate                    Drop rate of item.
-#           RandomOptionGroup       Random Option Group applied to item on drop. (Default: None)
-###########################################################################
-
-Header:
-  Type: MAP_DROP_DB
-  Version: 1

db/import-tmpl/mob_skill_db.txt

@@ -44,8 +44,6 @@
 //	casttargeted		When a target is in cast range (no condition value).
 //	rudeattacked		When mob is rude attacked (no condition value).
 //	mobnearbygt		When monsters in range become greater than specified number.
-//	groundattacked		When mob is hit by ground targeted skill (no condition value).
-//	damagedgt		When single attack deals greater damage than specified number.
 //
 //	Status abnormalities specified through the statuson/statusoff system:
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /

db/import-tmpl/mob_skill_db.yml

@@ -0,0 +1,861 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Monster Skill Database
+###########################################################################
+#
+# Monster Skill Settings
+#
+###########################################################################
+# - Mob                     Monster AegisName.
+#   Skills:                 List of Skills casted by the monster.
+#    - Index                Unique Index in the list to edit the skill on import.
+#      Name                 Skill AegisName.
+#      Level                Skill Level.
+#      State                State of the monster to cast the skill. (Default: ATTACK)
+#      CastRate             Rate to cast the skill (from 1-10000). (Default: 10000)
+#      CastTime             Time in millisecond to cast the skill. (Default: 0)
+#      CastDelay            Delay in millisecond to recast the skill. (Default: 5000)
+#      CastCancel           Whether the skill is cancelable or not. (Default: true)
+#      Target               Target of the skill. (Default: TARGET)
+#      Condition            Type of condition. (Default: ALWAYS)
+#      ConditionValue1      Value given at certain conditions.
+#      ConditionValue2      Value given at certain conditions.
+#      Ai                   Change the monster mode using the given Aegis monster type AI. (Default: 00)
+#      Summon:              List of monsters to summon, required for certain skills. (Default: null) 
+#        - Index            Unique Index in the list to edit the monster on import. Range of 0-5.
+#          Mob              Monster AegisName.
+#          Clear            True to remove the given monster at this index. (Optional)
+#      Emotion              Emotion displayed on the monster after the cast. (Default: ET_NONE)
+#      Chat                 Chat ID to display the associated sentence defined in mob_chat_db.yml. (Default: 0)
+#      Clear                True to remove the skill. (Optional)
+###########################################################################
+
+Header:
+  Type: MOB_SKILL_DB
+  Version: 1
+
+# Body:
+# rAthena Dev Team
+  # - Mob: VALARIS
+    # Skills:
+      # - Index: 0
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 1
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: WALK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 2
+        # Name: KN_BRANDISHSPEAR
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 3
+        # Name: MO_BODYRELOCATION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 200
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 4
+        # Name: NPC_ARMORBRAKE
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 5
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 6
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 7
+        # Name: NPC_DARKBREATH
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 800
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 8
+        # Name: NPC_DARKSTRIKE
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 9
+        # Name: NPC_GUIDEDATTACK
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 20000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 10
+        # Name: NPC_POWERUP
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+        # Emotion: ET_FRET
+      # - Index: 11
+        # Name: NPC_SUMMONSLAVE
+        # Level: 6
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 700
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: MC_CAMERI
+      # - Index: 12
+        # Name: NPC_SUMMONSLAVE
+        # Level: 6
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 700
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: MC_CAMERI
+      # - Index: 13
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 14
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 15
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: SKILLUSED
+        # ConditionValue1: MG_FIREWALL
+        # Emotion: ET_KIK
+  # - Mob: VALARIS_WORSHIPPER
+    # Skills:
+      # - Index: 0
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 1
+        # Name: NPC_CURSEATTACK
+        # Level: 3
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 800
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 2
+        # Name: NPC_DARKNESSATTACK
+        # Level: 2
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_FRET
+      # - Index: 3
+        # Name: NPC_EMOTION
+        # Level: 1
+        # State: WALK
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_DELIGHT
+      # - Index: 4
+        # Name: NPC_HALLUCINATION
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 5
+        # Name: NPC_HALLUCINATION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 50
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 6
+        # Name: SA_DISPELL
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 0
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+  # - Mob: MC_CAMERI
+    # Skills:
+      # - Index: 0
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 1
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: WALK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 2
+        # Name: KN_BRANDISHSPEAR
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 3
+        # Name: MO_BODYRELOCATION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 200
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 4
+        # Name: NPC_ARMORBRAKE
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 5
+        # Name: NPC_DARKBREATH
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 800
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 6
+        # Name: NPC_DARKSTRIKE
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 7
+        # Name: NPC_GUIDEDATTACK
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 20000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 8
+        # Name: NPC_POWERUP
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+        # Emotion: ET_FRET
+      # - Index: 9
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 10
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 11
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: SKILLUSED
+        # ConditionValue1: MG_FIREWALL
+        # Emotion: ET_KIK
+  # - Mob: POKI
+    # Skills:
+      # - Index: 0
+        # Name: AC_DOUBLE
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 1
+        # Name: AC_SHOWER
+        # Level: 8
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ATTACKPCGT
+        # ConditionValue1: 2
+      # - Index: 2
+        # Name: BS_MAXIMIZE
+        # Level: 5
+        # State: CHASE
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 3
+        # Name: BS_MAXIMIZE
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 4
+        # Name: NPC_AGIUP
+        # Level: 5
+        # State: CHASE
+        # CastRate: 2500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 5
+        # Name: NPC_POWERUP
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+      # - Index: 6
+        # Name: SN_SHARPSHOOTING
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 7
+        # Name: HT_SKIDTRAP
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 8
+        # Name: HT_FLASHER
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 300000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 9
+        # Name: HT_FREEZINGTRAP
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 300000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 10
+        # Name: AC_CHARGEARROW
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 11
+        # Name: HT_FLASHER
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 300000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 12
+        # Name: NPC_SUMMONSLAVE
+        # Level: 5
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 120000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 1
+        # Summon:
+          # - Index: 0
+            # Mob: G_WHIKEBAIN
+          # - Index: 1
+            # Mob: G_ARMAIA
+          # - Index: 2
+            # Mob: G_EREND
+          # - Index: 3
+            # Mob: G_KAVAC
+          # - Index: 4
+            # Mob: G_RAWREL
+        # Emotion: ET_SURPRISE
+      # - Index: 13
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 10000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 14
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: IDLE
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 10000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 15
+        # Name: NPC_CHANGEWATER
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 600000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+      # - Index: 16
+        # Name: NPC_CHANGETELEKINESIS
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 2000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 10
+        # Emotion: ET_ANGER
+      # - Index: 17
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+  # - Mob: MOROCC_4
+    # Skills:
+      # - Index: 0
+        # Name: NPC_SUMMONSLAVE
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 3000
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 2
+        # Summon:
+          # - Index: 0
+            # Mob: LUNATIC
+      # - Index: 1
+        # Name: NPC_SUMMONSLAVE
+        # Level: 5
+        # State: IDLE
+        # CastRate: 5000
+        # CastTime: 2000
+        # CastDelay: 40000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+        # ConditionValue1: 2
+        # Summon:
+          # - Index: 0
+            # Mob: MOROCC_3
+# Custom Fire Poring. Warning, Colides with META_DENIRO
+  # - Mob: FIRE_PORING
+    # Skills:
+      # - Index: 0
+        # Name: AL_HEAL
+        # Level: 10
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 2000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_SWEAT
+      # - Index: 1
+        # Name: AL_HEAL
+        # Level: 10
+        # State: WALK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 2000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_SWEAT
+      # - Index: 2
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 1000
+        # CastTime: 5000
+        # CastDelay: 60000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+      # - Index: 3
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 4
+        # Name: NPC_DARKBLESSING
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 1000
+        # CastTime: 2000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_SMILE
+      # - Index: 5
+        # Name: NPC_SUMMONSLAVE
+        # Level: 16
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: G_DOKEBI
+          # - Index: 1
+            # Mob: G_BAPHOMET_
+          # - Index: 2
+            # Mob: G_DEVIRUCHI
+        # Emotion: ET_SMILE
+      # - Index: 6
+        # Name: NPC_SUMMONSLAVE
+        # Level: 16
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: G_DOKEBI
+          # - Index: 1
+            # Mob: G_BAPHOMET_
+          # - Index: 2
+            # Mob: G_DEVIRUCHI
+        # Emotion: ET_SMILE
+      # - Index: 7
+        # Name: RG_INTIMIDATE
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 1000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 8
+        # Name: RG_STRIPARMOR
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 9
+        # Name: RG_STRIPHELM
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 10
+        # Name: RG_STRIPSHIELD
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 11
+        # Name: RG_STRIPWEAPON
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+# iRO Halloween Event 2009
+  # - Mob: HALLOWEEN_WHISPER
+    # Skills:
+      # - Index: 0
+        # Name: AS_CLOAKING
+        # Level: 1
+        # State: IDLE
+        # CastRate: 2000
+        # CastTime: 200
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 1
+        # Name: AS_CLOAKING
+        # Level: 1
+        # State: CHASE
+        # CastRate: 2000
+        # CastTime: 200
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 2
+        # Name: NPC_EMOTION
+        # Level: 1
+        # State: IDLE
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 3
+        # Name: NPC_EMOTION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Ai: 01
+        # Emotion: ET_PROFUSELY_SWEAT

db/import-tmpl/refine.yml

@@ -30,8 +30,6 @@
 #           Bonus                       Refinement bonus. (Default: 0)
 #           RandomBonus                 Extra refinement bonus of 0~RandomBonus stacked on Bonus. (Default: 0)
 #           BlacksmithBlessingAmount    Amount of Blacksmith Blessing required. (Default: 0)
-#           BroadcastSuccess            Broadcast to the whole server when a refine attempt at this level succeeds. (Default: false)
-#           BroadcastFailure            Broadcast to the whole server when a refine attempt at this level fails. (Default: false)
 #           Chances:                    Success chance based on cost type. (Default: null)
 #             - Type                    Refinement cost type based on ore used.
 #               Rate                    Chance of success out of 0~10000. (Default: 0)
@@ -43,7 +41,7 @@
 
 Header:
   Type: REFINE_DB
-  Version: 2
+  Version: 1
 
 ###########################################################################
 # Event Refine Rates

db/import-tmpl/reputation.yml

@@ -1,34 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Database
-###########################################################################
-#
-# Reputation Settings
-#
-###########################################################################
-# - Id                                  Client side index.
-#   Name                                Name of the reputation type.
-#   Variable                            Name of the variable that will store the reputation. (Default: RepPoints<id>)
-#   Minimum                             Minimum amount of points. (Default: INT64_MIN)
-#   Maximum                             Maximum amount of points. (Default: INT64_MAX)
-###########################################################################
-
-Header:
-  Type: REPUTATION_DB
-  Version: 1

db/import-tmpl/reputation_group.yml

@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Group Database
-###########################################################################
-#
-# Reputation Group Settings
-#
-###########################################################################
-# - Id                                  Client side group index.
-#   ScriptName                          Unused? Used for "ID" in client
-#   Name                                Visible name in window
-#   ReputeList                          List of Reputations
-###########################################################################
-
-Header:
-  Type: REPUTATION_GROUP_DB
-  Version: 1

db/import-tmpl/status.yml

@@ -35,11 +35,10 @@
 #   MinRate                   Minimum rate after status change reduction (10000 = 100%). (Default: 0)
 #   MinDuration               Minimum duration in milliseconds after status change reduction. (Default: 1)
 #   Fail:                     List of Status Changes that causes the status to fail to activate. (Optional)
-#   EndOnStart:               List of Status Changes that will end when the status activates. (Optional)
+#   End:                      List of Status Changes that will end when the status activates. (Optional)
 #   EndReturn:                List of Status Changes that will end when the status activates and won't give its effect. (Optional)
-#   EndOnEnd:                 List of Status Changes that will end when the status becomes inactive. (Optional)
 ###########################################################################
 
 Header:
   Type: STATUS_DB
-  Version: 3
+  Version: 2

db/item_db.yml

@@ -44,7 +44,6 @@
 #   EquipLevelMin           Minimum required level to equip. (Default: 0)
 #   EquipLevelMax           Maximum level that can equip. (Default: 0)
 #   Refineable              If the item can be refined. (Default: false)
-#   Gradable                If the item can be graded. (Default: false)
 #   View                    View sprite of an item. (Default: 0)
 #   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
 #   Flags:                  Item flags. (Default: null)
@@ -86,7 +85,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 3
+  Version: 2
 
 Footer:
   Imports:

db/item_enchant.yml

@@ -1,78 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Enchant Database
-###########################################################################
-#
-# Item Enchant Settings
-#
-###########################################################################
-# - Id                         Client side LUA index.
-#   TargetItems:               List of possible target items.
-#     <item name>              Item name of possible target item.
-#   MinimumRefine              Minimum refine of the target item. (Default: 0)
-#   MinimumEnchantgrade        Minimum enchant grade of the target item. (Default: 0)
-#   AllowRandomOptions         Enable random options in the target item. (Default: true)
-#   Reset:                     Reset options. (Default: null)
-#     Chance                   Chance of successful reset. (Default: 0)
-#     Price                    Price for resetting enchants. (Default: 0)
-#     Materials:               Items required for resetting enchants. (Default: null)
-#       - Material             Item name of the required item.
-#         Amount               Amount of the required item. (Default: 1)
-#   Order:                     Order in which the slots can be enchanted.
-#                              Overwriting via import will clear the currently defined order.
-#     - Slot                   Number of the slot (0-3).
-#   Slots:                     Enchant options.
-#     - Slot                   Number of the slot (0-3).
-#       Price                  Price required for the normal enchant process. (Default: 0)
-#       Materials:             Items required for the normal enchant process. (Default: null)
-#         - Material           Item name of the required item.
-#           Amount             Amount of the required item. (Default: 1)
-#       Chance                 Base chance for the normal enchant process. (Default: 100000)
-#       EnchantgradeBonus:     Additional bonus chance increase per enchant grade. (Default: null)
-#         - Enchantgrade       Enchant grade required for the bonus.
-#           Chance             Additional chance that is added to the base chance.
-#       Enchants:              Available enchants for the normal enchant process per enchant grade. (Default: null)
-#         - Enchantgrade       Enchant grade of the item to be enchanted.
-#           Items:             Available enchants for the normal enchant process on the given enchant grade. (Default: null)
-#             - Item           Item name of the available enchant item.
-#               Chance         Chance to get this specific enchant item.
-#       PerfectEnchants:       Available perfect enchants (100% chance + selectable) for this slot. (Default: null)
-#         - Item               Item name of the available enchant item.
-#           Price              Price required for this perfect enchant. (Default: 0)
-#           Materials:         Items required for this perfect enchant. (Default: null)
-#             - Material       Item name of the required item.
-#               Amount         Amount of the required item. (Default: 1)
-#       Upgrades:              Available enchant upgrades for this slot. (Default: null)
-#         - Enchant            Item name of the enchant item available for upgrade.
-#           Upgrade            Item name of the enchant it can be upgrade to.
-#           Price              Price required for this enchant upgrade. (Default: 0)
-#           Materials:         Items required for this enchant upgrade (Default: null)
-#             - Material       Item name of the required item.
-#               Amount         Amount of the required item. (Default: 1)
-###########################################################################
-
-Header:
-  Type: ITEM_ENCHANT_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/re/item_enchant.yml
-    Mode: Renewal
-  - Path: db/import/item_enchant.yml

db/item_packages.yml

@@ -1,45 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Package Database
-###########################################################################
-#
-# Item Package Settings
-#
-###########################################################################
-# - Item                       Item that triggers Item Package Selection.
-#   Groups:                    Groups that can be selected.
-#     - Group                  Group ID that can be selected (has to match the client's LUA file).
-#       Items:                 Items that will be given out.
-#         - Item               Item that will be given out.
-#           Amount             Amount of the item. (Default: 1)
-#                              To remove an item via import set amount to 0.
-#           RentalHours        Rental time in hours. (Default: 0)
-#           Refine             Refine level of the item. (Default: 0)
-#           RandomOptionGroup  Name of the random option group that will be applied. (Default: none)
-###########################################################################
-
-Header:
-  Type: ITEM_PACKAGE_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/re/item_packages.yml
-    Mode: Renewal
-  - Path: db/import/item_packages.yml

db/item_reform.yml

@@ -1,50 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Reform Database
-###########################################################################
-#
-# Item Reform Settings
-#
-###########################################################################
-# - Item                       Item that triggers Item Reform UI.
-#   BaseItems:                 Items that can be reformed.
-#     - BaseItem               Item that can be reformed.
-#       MinimumRefine          Minimum refine level of the required items. (Default: 0)
-#       MaximumRefine          Maximum refine level of the required items. (Default: MAX_REFINE)
-#       RequiredRandomOptions  Amount of random options have to be in the item. (Default: 0)
-#       CardsAllowed           Allow cards in the target item. (Default: true)
-#       Materials:             Additional items needed for the reformation. (Default: none)
-#         - Material           Material item that is needed.
-#           Amount             Amount of the material item that is needed. (Default: 1)
-#       ResultItem             Item after the reform.
-#       ChangeRefine           Increase or decrease the refine during reformation. (Default: 0)
-#       RandomOptionGroup      Name of the random option group that will be applied. (Default: none)
-#       ClearSlots             Remove cards and socket enchants during reformation. (Default: false)
-#       RemoveEnchantgrade     Remove enchantgrade during reformation. (Default: false)
-###########################################################################
-
-Header:
-  Type: ITEM_REFORM_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/re/item_reform.yml
-    Mode: Renewal
-  - Path: db/import/item_reform.yml

db/map_drops.yml

@@ -1,50 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Map Drop Database
-###########################################################################
-#
-# Map Drop Settings
-#
-###########################################################################
-# - Map                             Name of the map.
-#   GlobalDrops                     Drops for all monsters on this map. (Default: empty)
-#                                   These drops are unaffected by server drop rate and cannot be stolen.
-#     - Index                       Unique index of the drop.
-#       Item                        Item name.
-#       Rate                        Drop rate of item.
-#       RandomOptionGroup           Random Option Group applied to item on drop. (Default: None)
-#   SpecificDrops                   Drops for specific monsters on this map. (Default: empty)
-#     - Monster                     Monster name.
-#       Drops                       Drops for this specific monster. (Default: empty)
-#                                   These drops are unaffected by server drop rate and cannot be stolen.
-#         - Index                   Unique index of the drop.
-#           Item                    Item name.
-#           Rate                    Drop rate of item.
-#           RandomOptionGroup       Random Option Group applied to item on drop. (Default: None)
-###########################################################################
-
-Header:
-  Type: MAP_DROP_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/re/map_drops.yml
-    Mode: Renewal
-  - Path: db/import/map_drops.yml

db/map_index.txt

@@ -1161,45 +1161,7 @@ air_if
 1@jorchs
 1@jorlab
 1@whl
-1@exhn
-1@exds
-2@exds
-1@exse
-1@exnw
-1@exsr
-1@exsh
-bl_grass
-bl_lava
-bl_ice
-bl_death
-clock_01
-rag_fes
-rag_fes_a
-memohall
-1@dime
-prt_elib
-1@vrcas
-1@vrev
-1@vrgen
-1@vrpo
-1@pdb
-airplane2
-vr_bob
-hero_dun1
-hero_ent1
-hero_ent2
-hero_ent3
-hero_in1
-hero_in2
-hero_in3
-hero_in4
-hero_lb
-hero_out1
-hero_out2
-hero_out3
-hero_out4
-hero_tra
-herosria
+
 
 //======================================================================================
 // - Other/Extra maps -

db/mob_chat_db.yml

@@ -126,26 +126,6 @@ Body:
     Dialog: This is the truth! Hahahahah!
   - Id: 58 # !todo Unknown dialogue
     Dialog: Attack!
-  - Id: 60
-    Dialog: Go !! Ultra Critical Bash EX !!
-  - Id: 61
-    Dialog: Come on!! Hell's Fireball !!
-  - Id: 62
-    Dialog: Kneel before me!! The vast power of capitalism !!
-  - Id: 63
-    Dialog: You can't run from me!! Double Strafe, pierce through my enemies !!
-  - Id: 64
-    Dialog: I'm gonna make you sick!!! Ultimate generational Envenom !!
-  - Id: 65
-    Dialog: I'll roll over you!! Ultimate Decrease Agility GX !!
-  - Id: 67 
-    Dialog: Dark cast that narrows the field of vision! It can only be removed with a green potion!
-  - Id: 68
-    Dialog: A poison that continuously lowers HP for a certain period of time! But it is not released with a green herb!
-  - Id: 69
-    Dialog: Let's start with recovery!
-  - Id: 70
-    Dialog: Silence that cannot use skills! You can only escape by eating green potions!
 
 Footer:
   Imports:

db/mob_skill_db.yml

@@ -0,0 +1,59 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Monster Skill Database
+###########################################################################
+#
+# Monster Skill Settings
+#
+###########################################################################
+# - Mob                     Monster AegisName.
+#   Skills:                 List of Skills casted by the monster.
+#    - Index                Unique Index in the list to edit the skill on import.
+#      Name                 Skill AegisName.
+#      Level                Skill Level.
+#      State                State of the monster to cast the skill. (Default: ATTACK)
+#      CastRate             Rate to cast the skill (from 1-10000). (Default: 10000)
+#      CastTime             Time in millisecond to cast the skill. (Default: 0)
+#      CastDelay            Delay in millisecond to recast the skill. (Default: 5000)
+#      CastCancel           Whether the skill is cancelable or not. (Default: true)
+#      Target               Target of the skill. (Default: TARGET)
+#      Condition            Type of condition. (Default: ALWAYS)
+#      ConditionValue1      Value given at certain conditions.
+#      ConditionValue2      Value given at certain conditions.
+#      Ai                   Change the monster mode using the given Aegis monster type AI. (Default: 00)
+#      Summon:              List of monsters to summon, required for certain skills. (Default: null) 
+#        - Index            Unique Index in the list to edit the monster on import. Range of 0-5.
+#          Mob              Monster AegisName.
+#          Clear            True to remove the given monster at this index. (Optional)
+#      Emotion              Emotion displayed on the monster after the cast. (Default: ET_NONE)
+#      Chat                 Chat ID to display the associated sentence defined in mob_chat_db.yml. (Default: 0)
+#      Clear                True to remove the skill. (Optional)
+###########################################################################
+
+Header:
+  Type: MOB_SKILL_DB
+  Version: 1
+
+Footer:
+  Imports:
+  - Path: db/pre-re/mob_skill_db.yml
+    Mode: Prerenewal
+  - Path: db/re/mob_skill_db.yml
+    Mode: Renewal
+  - Path: db/import/mob_skill_db.yml

db/pre-re/instance_db.yml

@@ -67,7 +67,7 @@ Body:
   - Id: 3
     Name: Orc's Memory
     Enter:
-      Map: 1@orcs
+      Map: 1@orcs 
       X: 179
       Y: 15
     AdditionalMaps:

db/pre-re/item_db.yml

@@ -44,7 +44,6 @@
 #   EquipLevelMin           Minimum required level to equip. (Default: 0)
 #   EquipLevelMax           Maximum level that can equip. (Default: 0)
 #   Refineable              If the item can be refined. (Default: false)
-#   Gradable                If the item can be graded. (Default: false)
 #   View                    View sprite of an item. (Default: 0)
 #   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
 #   Flags:                  Item flags. (Default: null)
@@ -86,7 +85,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 3
+  Version: 2
 
 Footer:
   Imports:

db/pre-re/item_db_equip.yml

@@ -44,7 +44,6 @@
 #   EquipLevelMin           Minimum required level to equip. (Default: 0)
 #   EquipLevelMax           Maximum level that can equip. (Default: 0)
 #   Refineable              If the item can be refined. (Default: false)
-#   Gradable                If the item can be graded. (Default: false)
 #   View                    View sprite of an item. (Default: 0)
 #   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
 #   Flags:                  Item flags. (Default: null)
@@ -86,7 +85,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 3
+  Version: 2
 
 Body:
   - Id: 1101

db/pre-re/item_db_etc.yml

@@ -44,7 +44,6 @@
 #   EquipLevelMin           Minimum required level to equip. (Default: 0)
 #   EquipLevelMax           Maximum level that can equip. (Default: 0)
 #   Refineable              If the item can be refined. (Default: false)
-#   Gradable                If the item can be graded. (Default: false)
 #   View                    View sprite of an item. (Default: 0)
 #   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
 #   Flags:                  Item flags. (Default: null)
@@ -86,7 +85,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 3
+  Version: 2
 
 Body:
   - Id: 670

db/pre-re/item_db_usable.yml

@@ -44,7 +44,6 @@
 #   EquipLevelMin           Minimum required level to equip. (Default: 0)
 #   EquipLevelMax           Maximum level that can equip. (Default: 0)
 #   Refineable              If the item can be refined. (Default: false)
-#   Gradable                If the item can be graded. (Default: false)
 #   View                    View sprite of an item. (Default: 0)
 #   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
 #   Flags:                  Item flags. (Default: null)
@@ -86,7 +85,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 3
+  Version: 2
 
 Body:
   - Id: 501

db/pre-re/mob_skill_db.txt

@@ -45,8 +45,6 @@
 //	casttargeted		When a target is in cast range (no condition value).
 //	rudeattacked		When mob is rude attacked (no condition value).
 //	mobnearbygt		When monsters in range become greater than specified number.
-//	groundattacked		When mob is hit by ground targeted skill (no condition value).
-//	damagedgt		When single attack deals greater damage than specified number.
 //
 //	Status abnormalities specified through the statuson/statusoff system:
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /
@@ -717,8 +715,8 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,master,alchemist,,,,,,,,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,afterskill,331,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
 1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
@@ -5421,7 +5419,7 @@
 1991,Tendrilion@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
 1991,Tendrilion@NPC_DRAGONFEAR,attack,659,2,500,0,10000,yes,self,always,0,,,,,,,
 1991,Tendrilion@NPC_GROUNDATTACK,attack,185,4,1000,0,5000,yes,target,always,0,,,,,,21,
-1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x39A5,,,,7,
+1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x3885,,,,7,
 1991,Tendrilion@NPC_ALLHEAL,idle,687,1,10000,30000,30000,yes,self,myhpltmaxrate,80,,,,,,,
 1992,Cornus@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1992,Cornus@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,

db/pre-re/refine.yml

@@ -30,8 +30,6 @@
 #           Bonus                       Refinement bonus. (Default: 0)
 #           RandomBonus                 Extra refinement bonus of 0~RandomBonus stacked on Bonus. (Default: 0)
 #           BlacksmithBlessingAmount    Amount of Blacksmith Blessing required. (Default: 0)
-#           BroadcastSuccess            Broadcast to the whole server when a refine attempt at this level succeeds. (Default: false)
-#           BroadcastFailure            Broadcast to the whole server when a refine attempt at this level fails. (Default: false)
 #           Chances:                    Success chance based on cost type. (Default: null)
 #             - Type                    Refinement cost type based on ore used.
 #               Rate                    Chance of success out of 0~10000. (Default: 0)
@@ -43,7 +41,7 @@
 
 Header:
   Type: REFINE_DB
-  Version: 2
+  Version: 1
 
 Body:
   - Group: Armor

db/pre-re/skill_db.yml

@@ -8272,7 +8272,7 @@ Body:
     Hit: Single
     HitCount: 1
     Duration1: 60000
-    Duration2: 30000
+    Duration2: 15000
     Requires:
       SpCost: 20
       Weapon:
@@ -8281,7 +8281,7 @@ Body:
     Unit:
       Id: Lullaby
       Layout: 4
-      Interval: 4000
+      Interval: 6000
       Target: Enemy
       Flag:
         Ensemble: true
@@ -9325,13 +9325,15 @@ Body:
     Name: NPC_WEAPONBRAKER
     Description: Break weapon
     MaxLevel: 10
-    TargetType: Self
+    Type: Weapon
+    TargetType: Attack
     Flags:
       IsNpc: true
+    Range: 9
     Hit: Single
     HitCount: 1
-    Duration: 30000
-    Status: WeaponBreaker
+    Element: Weapon
+    Status: BrokenWeapon
   - Id: 344
     Name: NPC_ARMORBRAKE
     Description: Break armor

db/re/achievement_db.yml

@@ -1784,12 +1784,6 @@ Body:
     Rewards:
       TitleId: 1034
     Score: 10
-  - Id: 130005 # TODO (Terra Gloria: give achievement when player visit the coronation ceremony)
-    Group: Chatting
-    Name: Who made the king
-    Rewards:
-      TitleID: 1046
-    Score: 10
   - Id: 170000
     Group: Chatting
     Name: Song chamber is not an accident
@@ -1908,7 +1902,7 @@ Body:
     Name: Elite Adventurer! (1)
     Condition: " Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS "
     Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
       Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
     Score: 50
   - Id: 200012
@@ -1916,7 +1910,7 @@ Body:
     Name: Transcendentaler! (1)
     Condition: " Class >= JOB_RUNE_KNIGHT_T && Class <= JOB_GUILLOTINE_CROSS_T "
     Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
       Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
     Score: 60
   - Id: 200013
@@ -1924,7 +1918,7 @@ Body:
     Name: Elite Adventurer! (2)
     Condition: " Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER "
     Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
       Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
     Score: 50
   - Id: 200014
@@ -1932,7 +1926,7 @@ Body:
     Name: Transcendentaler! (2)
     Condition: " Class >= JOB_ROYAL_GUARD_T && Class <= JOB_SHADOW_CHASER_T "
     Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
       Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
     Score: 60
   - Id: 200015
@@ -1947,7 +1941,7 @@ Body:
     Name: This is My way!
     Condition: " Class == JOB_STAR_GLADIATOR || Class == JOB_SOUL_LINKER || Class == JOB_KAGEROU || Class == JOB_OBORO || Class == JOB_REBELLION "
     Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
       Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
     Score: 20
   - Id: 200017
@@ -2027,7 +2021,7 @@ Body:
     Name: Incarnation of Love and Hate
     Condition: " BaseLevel == 99 && Class == JOB_NOVICE "
     Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
       Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
     Score: 30
   - Id: 200030
@@ -2035,7 +2029,7 @@ Body:
     Name: I really love it!
     Condition: " BaseLevel == 99 && (Class >= JOB_SWORDMAN && Class <= JOB_THIEF) "
     Rewards:
-      Item: E_Bubble_Gum_Box
+      Item: Bubble_Gum_Box_10
       Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
     Score: 30
   - Id: 200031
@@ -2043,38 +2037,30 @@ Body:
     Name: Reborn in Valhalla!
     Condition: " Class == JOB_NOVICE_HIGH "
     Rewards:
-      Item: Adventurer_Box_1
+    #  Item: Adventurer_Box_1
       Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
     Score: 10
   - Id: 200032
     Group: Goal_Level
     Name: The start of another adventure!
     Condition: " BaseLevel == 100 "
-    Rewards:
-      Item: Rebeginer_Box_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) "
-    Rewards:
-      Item: Costume_Ticket
+    #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) "
-    Rewards:
-      Item: Costume_Ticket
+    #Rewards:
+    #  Item: Costume_Ticket
     Score: 50
-  - Id: 200035
-    Group: Goal_Level
-    Name: Level 200 achieved!
-    Condition: " BaseLevel == 200 "
-    Rewards:
-      Item: C_Magestic_Goat2
-      Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
-    Score: 100
   - Id: 220000
     Group: Chatting_Create
     Name: Community begin

db/re/enchantgrade.yml

@@ -30,9 +30,7 @@
 #           Refine                      Required refine level.
 #           Chance                      Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
-#           AnnounceSuccess             Announce on upgrade success. (Default: true)
-#           AnnounceFail                Announce on upgrade failure. (Default: false)
-#           Announce                    Announce on upgrade success and failure.
+#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
 #           Catalyst:                   Catalyst item to increase chance of success.
 #             Item                      The item that can be used.
 #             AmountPerStep             Amount of Item needed.
@@ -51,7 +49,7 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 2
+  Version: 1
 
 Body:
   - Type: Armor
@@ -100,7 +98,6 @@ Body:
             Refine: 11
             Chance: 5000
             Bonus: 50
-            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 5
@@ -120,7 +117,6 @@ Body:
             Refine: 11
             Chance: 4000
             Bonus: 100
-            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 7
@@ -182,7 +178,6 @@ Body:
             Refine: 11
             Chance: 5000
             Bonus: 50
-            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 5
@@ -202,7 +197,6 @@ Body:
             Refine: 11
             Chance: 4000
             Bonus: 100
-            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 7

db/re/generator/reputation.yml

@@ -1,43 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Database
-###########################################################################
-#
-# Reputation Settings
-#
-###########################################################################
-# - Id                                  Client side index.
-#   Visibility                          Always = Always show
-#                                       Never = Never show
-#                                       Exist = Only show if greater than 0
-###########################################################################
-
-Header:
-  Type: REPUTATION_DB
-  Version: 1
-
-Body:
-  - Id: 1
-    Visibility: Always
-  - Id: 2
-    Visibility: Always
-  - Id: 3
-    Visibility: Exist
-  - Id: 4
-    Visibility: Exist

db/re/generator/reputation_group.yml

@@ -1,51 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Group Database
-###########################################################################
-#
-# Reputation Group Settings
-#
-###########################################################################
-# - Id                                  Client side group index.
-#   ScriptName                          Unused? Used for "ID" in client
-#   Name                                Visible name in window
-#   ReputeList                          List of Reputations
-###########################################################################
-
-Header:
-  Type: REPUTATION_GROUP_DB
-  Version: 1
-
-Body:
-  - Id: 1
-    ScriptName: MonsterGroup1
-    Name: Monster Friends
-    ReputeList:
-      - 1
-      - 2
-  - Id: 2
-    ScriptName: Arunafelts
-    Name: Arunafeltz
-    ReputeList:
-      - 3
-  - Id: 3
-    ScriptName: Isgard
-    Name: Isgard
-    ReputeList:
-      - 4

db/re/instance_db.yml

@@ -67,7 +67,7 @@ Body:
   - Id: 3
     Name: Orc's Memory
     Enter:
-      Map: 1@orcs
+      Map: 1@orcs 
       X: 179
       Y: 15
     AdditionalMaps:
@@ -345,33 +345,3 @@ Body:
       Map: 1@cor
       X: 176
       Y: 169
-  - Id: 44
-    Name: Half Moon In The Daylight
-    TimeLimit: 7200
-    Enter:
-      Map: 1@pop1
-      X: 47
-      Y: 133
-    AdditionalMaps:
-      1@pop2: true
-      1@pop3: true
-  - Id: 45
-    Name: Weekend Dungeon
-    TimeLimit: 3600
-    Enter:
-      Map: 1@md_pay
-      X: 240
-      Y: 29
-  - Id: 46
-    Name: Friday Dungeon
-    TimeLimit: 7200
-    Enter:
-      Map: 1@md_gef
-      X: 106
-      Y: 129
-  - Id: 47
-    Name: Poring Village
-    Enter:
-      Map: 1@begi
-      X: 100
-      Y: 22

db/re/item_db.yml

@@ -44,7 +44,6 @@
 #   EquipLevelMin           Minimum required level to equip. (Default: 0)
 #   EquipLevelMax           Maximum level that can equip. (Default: 0)
 #   Refineable              If the item can be refined. (Default: false)
-#   Gradable                If the item can be graded. (Default: false)
 #   View                    View sprite of an item. (Default: 0)
 #   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
 #   Flags:                  Item flags. (Default: null)
@@ -86,7 +85,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 3
+  Version: 2
 
 Footer:
   Imports:

db/re/item_packages.yml

@@ -1,531 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Package Database
-###########################################################################
-#
-# Item Package Settings
-#
-###########################################################################
-# - Item                       Item that triggers Item Package Selection.
-#   Groups:                    Groups that can be selected.
-#     - Group                  Group ID that can be selected (has to match the client's LUA file).
-#       Items:                 Items that will be given out.
-#         - Item               Item that will be given out.
-#           Amount             Amount of the item. (Default: 1)
-#                              To remove an item via import set amount to 0.
-#           RentalHours        Rental time in hours. (Default: 0)
-#           Refine             Refine level of the item. (Default: 0)
-#           RandomOptionGroup  Name of the random option group that will be applied. (Default: none)
-###########################################################################
-
-Header:
-  Type: ITEM_PACKAGE_DB
-  Version: 1
-
-Body:
-  - Item: Select_Example1
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Cotton_Shirt
-            Refine: 7
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Shoes
-            Refine: 5
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Muffler
-            Refine: 3
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Event_Pierrot_Nose
-            RentalHours: 24
-#            RandomOptionGroup: TODO <insert random option group name>
-      - Group: 1
-        Items:
-          - Item: Red_Potion
-            Amount: 100
-          - Item: Orange_Potion
-            Amount: 50
-          - Item: White_Potion
-            Amount: 10
-      - Group: 2
-        Items:
-          - Item: Jellopy
-            Amount: 10
-          - Item: Hinalle
-          - Item: Yellow_Gemstone
-            Amount: 3
-          - Item: Azure_Jewel
-          - Item: Spore_Doll
-            Amount: 2
-  - Item: Select_Example2
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Knife
-            Refine: 4
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Cotton_Shirt
-            Refine: 4
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Red_Potion
-            Amount: 100
-          - Item: Ring
-            RentalHours: 24
-#            RandomOptionGroup: TODO <insert random option group name>
-      - Group: 1
-        Items:
-          - Item: Tsurugi
-            Refine: 5
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Padded_Armor
-            Refine: 5
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Yellow_Potion
-            Amount: 50
-      - Group: 2
-        Items:
-          - Item: Sword
-            Refine: 20
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: Guard
-            RentalHours: 168
-            Refine: 5
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: White_Herb
-            Amount: 100
-      - Group: 3
-        Items:
-          - Item: Fabre_Card
-          - Item: Pupa_Card
-          - Item: Drops_Card
-          - Item: Poring__Card
-          - Item: Lunatic_Card
-          - Item: Pecopeco_Egg_Card
-          - Item: Picky_Card
-          - Item: Chonchon_Card
-          - Item: Wilow_Card
-          - Item: Picky__Card
-          - Item: Thief_Bug_Egg_Card
-          - Item: Andre_Egg_Card
-          - Item: Roda_Frog_Card
-          - Item: Condor_Card
-          - Item: Thief_Bug_Card
-          - Item: Savage_Babe_Card
-          - Item: Andre_Larva_Card
-          - Item: Hornet_Card
-          - Item: Farmiliar_Card
-          - Item: Rocker_Card
-      - Group: 4
-        Items:
-          - Item: Poring_Card
-      - Group: 5
-        Items:
-          - Item: LI_Nyangvine_Box3_26
-            Amount: 5
-      - Group: 6
-        Items:
-          - Item: C_Hair_Of_The_Strong
-#            RandomOptionGroup: TODO <insert random option group name>
-          - Item: C_Imp_Hat
-#            RandomOptionGroup: TODO <insert random option group name>
-      - Group: 7
-        Items:
-          - Item: C_Classical_Fhat
-      - Group: 8
-        Items:
-          - Item: Wing_Of_Fly
-            Amount: 3
-            RentalHours: 24
-          - Item: Wing_Of_Butterfly
-            Amount: 5
-            RentalHours: 168
-          - Item: Old_Blue_Box
-            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
-    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: Special_Coin_Pack
-    Groups:
-      - Group: 0
-        Items:
-          - Item: EP17_1_EVT39
-            Amount: 3
-          - Item: EP17_1_EVT02
-            Amount: 18
-      - Group: 1
-        Items:
-          - Item: BarMealTicket
-            Amount: 20
-      - Group: 2
-        Items:
-          - Item: Ep18_Amethyst_Fragment
-            Amount: 20
-      - Group: 3
-        Items:
-          - Item: Ep19_Snow_Flower
-            Amount: 20
-  - Item: Metal_W_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Metal_Two_Hand_Sword
-            Refine: 7
-      - Group: 1
-        Items:
-          - Item: Metal_Lance
-            Refine: 7
-      - Group: 2
-        Items:
-          - Item: Metal_Mace
-            Refine: 7
-      - Group: 3
-        Items:
-          - Item: Metal_Two_Handed_Axe
-            Refine: 7
-      - Group: 4
-        Items:
-          - Item: Metal_Dagger
-            Refine: 7
-      - Group: 5
-        Items:
-          - Item: Metal_Book
-            Refine: 7
-      - Group: 6
-        Items:
-          - Item: Metal_Staff
-            Refine: 7
-      - Group: 7
-        Items:
-          - Item: Metal_Katar
-            Refine: 7
-      - Group: 8
-        Items:
-          - Item: Metal_Bow
-            Refine: 7
-      - Group: 9
-        Items:
-          - Item: Metal_Revolver
-            Refine: 7
-      - Group: 10
-        Items:
-          - Item: Metal_Foxtail
-            Refine: 7
-  - Item: Memento_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Booster_Mask_A
-      - Group: 1
-        Items:
-          - Item: Booster_Mask_B
-      - Group: 2
-        Items:
-          - Item: Booster_Mask_C
-  - Item: P_Memento_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Booster_Scarf_A
-      - Group: 1
-        Items:
-          - Item: Booster_Scarf_B
-      - Group: 2
-        Items:
-          - Item: Booster_Scarf_C
-  - Item: Booster_Hat_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Pretty_Rabbit_Hood_E
-      - Group: 1
-        Items:
-          - Item: C_Black_Cat_Hood_kr
-      - Group: 2
-        Items:
-          - Item: C_Squirrel_Ear_Hat_Kr
-      - Group: 3
-        Items:
-          - Item: C_Black_Moon_Cat_kr
-  - Item: Booster_Back_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_School_Bag_RD_E
-      - Group: 1
-        Items:
-          - Item: C_School_Bag_BL
-      - Group: 2
-        Items:
-          - Item: C_School_Bag_BU
-      - Group: 3
-        Items:
-          - Item: C_School_Bag_PU
-  - Item: aegis_101470
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Minus_Str
-            Amount: 6
-      - Group: 1
-        Items:
-          - Item: Minus_Agi
-            Amount: 6
-      - Group: 2
-        Items:
-          - Item: Minus_Vit
-            Amount: 6
-      - Group: 3
-        Items:
-          - Item: Minus_Int
-            Amount: 6
-      - Group: 4
-        Items:
-          - Item: Minus_Dex
-            Amount: 6
-      - Group: 5
-        Items:
-          - Item: Minus_Luk
-            Amount: 6
-      - Group: 6
-        Items:
-          - Item: Minus_Str
-          - Item: Minus_Agi
-          - Item: Minus_Vit
-          - Item: Minus_Int
-          - Item: Minus_Dex
-          - Item: Minus_Luk
-  - Item: aegis_101471
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Fire_Bottle
-            Amount: 50
-      - Group: 1
-        Items:
-          - Item: Acid_Bottle
-            Amount: 50
-      - Group: 2
-        Items:
-          - Item: MenEater_Plant_Bottle
-            Amount: 50
-      - Group: 3
-        Items:
-          - Item: Coating_Bottle
-            Amount: 50
-      - 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
-      - Group: 5
-        Items:
-          - Item: Scorpio_Diadem_K
-      - Group: 6
-        Items:
-          - Item: Sagittarius_DiademK
-  - Item: aegis_101565
-    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: aegis_101654
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101655
-      - Group: 1
-        Items:
-          - Item: aegis_101656
-  - Item: aegis_101657
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101658
-      - Group: 1
-        Items:
-          - Item: aegis_101659
-      - Group: 2
-        Items:
-          - Item: aegis_101660
-      - Group: 3
-        Items:
-          - Item: aegis_101661
-  - Item: aegis_101662
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101663
-      - Group: 1
-        Items:
-          - Item: aegis_101664
-  - Item: aegis_101727
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101717
-      - Group: 1
-        Items:
-          - Item: aegis_101718
-      - Group: 2
-        Items:
-          - Item: aegis_101719
-      - Group: 3
-        Items:
-          - Item: aegis_101720
-  - Item: aegis_101728
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101721
-      - Group: 1
-        Items:
-          - Item: aegis_101722
-      - Group: 2
-        Items:
-          - Item: aegis_101723
-      - Group: 3
-        Items:
-          - Item: aegis_101724
-  - Item: aegis_101729
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101725
-      - Group: 1
-        Items:
-          - Item: aegis_101726

db/re/laphine_synthesis.yml

@@ -37,7 +37,7 @@ Header:
   Version: 1
 
 Body:
-  - Item: Shadow_Mix_Recipe
+  - Item: Shadow_Exchange_Box
     RewardGroup: SHADOW_EXCHANGE_BOX
     RequiredRequirementsCount: 3
     Requirements:
@@ -345,42 +345,42 @@ Body:
       - Item: S_Gunslinger_Shield
       - Item: S_Thief_earring
       - Item: S_Archer_earring
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
       - Item: S_Sigrun_Armor
       - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
       - Item: S_Critical_Shield
       - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
-      - Item: S_AllMighty_Earring
-      - Item: S_AllMighty_Pendant
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
+      - Item: S_Almighty_Earring
+      - Item: S_Almighty_Pendant
       - Item: S_Tempest_Shield
       - Item: S_Tempest_Shoes
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
-      - Item: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
       - Item: S_Tension_Weapon
       - Item: S_Tension_Earring
       - Item: S_Tension_Pendent
@@ -390,17 +390,17 @@ Body:
       - Item: S_Healing_Shield
       - Item: S_Healing_Shoes
       - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
       - Item: S_Penetration_Shoes
       - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
       - Item: Sentimental_Weapone_S
       - Item: Sentimental_Earring_S
       - Item: Sentimental_Pendant_S
@@ -414,10 +414,10 @@ Body:
       - Item: S_Magical_Shoes
       - Item: S_Magical_Shield
       - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
-      - Item: S_KingbirdAncient_Armor
-      - Item: S_CriticalHit_Armor
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
+      - Item: S_Kingbird_Ancient_Armor
+      - Item: S_Cri_Hit_Armor
       - Item: S_Rebellion_Armor
       - Item: S_Kagerou_Armor
       - Item: S_Oboro_Armor
@@ -657,8 +657,8 @@ Body:
       - Item: S_FullPene_Armor
       - Item: S_FullPene_Pendant
       - Item: S_FullPene_Earring
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
       - Item: S_Blitz_Weapon
       - Item: S_Blitz_Armor
       - Item: S_FullTemp_Earring
@@ -857,9 +857,9 @@ Body:
       - Item: MechanicStone_Bottom
       - Item: MechanicStone_Robe
       - Item: WanderMinstrelStone_Top
-      - Item: WanderMinstStone_Middle
-      - Item: WanderMinstStone_Bottom
-      - Item: WanderMinstreStone_Robe
+      - Item: WanderMinstrelStone_Middle
+      - Item: WanderMinstrelStone_Bottom
+      - Item: WanderMinstrelStone_Robe
       - Item: HPStone_Bottom
       - Item: DoubleAttack_Stone
       - Item: Critical_Stone_Robe
@@ -890,14 +890,14 @@ Body:
       - Item: ShadowchasStone_Bottom2
       - Item: ShadowchasStone_Middle2
       - Item: ShadowchaserStone_Top2
-      - Item: SoulreaperStone_Robe
-      - Item: SoullinkerStone_Top
-      - Item: SoullinkerStone_Middle
-      - Item: SoullinkerStone_Bottom
-      - Item: GladiatorStone_Top
-      - Item: GladiatorStone_Middle
-      - Item: GladiatorStone_Bottom
-      - Item: StaremperorStone_Robe
+      - Item: SoulReaperStone_Robe
+      - Item: SoulLinkerStone_Top
+      - Item: SoulLinkerStone_Middle
+      - Item: SoulLinkerStone_Bottom
+      - Item: StarGladiatorStone_Top
+      - Item: StarGladiatorStone_Middle
+      - Item: StarGladiatorStone_Bottom
+      - Item: StarEmperorStone_Garment
       - Item: NinjaStone_Top
       - Item: NinjaStone_Middle
       - Item: NinjaStone_Bottom
@@ -906,35 +906,35 @@ Body:
       - Item: GunslingerStone_Top
       - Item: GunslingerStone_Middle
       - Item: GunslingerStone_Bottom
-      - Item: RebellionStone_Robe
+      - Item: GunslingerStone_Robe
       - Item: DoramStone_Top
       - Item: DoramStone_Middle
       - Item: DoramStone_Bottom
       - Item: DoramStone_Robe
-      - Item: RangerStone_Top2
-      - Item: RangerStone_Middle2
-      - Item: RangerStone_Bottom2
-      - Item: RangerStone_Robe2
-      - Item: MechanicStone_Top2
-      - Item: MechanicStone_Middle2
-      - Item: MechanicStone_Bottom2
-      - Item: MechanicStone_Robe2
-      - Item: HighpriestStone_Top2
-      - Item: HighpriestStone_Middle2
-      - Item: HighpriestStone_Bottom2
-      - Item: ArchbishopStone_Robe2
+      - Item: RangerStone_II_Top
+      - Item: RangerStone_II_Middle
+      - Item: RangerStone_II_Bottom
+      - Item: RangerStone_II_Garment
+      - Item: MechanicStone_II_Top
+      - Item: MechanicStone_II_Middle
+      - Item: MechanicStone_II_Bottom
+      - Item: MechanicStone_II_Garment
+      - Item: HighpriestStone_II_Top
+      - Item: HighpriestStone_II_Middle
+      - Item: HighpriestStone_II_Bottom
+      - Item: ArchbishopStone_II_Garment
       - Item: WarlockStone_Robe2
       - Item: WarlockStone_Top2
       - Item: WarlockStone_Middle2
       - Item: WarlockStone_Bottom2
-      - Item: RoyalguardStone_Robe2
-      - Item: PaladinStone_Top2
-      - Item: PaladinStone_Middle2
-      - Item: PaladinStone_Bottom2
-      - Item: GuillcrossStone_Robe2
-      - Item: AssacrossStone_Top2
-      - Item: AssacrossStone_Middle2
-      - Item: AssacrossStone_Bottom2
+      - Item: RoyalGuardStone_Robe2
+      - Item: RoyalGuardStone_Top2
+      - Item: RoyalGuardStone_Middle2
+      - Item: RoyalGuardStone_Bottom2
+      - Item: GuillotineCrossStone_Robe2
+      - Item: GuillotineCrossStone_Top2
+      - Item: GuillotineCrossStone_Middle2
+      - Item: GuillotineCrossStone_Bottom2
       - Item: RuneknightStone_Robe2
       - Item: RuneknightStone_Top2
       - Item: RuneknightStone_Middle2
@@ -994,7 +994,7 @@ Body:
       - Item: ShadowchasStone_Top3
       - Item: ShadowchasStone_Middle3
       - Item: ShadowchasStone_Bottom3
-  - Item: EventItem_Recipe
+  - Item: Collectibles_Box
     # TODO: Add official rewards
     RewardGroup: VIOLETBOX
     RequiredRequirementsCount: 10
@@ -1427,7 +1427,7 @@ Body:
         Amount: 10
       - Item: Ein_EYEROCK
         Amount: 10
-  - Item: PetEgg_Recipe
+  - Item: Pet_Egg_Box
     RewardGroup: PET_EGG_BOX
     RequiredRequirementsCount: 2
     Requirements:
@@ -1502,7 +1502,7 @@ Body:
       - Item: Miyabi_Ningyo_Egg
       - Item: Leaf_Cat_Egg
       - Item: Dark_Priest_Egg
-  - Item: Nyang_Costume_Recipe
+  - Item: Costume_Exchange_Box
     RewardGroup: COSTUME_EXCHANGE_BOX
     Requirements:
       - Item: C_Rabbit_Ear_Hat
@@ -1554,7 +1554,7 @@ Body:
       - Item: C_Cowlick_OM
       - Item: C_Cowlick_BU
       - Item: C_Cowlick_WH
-      - Item: C_Cowlick_BL
+      - Item: C_Bouncing_Hair_Black
       - Item: C_Straight_Pony_YL
       - Item: C_Straight_Pony_GN
       - Item: C_Straight_Pony_PP
@@ -1562,7 +1562,7 @@ Body:
       - Item: C_Straight_Pony_OM
       - Item: C_Straight_Pony_BU
       - Item: C_Straight_Pony_WH
-      - Item: C_Straight_Pony_BL
+      - Item: C_Straight_Pony_Black
       - Item: C_Loose_Wave_Twin_YL
       - Item: C_Loose_Wave_Twin_GN
       - Item: C_Loose_Wave_Twin_PP
@@ -1570,7 +1570,7 @@ Body:
       - Item: C_Loose_Wave_Twin_OM
       - Item: C_Loose_Wave_Twin_BU
       - Item: C_Loose_Wave_Twin_WH
-      - Item: C_Loose_Wave_Twin_BL
+      - Item: C_Loose_Wave_Twin
       - Item: C_Cupid_Wing_Pink
       - Item: C_Pecopeco_Cap
       - Item: C_Green_Hat
@@ -1639,7 +1639,7 @@ Body:
       - Item: C_Long_Pony_OM
       - Item: C_Long_Pony_PP
       - Item: C_Piggyback
-      - Item: C_Rune_Helm
+      - Item: C_RuneHelm
       - Item: C_Shaving_Foam
       - Item: C_Blue_Fairy_Wing
       - Item: C_Black_Cat
@@ -1649,7 +1649,7 @@ Body:
       - Item: C_Thanatos_Sword
       - Item: C_Warm_Cat_Muffler
       - Item: C_Clock_Casket
-      - Item: C_Chatty_Parrot
+      - Item: C_Happy_Parrot_J
       - Item: C_Flame_Muffler
       - Item: C_Teddy_Bear_Hood
       - Item: C_Mouton_Life_BL
@@ -1659,7 +1659,7 @@ Body:
       - Item: C_BelieversCap
       - Item: C_Pope_Ribbon
       - Item: C_Alice_Wig
-      - Item: C_Khalitzburg_Helm_BL
+      - Item: Khalitzburg_KN_Helm_BL
       - Item: C_Wanderer_Sakkat
       - Item: C_Wings_of_Michael
       - Item: C_Shura_King_Pledge
@@ -1809,18 +1809,18 @@ Body:
       - Item: C_Fairy_Feathers
       - Item: C_Giant_White_Rabbit
       - Item: C_Katashiro_Flying
-      - Item: C_Love_Daddy
+      - Item: C_Yellow_Hunting_Cap
       - Item: C_Sakura_Coronet
       - Item: C_Full_Bloom_Hairpin
       - Item: Cons_Of_Earth
-      - Item: C_Cons_Of_Wind
+      - Item: Costume_Master_Of_Wind
       - Item: C_Cons_Of_Darkness
       - Item: C_Boitata_Hat_J
       - Item: C_Jioia_TW
       - Item: C_Baldr_Wing_TW
       - Item: C_Brabery_Hat
       - Item: C_Carefree_Face
-      - Item: C_Sting_Silk_Ribbon
+      - Item: C_Stings_Silk_Ribbon
       - Item: C_Adventure_Cat_Bag
       - Item: C_Flower_Summer_Hat
       - Item: C_Cherry_Ribbon
@@ -1853,17 +1853,17 @@ Body:
   - Item: Fan_Upgrade_Kit
     RewardGroup: FAN_UPGRADE_KIT
     Requirements:
-      - Item: SeeOtter_Fan
+      - Item: Sea_Otter_Mini_Fan
   - Item: Suit_Upgrade_Kit
     RewardGroup: SUIT_UPGRADE_KIT
     Requirements:
       - Item: Kafra_Uniform
-  - Item: FallenAngelWing_Reset
+  - Item: Scroll_of_Fallen_Angel_Wings
     RewardGroup: SCROLL_OF_FALLEN_ANGEL_WINGS
     Requirements:
       - Item: Fallen_Angel_Wings_
       - Item: Fallen_Angel_Wing
-  - Item: JobShadow_Mix_Weapon
+  - Item: Class_Shadow_Box_Weapon
     RewardGroup: CLASS_SHADOW_BOX_WEAPON
     MinimumRefine: 7
     Requirements:
@@ -1886,7 +1886,7 @@ Body:
       - Item: S_Ranger_Weapon
       - Item: S_Minstrel_Weapon
       - Item: S_Wanderer_Weapon
-  - Item: JobShadow_Mix_Armor
+  - Item: Class_Shadow_Box_Armor
     RewardGroup: CLASS_SHADOW_BOX_ARMOR
     MinimumRefine: 7
     Requirements:
@@ -1910,7 +1910,7 @@ Body:
       - Item: S_DoramMagical_Armor
       - Item: S_Star_Emperor_Armor
       - Item: S_Soul_Reaper_Armor
-  - Item: JobShadow_Mix_Shoes
+  - Item: Class_Shadow_Box_Shoes
     RewardGroup: CLASS_SHADOW_BOX_SHOES
     MinimumRefine: 7
     Requirements:
@@ -1934,7 +1934,7 @@ Body:
       - Item: S_DoramMagical_Shoes
       - Item: S_Star_Emperor_Shoes
       - Item: S_Soul_Reaper_Shoes
-  - Item: JobShadow_Mix_Shield
+  - Item: Class_Shadow_Box_Shield
     RewardGroup: CLASS_SHADOW_BOX_SHIELD
     MinimumRefine: 7
     Requirements:
@@ -1957,7 +1957,7 @@ Body:
       - Item: S_DoramMagical_Shield
       - Item: S_SuperNovice_Shield
       - Item: S_Gunslinger_Shield
-  - Item: JobShadow_Mix_Pendant
+  - Item: Class_Shadow_Box_Pendant
     RewardGroup: CLASS_SHADOW_BOX_PENDANT
     MinimumRefine: 7
     Requirements:
@@ -1967,7 +1967,7 @@ Body:
       - Item: S_Thief_Pendant
       - Item: S_Magician_Pendant
       - Item: S_Archer_Pendant
-  - Item: JobShadow_Mix_Earing
+  - Item: Class_Shadow_Box_Earring
     RewardGroup: CLASS_SHADOW_BOX_EARRING
     MinimumRefine: 7
     Requirements:
@@ -2067,7 +2067,7 @@ Body:
   - Item: Magical_Cat_Hand
     RewardGroup: MAGICAL_CAT_HAND
     Requirements:
-      - Item: Cat_Lace_Hairband_K
+      - Item: Neko_Headress
   - Item: StabilityShadow_Mix
     RewardGroup: STABILITYSHADOW_MIX
     RequiredRequirementsCount: 3
@@ -2829,7 +2829,7 @@ Body:
     RequiredRequirementsCount: 2
     MinimumRefine: 7
     Requirements:
-      - Item: S2_Hasty_Shoes
+      - Item: S_Hasty_Shoes_II
       - Item: S_Hasty_Armor
       - Item: S_Hasty_Shoes
   - Item: EnchantStone_Recipe_4m
@@ -2911,7 +2911,7 @@ Body:
     RewardGroup: SHIVER_KATAR_K_CUBE
     MinimumRefine: 9
     Requirements:
-      - Item: Shiver_Katar_K
+      - Item: Katar_of_Shiver
   - Item: Blade_Katar_Cube
     RewardGroup: BLADE_KATAR_CUBE
     MinimumRefine: 9
@@ -3202,7 +3202,7 @@ Body:
     RewardGroup: IRON_STAFF_CUBE
     MinimumRefine: 9
     Requirements:
-      - Item: Iron_Staff
+      - Item: Aeon_Staff
   - Item: Blue_Crystal_Staff_Cube
     RewardGroup: BLUE_CRYSTAL_STAFF_CUBE
     MinimumRefine: 9
@@ -3212,7 +3212,7 @@ Body:
     RewardGroup: DEMON_HUNT_BIBLE_CUBE
     MinimumRefine: 9
     Requirements:
-      - Item: Demon_Hunting_Bible_K
+      - Item: Exoricists_Bible_
   - Item: Saint_Hall_Cube
     RewardGroup: SAINT_HALL_CUBE
     MinimumRefine: 9
@@ -3233,12 +3233,12 @@ Body:
     MinimumRefine: 9
     Requirements:
       - Item: Humma_Clear
-  - Item: OneSkyOneSun_Cube
+  - Item: Thousand_Sun_Cube
     RewardGroup: THOUSAND_SUN_CUBE
     MinimumRefine: 9
     Requirements:
       - Item: OneSkyOneSun
-  - Item: SoulWeight_Cube
+  - Item: Spirit_Pendulum_Cube
     RewardGroup: SPIRIT_PENDULUM_CUBE
     MinimumRefine: 9
     Requirements:
@@ -3253,17 +3253,17 @@ Body:
     MinimumRefine: 9
     Requirements:
       - Item: Master_Soul_Rifle
-  - Item: Golden_L_Launcher_Cube
+  - Item: Golden_Lord_Launcher_Cube
     RewardGroup: GOLDEN_LORD_LAUNCHER_CUBE
     MinimumRefine: 9
     Requirements:
       - Item: Golden_L_Launcher
-  - Item: The_Black_Gatling_Cube
+  - Item: The_Black_Cube
     RewardGroup: THE_BLACK_CUBE
     MinimumRefine: 9
     Requirements:
       - Item: The_Black_Gatling
-  - Item: Demon_S_Shot_Cube
+  - Item: Demon_Slayer_Shot_Cube
     RewardGroup: DEMON_SLAYER_SHOT_CUBE
     MinimumRefine: 9
     Requirements:
@@ -3307,11 +3307,11 @@ Body:
     Requirements:
       - Item: S_Penetration_Shoes
       - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
       - Item: S_Penetration_Earring
       - Item: S_Penetration_Pendent
       - Item: S_Executioner_Weapon
@@ -3324,7 +3324,7 @@ Body:
       - Item: S_Vibration_Weapon
       - Item: S_Holy_Water_Weapon
       - Item: S_Scissors_Weapon
-      - Item: S2_Force_Ex_Weapon
+      - Item: S_Force_Executioner_Weapon
       - Item: S_Penetration_Weapon
       - Item: S_Penetration_Armor
       - Item: S_Exe_Ho_Weapon
@@ -3344,11 +3344,11 @@ Body:
     Requirements:
       - Item: S_Tempest_Shoes
       - Item: S_Tempest_Shield
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
       - Item: S_Tempest_Earring
       - Item: S_Tempest_Pendent
       - Item: S_M_Executioner_Weapon
@@ -3361,7 +3361,7 @@ Body:
       - Item: S_M_Vibration_Weapon
       - Item: S_M_Holy_Water_Weapon
       - Item: S_M_Scissors_Weapon
-      - Item: S2_Spirit_M_E_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
       - Item: S_Tempest_Weapon
       - Item: S_Tempest_Armor
       - Item: S_M_Exe_Ho_Weapon
@@ -3696,8 +3696,8 @@ Body:
 #      - Item: S_Gemstone_Shield_II
 #      - Item: S_Bearer's_Armor_II
 #      - Item: S_Bearer's_Shoes_II
-#      - Item: S_AllMighty_Earring
-#      - Item: S_AllMighty_Pendant
+#      - Item: S_Almighty_Earring
+#      - Item: S_Almighty_Pendant
 #      - Item: S_Tempest_Shield
 #      - Item: S_Tempest_Shoes
 #      - Item: S_Magic_Executioner_Holy_Water_Armor
@@ -3748,8 +3748,8 @@ Body:
 #      - Item: S_Magical_Armor
 #      - Item: S_Immune_Athena_Shield
 #      - Item: S_Hard_Champion_Shoes
-#      - Item: S_KingbirdAncient_Armor
-#      - Item: S_CriticalHit_Armor
+#      - Item: S_Kingbird_Ancient_Armor
+#      - Item: S_Cri_Hit_Armor
 #      - Item: S_Rebellion_Armor
 #      - Item: S_Kagerou_Armor
 #      - Item: S_Oboro_Armor
@@ -4209,9 +4209,9 @@ Body:
       - Item: S_Gemstone_Earring
       - Item: S_Gemstone_Pendent
       - Item: S_Gemstone_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Gemstone_Earring
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Gemstone_Earring_II
   - Item: Mammoth_Mix
     RewardGroup: MAMMOTH_MIX
     RequiredRequirementsCount: 6
@@ -4247,11 +4247,11 @@ Body:
       - Item: S_Spiritual_Weapon
       - Item: S_Spiritual_Earring
       - Item: S_Spiritual_Pendent
-      - Item: S2_Spiritual_Weapon
+      - Item: S_Spiritual_Weapon_II
       - Item: S_Malicious_Armor
       - Item: S_Malicious_Shoes
       - Item: S_Malicious_Shield
-      - Item: S2_Malicious_Armor
+      - Item: S_Malicious_Armor_II
   - Item: MajorAutoSpell_Mix
     RewardGroup: MAJORAUTOSPELL_MIX
     RequiredRequirementsCount: 6
@@ -4341,18 +4341,18 @@ Body:
       - Item: S_Reload_Armor
       - Item: S_Reload_Shoes
       - Item: S_Reload_Shield
-      - Item: S2_Reload_Armor
+      - Item: S_Reload_Armor_II
   - Item: SpellCasterShadow_Mix
     RewardGroup: SPELLCASTERSHADOW_MIX
     RequiredRequirementsCount: 6
     MinimumRefine: 7
     MaximumRefine: 10
     Requirements:
-      - Item: S2_Spell_Flow_Shield
+      - Item: S_Spellflow_Shield_II
       - Item: S_Spell_Flow_Shield
       - Item: S_Spell_Flow_Armor
       - Item: S_Spell_Flow_Shoes
-      - Item: S2_Caster_Armor
+      - Item: S_Caster_Armor_II
       - Item: S_Caster_Armor
       - Item: S_Caster_Shield
       - Item: S_Caster_Shoes
@@ -4469,9 +4469,9 @@ Body:
     MinimumRefine: 7
     MaximumRefine: 10
     Requirements:
-      - Item: S2_Bearers_Shoes
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Pendent
+      - Item: S_Bearer's_Shoes_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Pendant_II
       - Item: S_Bearers_Earring
       - Item: S_Bearers_Pendent
       - Item: S_Bearers_Armor

db/re/laphine_upgrade.yml

@@ -475,46 +475,46 @@ Body:
       - Item: S_DoramMagical_Shield
       - Item: S_SuperNovice_Shield
       - Item: S_Gunslinger_Shield
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
       - Item: S_Sigrun_Armor
       - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
       - Item: S_Critical_Shield
       - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
-      - Item: S_AllMighty_Earring
-      - Item: S_AllMighty_Pendant
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
+      - Item: S_Almighty_Earring
+      - Item: S_Almighty_Pendant
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
       - Item: S_Blitz_Weapon
       - Item: S_Blitz_Armor
       - Item: S_Tempest_Shield
       - Item: S_Tempest_Shoes
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
-      - Item: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
       - Item: S_Tension_Weapon
       - Item: S_Tension_Earring
       - Item: S_Tension_Pendent
@@ -524,17 +524,17 @@ Body:
       - Item: S_Healing_Shield
       - Item: S_Healing_Shoes
       - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
       - Item: S_Penetration_Shoes
       - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
       - Item: Sentimental_Weapone_S
       - Item: Sentimental_Earring_S
       - Item: Sentimental_Pendant_S
@@ -548,10 +548,10 @@ Body:
       - Item: S_Magical_Shoes
       - Item: S_Magical_Shield
       - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
-      - Item: S_KingbirdAncient_Armor
-      - Item: S_CriticalHit_Armor
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
+      - Item: S_Kingbird_Ancient_Armor
+      - Item: S_Cri_Hit_Armor
       - Item: S_Thief_earring
       - Item: S_Archer_earring
       - Item: S_Rebellion_Armor
@@ -1207,46 +1207,46 @@ Body:
       - Item: S_Reload_Shoes
       - Item: S_Reload_Shield
       - Item: S_Reload_Armor
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
       - Item: S_Sigrun_Armor
       - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
       - Item: S_Critical_Shield
       - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
-      - Item: S_AllMighty_Earring
-      - Item: S_AllMighty_Pendant
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
+      - Item: S_Almighty_Earring
+      - Item: S_Almighty_Pendant
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
       - Item: S_Blitz_Weapon
       - Item: S_Blitz_Armor
       - Item: S_Tempest_Shield
       - Item: S_Tempest_Shoes
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
-      - Item: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
       - Item: S_Tension_Weapon
       - Item: S_Tension_Earring
       - Item: S_Tension_Pendent
@@ -1256,17 +1256,17 @@ Body:
       - Item: S_Healing_Shield
       - Item: S_Healing_Shoes
       - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
       - Item: S_Penetration_Shoes
       - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
       - Item: Sentimental_Weapone_S
       - Item: Sentimental_Earring_S
       - Item: Sentimental_Pendant_S
@@ -1280,10 +1280,10 @@ Body:
       - Item: S_Magical_Shoes
       - Item: S_Magical_Shield
       - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
-      - Item: S_KingbirdAncient_Armor
-      - Item: S_CriticalHit_Armor
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
+      - Item: S_Kingbird_Ancient_Armor
+      - Item: S_Cri_Hit_Armor
       - Item: S_Tempest_Weapon
       - Item: S_Tempest_Armor
       - Item: S_PerfectSize_Weapon
@@ -2017,46 +2017,46 @@ Body:
       - Item: S_DoramMagical_Shield
       - Item: S_SuperNovice_Shield
       - Item: S_Gunslinger_Shield
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
       - Item: S_Sigrun_Armor
       - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
       - Item: S_Critical_Shield
       - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
-      - Item: S_AllMighty_Earring
-      - Item: S_AllMighty_Pendant
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
+      - Item: S_Almighty_Earring
+      - Item: S_Almighty_Pendant
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
       - Item: S_Blitz_Weapon
       - Item: S_Blitz_Armor
       - Item: S_Tempest_Shield
       - Item: S_Tempest_Shoes
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
-      - Item: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
       - Item: S_Tension_Weapon
       - Item: S_Tension_Earring
       - Item: S_Tension_Pendent
@@ -2066,17 +2066,17 @@ Body:
       - Item: S_Healing_Shield
       - Item: S_Healing_Shoes
       - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
       - Item: S_Penetration_Shoes
       - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
       - Item: Sentimental_Weapone_S
       - Item: Sentimental_Earring_S
       - Item: Sentimental_Pendant_S
@@ -2090,10 +2090,10 @@ Body:
       - Item: S_Magical_Shoes
       - Item: S_Magical_Shield
       - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
-      - Item: S_KingbirdAncient_Armor
-      - Item: S_CriticalHit_Armor
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
+      - Item: S_Kingbird_Ancient_Armor
+      - Item: S_Cri_Hit_Armor
       - Item: S_Thief_earring
       - Item: S_Archer_earring
       - Item: S_Rebellion_Armor
@@ -2496,11 +2496,11 @@ Body:
       - Item: Magic_Sword
       - Item: Sword_Of_Bluefire
       - Item: Avenger
-      - Item: Iron_Staff
+      - Item: Aeon_Staff
       - Item: Oriental_Sword
       - Item: Undine_Spear_K
-      - Item: Demon_Hunting_Bible_K
-      - Item: Shiver_Katar_K
+      - Item: Exoricists_Bible_
+      - Item: Katar_of_Shiver
       - Item: OneSkyOneSun
       - Item: SoulWeight
       - Item: MeawFoxtail
@@ -2554,12 +2554,12 @@ Body:
       - Item: Up_Fog_Dew_Sword
       - Item: Up_Humma_Clear
       - Item: Up_Master_Soul_Rifle
-      - Item: Up_Golden_L_Launcher
-      - Item: Up_The_Black_Gatling
-      - Item: Up_Demon_S_Shot
+      - Item: Up_Golden_Lord_Launcher
+      - Item: Up_The_Black
+      - Item: Up_Demon_Slayer_Shot
       - Item: Up_Crimson_Rose
-      - Item: Up_OneSkyOneSun
-      - Item: Up_SoulWeight
+      - Item: Up_Thousand_Sun
+      - Item: Up_Spirit_Pendulum_
   - Item: Ancient_Hero_Wisdom
     RandomOptionGroup: ANCIENT_HERO_WISDOM
     TargetItems:
@@ -2570,11 +2570,11 @@ Body:
       - Item: Magic_Sword
       - Item: Sword_Of_Bluefire
       - Item: Avenger
-      - Item: Iron_Staff
+      - Item: Aeon_Staff
       - Item: Oriental_Sword
       - Item: Undine_Spear_K
-      - Item: Demon_Hunting_Bible_K
-      - Item: Shiver_Katar_K
+      - Item: Exoricists_Bible_
+      - Item: Katar_of_Shiver
       - Item: OneSkyOneSun
       - Item: SoulWeight
       - Item: MeawFoxtail
@@ -2628,29 +2628,29 @@ Body:
       - Item: Up_Fog_Dew_Sword
       - Item: Up_Humma_Clear
       - Item: Up_Master_Soul_Rifle
-      - Item: Up_Golden_L_Launcher
-      - Item: Up_The_Black_Gatling
-      - Item: Up_Demon_S_Shot
+      - Item: Up_Golden_Lord_Launcher
+      - Item: Up_The_Black
+      - Item: Up_Demon_Slayer_Shot
       - Item: Up_Crimson_Rose
-      - Item: Up_OneSkyOneSun
-      - Item: Up_SoulWeight
+      - Item: Up_Thousand_Sun
+      - Item: Up_Spirit_Pendulum_
   - Item: Boost_Up_1
     ResultRefine: 10
     MaximumRefine: 9
     CardsAllowed: true
     TargetItems:
-      - Item: Atker_Plate
-      - Item: Atker_Manteau
-      - Item: Atker_Greave
-      - Item: Ran_Suits
-      - Item: Ran_Manteau
-      - Item: Ran_Boots
-      - Item: Ele_Robe
-      - Item: Ele_Muffler
-      - Item: Ele_Shoes
-      - Item: Defn_Robe
-      - Item: Defn_Muffler
-      - Item: Defn_Shoes
+      - Item: Attacker_Booster_Plate_
+      - Item: Attacker_Booster_Manteau_
+      - Item: Attacker_Booster_Greaves_
+      - Item: Ranger_Booster_Suits_
+      - Item: Ranger_Booster_Manteau_
+      - Item: Ranger_Booster_Boots_
+      - Item: Elemental_Booster_Robe_
+      - Item: Elemental_Booster_Muffler_
+      - Item: Elemental_Booster_Shoes_
+      - Item: Defender_Booster_Robe_
+      - Item: Defender_Booster_Muffler_
+      - Item: Defender_Booster_Shoes_
   - Item: Boost_Up_2
     ResultRefine: 10
     CardsAllowed: true
@@ -3881,11 +3881,11 @@ Body:
       - Item: Magic_Sword
       - Item: Sword_Of_Bluefire
       - Item: Avenger
-      - Item: Iron_Staff
+      - Item: Aeon_Staff
       - Item: Oriental_Sword
       - Item: Undine_Spear_K
-      - Item: Demon_Hunting_Bible_K
-      - Item: Shiver_Katar_K
+      - Item: Exoricists_Bible_
+      - Item: Katar_of_Shiver
       - Item: OneSkyOneSun
       - Item: SoulWeight
       - Item: MeawFoxtail
@@ -4091,41 +4091,41 @@ Body:
     MaximumRefine: 11
     CardsAllowed: true
     TargetItems:
-      - Item: Staff_Of_Miracle
+      - Item: Staff_of_Miracle
       - Item: Gravitation_Staff
       - Item: Adorare_Staff
       - Item: Volar
       - Item: Vernan
-      - Item: Reaper_Cross
+      - Item: Ripper_Cross
       - Item: Agudo_Filo
       - Item: Maxi_Spanner
-      - Item: Rapid_Fire_C_Bow
+      - Item: Rapid_Fire
       - Item: Sharp_Star_Bow
       - Item: Aiming_Bow
       - Item: Falken_Shooter
       - Item: Wind_Gale
       - Item: Golden_Wrench
-      - Item: Combo_Fist
-      - Item: Asura_Bandage
+      - Item: Raging_Dragon_Fist
+      - Item: Dedicated_Bandage
       - Item: Engine_Pilebuncker
       - Item: Coolant_Injection
       - Item: Gene_Rod
       - Item: Lucis_Flail
-      - Item: Bright_Mace
+      - Item: Bright_Pendulum
       - Item: Crimson_Rose_Stick
       - Item: Psychic_Spear_Rod
       - Item: Dust_Grave
-      - Item: Ponitendtia
+      - Item: Penitentia
       - Item: Heart_Whip
       - Item: Scarlet_Ribbon
-      - Item: Boltigin
+      - Item: Boltijin
       - Item: Judgement_Slasher
       - Item: Repent_Slasher
       - Item: Jack_The_Knife
       - Item: Platinum_Dagger
       - Item: Argen_Blanco
       - Item: Harve
-      - Item: Fortrage
+      - Item: Fortridge
       - Item: Black_Circle
       - Item: Antique_Cello
       - Item: Farthezan
@@ -4215,12 +4215,12 @@ Body:
 #      - Item: Up_Fog_Dew_Sword
 #      - Item: Up_Humma_Clear
 #      - Item: Up_Master_Soul_Rifle
-#      - Item: Up_Golden_L_Launcher
-#      - Item: Up_The_Black_Gatling
-#      - Item: Up_Demon_S_Shot
+#      - Item: Up_Golden_Lord_Launcher
+#      - Item: Up_The_Black
+#      - Item: Up_Demon_Slayer_Shot
 #      - Item: Up_Crimson_Rose
-#      - Item: Up_OneSkyOneSun
-#      - Item: Up_SoulWeight
+#      - Item: Up_Thousand_Sun
+#      - Item: Up_Spirit_Pendulum_
 #  - Item: Great_Hero_Wisdom
 #    TargetItems:
 #      - Item: Up_Oriental_Sword
@@ -4252,12 +4252,12 @@ Body:
 #      - Item: Up_Fog_Dew_Sword
 #      - Item: Up_Humma_Clear
 #      - Item: Up_Master_Soul_Rifle
-#      - Item: Up_Golden_L_Launcher
-#      - Item: Up_The_Black_Gatling
-#      - Item: Up_Demon_S_Shot
+#      - Item: Up_Golden_Lord_Launcher
+#      - Item: Up_The_Black
+#      - Item: Up_Demon_Slayer_Shot
 #      - Item: Up_Crimson_Rose
-#      - Item: Up_OneSkyOneSun
-#      - Item: Up_SoulWeight
+#      - Item: Up_Thousand_Sun
+#      - Item: Up_Spirit_Pendulum_
   - Item: Vampire_Box_IL
     ResultRefineMinimum: 7
     ResultRefineMaximum: 10
@@ -5148,11 +5148,3 @@ Body:
 #      - Item: S_M_Mammoth_Shoes
 #      - Item: S_M_Mammoth_Earring
 #      - Item: S_M_Mammoth_Pendant
-  - Item: SubjectCape_Refine_Cube
-    ResultRefine: 12
-    MaximumRefine: 11
-    CardsAllowed: true
-    TargetItems:
-      - Item: Subject_CapeRange_TH
-      - Item: Subject_CapeMagic_TH
-      - Item: Subject_CapeMelee_TH

db/re/map_drops.yml

@@ -1,44 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Map Drop Database
-###########################################################################
-#
-# Map Drop Settings
-#
-###########################################################################
-# - Map                             Name of the map.
-#   GlobalDrops                     Drops for all monsters on this map. (Default: empty)
-#                                   These drops are unaffected by server drop rate and cannot be stolen.
-#     - Index                       Unique index of the drop.
-#       Item                        Item name.
-#       Rate                        Drop rate of item.
-#       RandomOptionGroup           Random Option Group applied to item on drop. (Default: None)
-#   SpecificDrops                   Drops for specific monsters on this map. (Default: empty)
-#     - Monster                     Monster name.
-#       Drops                       Drops for this specific monster. (Default: empty)
-#                                   These drops are unaffected by server drop rate and cannot be stolen.
-#         - Index                   Unique index of the drop.
-#           Item                    Item name.
-#           Rate                    Drop rate of item.
-#           RandomOptionGroup       Random Option Group applied to item on drop. (Default: None)
-###########################################################################
-
-Header:
-  Type: MAP_DROP_DB
-  Version: 1

db/re/mercenary_db.yml

@@ -611,69 +611,3 @@ Body:
     Skills:
       - Name: MER_INVINCIBLEOFF2
         MaxLevel: 1
-  - Id: 3569
-    AegisName: POPE_MD_H_MERC_NORMAL
-    Name: Official Pope
-    Level: 120
-    Hp: 120000
-    Sp: 200
-    Attack: 123
-    Defense: 999
-    MagicDefense: 105
-    Str: 2
-    Vit: 400
-    Int: 10
-    Dex: 110
-    AttackRange: 1
-    SkillRange: 10
-    ChaseRange: 12
-    Size: Medium
-    Race: Demihuman
-    Element: Neutral
-    ElementLevel: 3
-    WalkSpeed: 100
-    AttackDelay: 576
-    AttackMotion: 750
-    DamageMotion: 384
-    Skills:
-      - Name: MER_MAGNIFICAT
-        MaxLevel: 1
-      - Name: MER_DECAGI
-        MaxLevel: 1
-      - Name: MER_TENDER
-        MaxLevel: 1
-      - Name: MER_BLESSING
-        MaxLevel: 3
-  - Id: 3570
-    AegisName: POPE_MD_H_MERC_CASUAL
-    Name: Casual Pope
-    Level: 120
-    Hp: 120000
-    Sp: 200
-    Attack: 123
-    Defense: 999
-    MagicDefense: 105
-    Str: 2
-    Vit: 400
-    Int: 10
-    Dex: 110
-    AttackRange: 1
-    SkillRange: 10
-    ChaseRange: 12
-    Size: Medium
-    Race: Demihuman
-    Element: Neutral
-    ElementLevel: 3
-    WalkSpeed: 100
-    AttackDelay: 576
-    AttackMotion: 750
-    DamageMotion: 384
-    Skills:
-      - Name: MER_MAGNIFICAT
-        MaxLevel: 1
-      - Name: MER_DECAGI
-        MaxLevel: 1
-      - Name: MER_TENDER
-        MaxLevel: 1
-      - Name: MER_BLESSING
-        MaxLevel: 3

db/re/mob_skill_db.txt

@@ -45,8 +45,6 @@
 //	casttargeted		When a target is in cast range (no condition value).
 //	rudeattacked		When mob is rude attacked (no condition value).
 //	mobnearbygt		When monsters in range become greater than specified number.
-//	groundattacked		When mob is hit by ground targeted skill (no condition value).
-//	damagedgt		When single attack deals greater damage than specified number.
 //
 //	Status abnormalities specified through the statuson/statusoff system:
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /
@@ -174,7 +172,6 @@
 1038,Osiris@NPC_DARKBREATH,attack,202,5,500,0,5000,no,target,always,0,,,,,,9,
 1038,Osiris@NPC_DARKBREATH,chase,202,5,500,0,5000,no,target,always,0,,,,,,9,
 1038,Osiris@NPC_POISONATTACK,attack,188,5,2000,0,5000,no,target,always,0,,,,,,9,
-1038,Osiris@NPC_ALLHEAL,attack,687,1,10000,0,100000,yes,self,damagedgt,50000,,,,,,,
 1038,Osiris@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,self,slavele,3,1522,,,,,,
 1038,Osiris@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,slavele,3,1522,,,,,,
 1038,Osiris@NPC_SUMMONSLAVE,idle,196,7,10000,0,0,no,self,onspawn,0,1029,,,,,,
@@ -203,7 +200,6 @@
 1039,Baphomet@WZ_VERMILION,attack,85,21,2000,500,2000,no,target,always,0,,,,,,29,
 1039,Baphomet@WZ_VERMILION,chase,85,21,5000,500,2000,no,target,skillused,18,,,,,,29,
 1039,Baphomet@WZ_VERMILION,chase,85,21,2000,500,2000,no,target,always,0,,,,,,29,
-1039,Baphomet@NPC_ALLHEAL,attack,687,1,10000,3000,100000,no,self,damagedgt,50000,,,,,,,
 1039,Baphomet@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
 1040,Golem@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
 1040,Golem@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
@@ -719,8 +715,8 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,master,alchemist,,,,,,,,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,afterskill,331,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
 1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
@@ -867,7 +863,6 @@
 1159,Phreeoni@AL_HEAL,idle,28,11,10000,0,5000,yes,self,mystatuson,hiding,,,,,,,
 1159,Phreeoni@WZ_HEAVENDRIVE,chase,91,5,10000,0,5000,no,target,skillused,18,,,,,,19,
 1159,Phreeoni@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1159,Phreeoni@NPC_ALLHEAL,attack,687,1,10000,1000,120000,no,self,damagedgt,50000,,,,,,,
 1160,Piere@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1160,Piere@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,6,
 1161,Plankton@NPC_WATERATTACK,attack,184,1,2000,0,5000,yes,target,always,0,,,,,,,
@@ -1792,7 +1787,6 @@
 1389,Dracula@NPC_INVISIBLE,chase,353,1,2000,200,5000,yes,self,always,0,,,,,,,
 1389,Dracula@NPC_SILENCEATTACK,attack,178,5,2000,0,5000,no,target,always,0,,,,,,,
 1389,Dracula@NPC_SILENCEATTACK,chase,178,5,2000,0,5000,no,target,always,0,,,,,,,
-1389,Dracula@SA_LANDPROTECTOR,attack,288,3,3000,0,5000,yes,self,groundattacked,0,,,,,,,
 1389,Dracula@NPC_SUMMONSLAVE,attack,196,16,10000,700,5000,no,self,slavele,5,1419,,,,,,
 1389,Dracula@NPC_SUMMONSLAVE,idle,196,16,10000,700,5000,no,self,slavele,5,1419,,,,,,
 1389,Dracula@NPC_ENERGYDRAIN,chase,200,1,10000,0,0,yes,target,skillused,18,,,,,,,
@@ -1996,7 +1990,6 @@
 1418,Evil Snake Lord@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,32,
 1418,Evil Snake Lord@MG_FROSTDIVER,attack,15,40,2000,0,5000,yes,target,always,0,,,,,,,
 1418,Evil Snake Lord@MG_FROSTDIVER,chase,15,40,2000,0,0,yes,target,always,0,,,,,,,
-1418,Evil Snake Lord@NPC_ALLHEAL,attack,687,1,5000,1500,60000,no,self,damagedgt,30000,,,,,,20,
 1418,Evil Snake Lord@NPC_SHIELDBRAKE,attack,346,10,2000,0,0,yes,target,always,0,,,,,,2,
 1418,Evil Snake Lord@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
 1418,Evil Snake Lord@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
@@ -2598,7 +2591,6 @@
 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,,,,,,,,
 1511,Amon Ra@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1511,Amon Ra@WZ_STORMGUST,idle,89,10,3000,0,0,yes,target,groundattacked,0,,,,,,9,
 1512,Hyegun@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,,
 1512,Hyegun@AS_SONICBLOW,attack,136,5,500,1000,30000,no,target,always,0,,,,,,,
 1512,Hyegun@NPC_CRITICALSLASH,attack,170,1,500,0,5000,yes,target,always,0,,,,,,,
@@ -3821,7 +3813,6 @@
 1719,Detale@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,30,,,,,,47,
 1719,Detale@AL_HEAL,attack,28,11,10000,0,5000,yes,self,myhpltmaxrate,30,,,,,,47,
 1719,Detale@AL_HEAL,chase,28,11,10000,0,5000,yes,self,myhpltmaxrate,30,,,,,,47,
-1719,Detale@NPC_COMET,attack,708,5,5000,2000,60000,no,target,groundattacked,0,,,,,,29,
 1720,Hydro@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1720,Hydro@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,30,,,,,,47,
 1720,Hydro@AL_HEAL,attack,28,11,10000,0,5000,yes,self,myhpltmaxrate,30,,,,,,47,
@@ -5429,7 +5420,7 @@
 1991,Tendrilion@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
 1991,Tendrilion@NPC_DRAGONFEAR,attack,659,2,500,0,10000,yes,self,always,0,,,,,,,
 1991,Tendrilion@NPC_GROUNDATTACK,attack,185,4,1000,0,5000,yes,target,always,0,,,,,,21,
-1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x38A5,,,,7,
+1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x3885,,,,7,
 1991,Tendrilion@NPC_ALLHEAL,idle,687,1,10000,30000,30000,yes,self,myhpltmaxrate,80,,,,,,,
 1992,Cornus@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1992,Cornus@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -7828,7 +7819,6 @@
 2251,Gioia@NPC_EARTHQUAKE,chase,653,5,10000,500,20000,no,self,myhpltmaxrate,40,,,,,,,
 2251,Gioia@NPC_EARTHQUAKE,attack,653,5,10000,500,20000,no,self,myhpltmaxrate,40,,,,,,,
 2251,Gioia@NPC_PULSESTRIKE,attack,661,5,10000,0,15000,yes,self,myhpltmaxrate,60,,,,,,,
-2251,Gioia@NPC_ALLHEAL,attack,687,1,10000,1500,120000,no,self,damagedgt,50000,,,,,,,
 2251,Gioia@NPC_DRAGONFEAR,attack,659,5,10000,0,10000,yes,self,always,0,,,,,,,
 2251,Gioia@NPC_DRAGONFEAR,chase,659,5,10000,0,10000,yes,self,always,0,,,,,,,
 2251,Gioia@WZ_METEOR,idle,83,9,10000,0,5000,yes,target,always,0,,,,,,,
@@ -8227,7 +8217,6 @@
 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,,,,,,,,
 2362,Nightmare Amon Ra@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-2362,Nightmare Amon Ra@WZ_STORMGUST,idle,89,10,3000,0,0,yes,target,groundattacked,0,,,,,,9,
 
 // Eclage
 2363,Menblatt@KN_PIERCE,attack,56,10,500,700,5000,no,target,always,0,,,,,,6,
@@ -11856,15 +11845,18 @@
 3239,V_G_TRENTINI@NPC_WIDEFREEZE,attack,664,5,100,1000,20000,no,self,always,,,,,,,,
 3239,V_G_TRENTINI@NPC_WIDECURSE,attack,677,5,100,1000,20000,no,self,always,,,,,,,,
 3240,V_B_RANDEL@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3240,V_B_RANDEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
+// 3240,V_B_RANDEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
+3240,V_B_RANDEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,,
 3240,V_B_RANDEL@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3240,V_B_RANDEL@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3240,V_B_RANDEL@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3240,V_B_RANDEL@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3240,V_B_RANDEL@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3240,V_B_RANDEL@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3240,V_B_RANDEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
-3240,V_B_RANDEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3234,3235,3236,3237,3238,3239,
+// 3240,V_B_RANDEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
+3240,V_B_RANDEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,,
+// 3240,V_B_RANDEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3234,3235,3236,3237,3238,3239,
+3240,V_B_RANDEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3234,3235,3236,3237,3238,,
 3240,V_B_RANDEL@PA_PRESSURE,attack,367,5,200,0,10000,no,target,always,,,,,,,,
 3240,V_B_RANDEL@CR_REFLECTSHIELD,attack,252,5,10,0,200000,yes,self,always,,,,,,,32,
 3240,V_B_RANDEL@CR_REFLECTSHIELD,attack,252,5,1000,0,200000,yes,self,casttargeted,,,,,,,32,
@@ -11878,16 +11870,19 @@
 3240,V_B_RANDEL@NPC_WIDESLEEP,attack,668,5,100,1000,10000,no,self,always,,,,,,,,
 3241,V_B_FLAMEL@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3241,V_B_FLAMEL@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3241,V_B_FLAMEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+// 3241,V_B_FLAMEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+3241,V_B_FLAMEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,,
 3241,V_B_FLAMEL@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3241,V_B_FLAMEL@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3241,V_B_FLAMEL@AM_DEMONSTRATION,chase,229,5,200,0,10000,yes,target,always,,,,,,,,
 3241,V_B_FLAMEL@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3241,V_B_FLAMEL@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3241,V_B_FLAMEL@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3241,V_B_FLAMEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+// 3241,V_B_FLAMEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+3241,V_B_FLAMEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,,
 3241,V_B_FLAMEL@NPC_MAXPAIN,attack,716,10,100,1000,30000,no,self,always,,,,,,,,
-3241,V_B_FLAMEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3235,3236,3237,3238,3239,
+// 3241,V_B_FLAMEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3235,3236,3237,3238,3239,
+3241,V_B_FLAMEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3235,3236,3237,3238,,
 3241,V_B_FLAMEL@CR_ACIDDEMONSTRATION,attack,490,5,100,1000,5000,no,target,always,,,,,,,,
 3241,V_B_FLAMEL@NPC_PULSESTRIKE,attack,661,5,100,0,5000,yes,self,always,,,,,,,,
 3241,V_B_FLAMEL@NPC_AGIUP,attack,350,5,200,0,100000,yes,self,always,,,,,,,,
@@ -11898,7 +11893,8 @@
 3241,V_B_FLAMEL@NPC_WIDESTUN,attack,678,5,300,1000,10000,no,self,always,,,,,,,,
 3242,V_B_CELIA@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3242,V_B_CELIA@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3242,V_B_CELIA@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
+// 3242,V_B_CELIA@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
+3242,V_B_CELIA@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,,
 3242,V_B_CELIA@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3242,V_B_CELIA@NPC_MENTALBREAKER,chase,159,5,100,0,10000,yes,target,always,,,,,,,7,
 3242,V_B_CELIA@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,,,,,,,,
@@ -11908,8 +11904,10 @@
 3242,V_B_CELIA@MG_LIGHTNINGBOLT,chase,20,10,300,0,5000,yes,target,always,,,,,,,,
 3242,V_B_CELIA@NPC_WIDESTONE,chase,666,5,300,1000,10000,no,self,always,,,,,,,,
 3242,V_B_CELIA@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3242,V_B_CELIA@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
-3242,V_B_CELIA@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3236,3237,3238,3239,
+// 3242,V_B_CELIA@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
+3242,V_B_CELIA@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,,
+// 3242,V_B_CELIA@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3236,3237,3238,3239,
+3242,V_B_CELIA@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3236,3237,3238,,
 3242,V_B_CELIA@SA_LANDPROTECTOR,attack,288,5,300,0,20000,yes,target,always,,,,,,,,
 3242,V_B_CELIA@NPC_MENTALBREAKER,attack,159,5,50,0,10000,yes,target,always,,,,,,,7,
 3242,V_B_CELIA@SA_DISPELL,attack,289,5,1000,0,30000,yes,target,always,,,,,,,,
@@ -11921,13 +11919,16 @@
 3242,V_B_CELIA@NPC_PSYCHIC_WAVE,attack,736,7,500,500,5000,no,target,always,,,,,,,,
 3242,V_B_CELIA@NPC_PSYCHIC_WAVE,attack,736,10,300,3000,10000,no,target,always,,,,,,,9,
 3243,V_B_CHEN@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3243,V_B_CHEN@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
+// 3243,V_B_CHEN@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
+3243,V_B_CHEN@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,,
 3243,V_B_CHEN@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3243,V_B_CHEN@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3243,V_B_CHEN@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3243,V_B_CHEN@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3243,V_B_CHEN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
-3243,V_B_CHEN@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3237,3238,3239,
+// 3243,V_B_CHEN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
+3243,V_B_CHEN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,,
+// 3243,V_B_CHEN@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3237,3238,3239,
+3243,V_B_CHEN@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3237,3238,,
 3243,V_B_CHEN@MO_EXTREMITYFIST,attack,271,5,300,1000,7000,no,target,always,,,,,,,,
 3243,V_B_CHEN@MO_EXTREMITYFIST,attack,271,5,100,1000,3000,no,target,myhpltmaxrate,10,,,,,,,
 3243,V_B_CHEN@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
@@ -11940,15 +11941,18 @@
 3243,V_B_CHEN@NPC_WIDEBLEEDING,attack,665,5,100,1000,10000,no,self,always,,,,,,,,
 3243,V_B_CHEN@NPC_WIDESILENCE,attack,663,5,100,1000,10000,no,self,always,,,,,,,,
 3244,V_B_GERTIE@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3244,V_B_GERTIE@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
+// 3244,V_B_GERTIE@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
+3244,V_B_GERTIE@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,,
 3244,V_B_GERTIE@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3244,V_B_GERTIE@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3244,V_B_GERTIE@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3244,V_B_GERTIE@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3244,V_B_GERTIE@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3244,V_B_GERTIE@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3244,V_B_GERTIE@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
-3244,V_B_GERTIE@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3238,3239,
+// 3244,V_B_GERTIE@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
+3244,V_B_GERTIE@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,,
+// 3244,V_B_GERTIE@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3238,3239,
+3244,V_B_GERTIE@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3238,,
 3244,V_B_GERTIE@NPC_AGIUP,attack,350,5,200,0,100000,yes,self,always,,,,,,,,
 3244,V_B_GERTIE@NPC_AGIUP,attack,350,5,200,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 3244,V_B_GERTIE@RG_STRIPSHIELD,attack,216,5,50,0,2000,yes,target,myhpltmaxrate,90,,,,,,,
@@ -11962,15 +11966,18 @@
 3244,V_B_GERTIE@NPC_WIDESLEEP,attack,668,10,100,1000,30000,no,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
+// 3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
+3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
 3245,V_B_ALPHOCCIO@NPC_SLOWCAST,chase,672,5,200,300,10000,no,self,always,,,,,,,36,
 3245,V_B_ALPHOCCIO@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3245,V_B_ALPHOCCIO@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3245,V_B_ALPHOCCIO@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3245,V_B_ALPHOCCIO@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
-3245,V_B_ALPHOCCIO@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3239,
+// 3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
+3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
+// 3245,V_B_ALPHOCCIO@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3239,
+3245,V_B_ALPHOCCIO@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,,
 // 3245,V_B_ALPHOCCIO@NPC_ASSASSINCROSS,attack,2539,10,100,1000,150000,no,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_POWERUP,attack,349,5,200,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -11980,15 +11987,18 @@
 3245,V_B_ALPHOCCIO@NPC_PULSESTRIKE,attack,661,5,100,1000,10000,no,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_WIDESOULDRAIN,attack,680,10,100,1000,60000,no,self,always,,,,,,,,
 3246,V_B_TRENTINI@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3246,V_B_TRENTINI@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
+// 3246,V_B_TRENTINI@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
+3246,V_B_TRENTINI@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
 3246,V_B_TRENTINI@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3246,V_B_TRENTINI@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3246,V_B_TRENTINI@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3246,V_B_TRENTINI@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3246,V_B_TRENTINI@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3246,V_B_TRENTINI@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3246,V_B_TRENTINI@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
-3246,V_B_TRENTINI@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3238,
+// 3246,V_B_TRENTINI@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
+3246,V_B_TRENTINI@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
+// 3246,V_B_TRENTINI@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3238,
+3246,V_B_TRENTINI@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,,
 // 3246,V_B_TRENTINI@NPC_UGLYDANCE,attack,2541,5,100,1000,70000,no,self,always,,,,,,,,
 3246,V_B_TRENTINI@NPC_MAXPAIN,attack,716,9,300,1000,20000,no,self,always,,,,,,,47,
 3246,V_B_TRENTINI@NPC_PULSESTRIKE,attack,661,3,100,0,10000,yes,self,always,,,,,,,,
@@ -12403,274 +12413,6 @@
 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,attack,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,
 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,idle,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,
 
-// Episode 16.1 - EDDA Half Moon In The Daylight
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,,,,,,,,
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,angry,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,angry,171,1,500,700,5000,no,target,always,0,,,,,,9,
-3510,POPE_MD_H_GUARD@SM_BASH,attack,5,3,500,0,5000,no,target,always,0,,,,,,27,
-3510,POPE_MD_H_GUARD@SM_BASH,angry,5,3,500,0,5000,no,target,always,0,,,,,,27,
-3511,POPE_MD_H_BELIEVER_1@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3511,POPE_MD_H_BELIEVER_1@SM_BASH,angry,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3511,POPE_MD_H_BELIEVER_1@SM_MAGNUM,attack,7,3,500,500,5000,no,self,always,0,,,,,,,
-3511,POPE_MD_H_BELIEVER_1@CR_AUTOGUARD,chase,249,2,500,0,300000,yes,self,longrangeattacked,,,,,,,,
-3512,POPE_MD_H_BELIEVER_2@NPC_CURSEATTACK,chase,181,1,1000,800,5000,yes,target,always,0,,,,,,9,
-3512,POPE_MD_H_BELIEVER_2@NPC_WIDECURSE,attack,677,1,500,0,5000,no,self,always,0,,,,,,,
-3512,POPE_MD_H_BELIEVER_2@NPC_CRITICALWOUND,attack,673,2,500,0,5000,yes,target,always,0,,,,,,,
-3513,POPE_MD_H_DOG@NPC_LICK,attack,206,3,500,0,5000,yes,target,always,0,,,,,,6,
-3513,POPE_MD_H_DOG@NPC_AGIUP,attack,350,1,10000,0,100000,yes,self,always,0,,,,,,,
-3513,POPE_MD_H_DOG@NPC_AGIUP,loot,350,1,10000,0,10000,yes,self,always,0,,,,,,,
-3513,POPE_MD_H_DOG@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,0,,,,,,32,
-3513,POPE_MD_H_DOG@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3513,POPE_MD_H_DOG@SM_BASH,chase,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3514,POPE_MD_H_BISHOP@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,no,target,always,0,,,,,,,
-3514,POPE_MD_H_BISHOP@NPC_POWERUP,attack,349,2,10000,0,30000,yes,self,myhpltmaxrate,50,,,,,,,
-3514,POPE_MD_H_BISHOP@NPC_AGIUP,attack,350,2,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3514,POPE_MD_H_BISHOP@KN_TWOHANDQUICKEN,attack,60,2,10000,0,120000,yes,self,myhpltmaxrate,30,,,,,,,
-3514,POPE_MD_H_BISHOP@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,,,,,,,29,
-3514,POPE_MD_H_BISHOP@NPC_CRITICALWOUND,attack,673,2,500,0,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@WZ_ICEWALL,chase,87,3,10000,500,25000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@WZ_ICEWALL,attack,87,3,10000,500,25000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_DRAGONFEAR,attack,659,1,10000,0,30000,yes,self,myhpltmaxrate,70,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_WATERATTACK,attack,184,2,2000,0,5000,no,target,always,0,,,,,,6,
-3516,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,2,2000,0,5000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,2,2000,0,5000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_PULSESTRIKE,attack,661,1,2000,0,30000,yes,self,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,chase,196,1,10000,700,60000,no,self,slavele,3,3517,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,1,10000,700,60000,no,self,onspawn,0,3517,,,,,,
-3517,POPE_MD_H_GUARD@NPC_COMBOATTACK,idle,171,3,500,700,5000,no,target,always,,,,,,,,
-3517,POPE_MD_H_GUARD@NPC_COMBOATTACK,attack,171,3,500,500,5000,no,target,always,0,,,,,,,
-3517,POPE_MD_H_GUARD@NPC_CRITICALSLASH,idle,170,3,1000,700,5000,no,target,always,0,,,,,,,
-3517,POPE_MD_H_GUARD@NPC_CRITICALSLASH,attack,170,3,1000,500,5000,no,target,always,0,,,,,,,
-3517,POPE_MD_H_GUARD@SM_BASH,attack,5,5,500,0,5000,no,target,always,0,,,,,,27,
-3517,POPE_MD_H_GUARD@SM_BASH,angry,5,5,500,0,5000,no,target,always,0,,,,,,27,
-3518,POPE_MD_H_BELIEVER_1@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3518,POPE_MD_H_BELIEVER_1@SM_BASH,angry,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3518,POPE_MD_H_BELIEVER_1@SM_MAGNUM,attack,7,3,500,500,5000,no,self,always,0,,,,,,,
-3518,POPE_MD_H_BELIEVER_1@CR_AUTOGUARD,chase,249,2,500,0,300000,yes,self,longrangeattacked,,,,,,,,
-3519,POPE_MD_H_BELIEVER_2@NPC_CURSEATTACK,chase,181,3,1000,800,5000,yes,target,always,0,,,,,,9,
-3519,POPE_MD_H_BELIEVER_2@NPC_WIDECURSE,attack,677,3,500,0,5000,no,self,always,0,,,,,,,
-3519,POPE_MD_H_BELIEVER_2@NPC_CRITICALWOUND,attack,673,5,500,0,5000,yes,target,always,0,,,,,,,
-3520,POPE_MD_H_DOG@NPC_LICK,attack,206,3,500,0,5000,yes,target,always,0,,,,,,6,
-3520,POPE_MD_H_DOG@NPC_AGIUP,attack,350,1,10000,0,100000,yes,self,always,0,,,,,,,
-3520,POPE_MD_H_DOG@NPC_AGIUP,loot,350,1,10000,0,10000,yes,self,always,0,,,,,,,
-3520,POPE_MD_H_DOG@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,0,,,,,,32,
-3520,POPE_MD_H_DOG@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3520,POPE_MD_H_DOG@SM_BASH,chase,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3522,POPE_MD_H_BISHOP@NPC_CRITICALSLASH,attack,170,3,1000,0,5000,no,target,always,0,,,,,,,
-3522,POPE_MD_H_BISHOP@NPC_POWERUP,attack,349,4,10000,0,30000,yes,self,myhpltmaxrate,50,,,,,,,
-3522,POPE_MD_H_BISHOP@NPC_AGIUP,attack,350,4,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3522,POPE_MD_H_BISHOP@KN_TWOHANDQUICKEN,attack,60,3,10000,0,120000,yes,self,myhpltmaxrate,30,,,,,,,
-3522,POPE_MD_H_BISHOP@NPC_HALLUCINATION,attack,207,2,500,500,5000,yes,target,always,,,,,,,29,
-3522,POPE_MD_H_BISHOP@NPC_CRITICALWOUND,attack,673,4,500,0,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@WZ_ICEWALL,chase,87,5,10000,500,25000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@WZ_ICEWALL,attack,87,5,10000,500,25000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_DRAGONFEAR,attack,659,3,10000,0,30000,yes,self,myhpltmaxrate,70,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_WATERATTACK,attack,184,4,2000,0,5000,no,target,always,0,,,,,,6,
-3524,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,4,2000,0,5000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,4,2000,0,5000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_PULSESTRIKE,attack,661,3,2000,0,30000,yes,self,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,chase,196,3,10000,700,60000,no,self,slavele,3,3517,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,3,10000,700,60000,no,self,onspawn,0,3517,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_WATERATTACK,attack,184,3,1000,500,5000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_RANDOMATTACK,attack,183,2,1000,500,5000,no,target,always,0,,,,,,6,
-3526,POPE_MD_H_KTULLANUX@NPC_WIDEFREEZE,chase,664,1,10000,0,20000,yes,self,myhpltmaxrate,80,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@NPC_WIDEFREEZE,attack,664,1,10000,0,20000,yes,self,myhpltmaxrate,80,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@NPC_ARMORBRAKE,attack,344,3,2000,0,5000,yes,target,always,0,,,,,,29,
-3526,POPE_MD_H_KTULLANUX@MG_FROSTDIVER,idle,15,3,5000,1000,7000,no,randomtarget,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@MG_FROSTDIVER,chase,15,3,5000,1000,7000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@WZ_STORMGUST,chase,89,3,5000,1000,20000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@WZ_STORMGUST,attack,89,3,5000,1000,20000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_ICEBREATH,chase,655,2,500,3000,5000,no,target,always,0,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@NPC_ICEBREATH,attack,655,2,500,3000,5000,no,target,always,0,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@WZ_FROSTNOVA,chase,88,3,5000,0,20000,yes,self,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@WZ_FROSTNOVA,attack,88,3,5000,0,20000,yes,self,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_POWERUP,attack,349,1,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_AGIUP,attack,350,1,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3526,POPE_MD_H_KTULLANUX@AL_HEAL,idle,28,5,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-
-// Weekend Memorial Dungeon
-3637,MD_SKELETON_60@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3637,MD_SKELETON_60@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3637,MD_SKELETON_60@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3637,MD_SKELETON_60@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3637,MD_SKELETON_60@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3637,MD_SKELETON_60@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3638,MD_SKELETON_80@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3638,MD_SKELETON_80@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3638,MD_SKELETON_80@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3638,MD_SKELETON_80@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3638,MD_SKELETON_80@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3638,MD_SKELETON_80@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3639,MD_SKELETON_100@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3639,MD_SKELETON_100@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3639,MD_SKELETON_100@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3639,MD_SKELETON_100@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3639,MD_SKELETON_100@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3639,MD_SKELETON_100@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3640,MD_SKELETON_120@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3640,MD_SKELETON_120@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3640,MD_SKELETON_120@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3640,MD_SKELETON_120@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3640,MD_SKELETON_120@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3640,MD_SKELETON_120@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3641,MD_SKELETON_140@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3641,MD_SKELETON_140@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3641,MD_SKELETON_140@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3641,MD_SKELETON_140@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3641,MD_SKELETON_140@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3641,MD_SKELETON_140@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3642,MD_SKELETON_160@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3642,MD_SKELETON_160@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3642,MD_SKELETON_160@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3642,MD_SKELETON_160@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3642,MD_SKELETON_160@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3642,MD_SKELETON_160@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3643,MD_FARMILIAR_60@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3643,MD_FARMILIAR_60@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3643,MD_FARMILIAR_60@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3643,MD_FARMILIAR_60@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3644,MD_FARMILIAR_80@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3644,MD_FARMILIAR_80@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3644,MD_FARMILIAR_80@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3644,MD_FARMILIAR_80@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3645,MD_FARMILIAR_100@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3645,MD_FARMILIAR_100@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3645,MD_FARMILIAR_100@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3645,MD_FARMILIAR_100@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3646,MD_FARMILIAR_120@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3646,MD_FARMILIAR_120@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3646,MD_FARMILIAR_120@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3646,MD_FARMILIAR_120@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3647,MD_FARMILIAR_140@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3647,MD_FARMILIAR_140@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3647,MD_FARMILIAR_140@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3647,MD_FARMILIAR_140@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3648,MD_FARMILIAR_160@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3648,MD_FARMILIAR_160@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3648,MD_FARMILIAR_160@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3648,MD_FARMILIAR_160@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3649,MD_ZOMBIE_60@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3649,MD_ZOMBIE_60@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3649,MD_ZOMBIE_60@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3649,MD_ZOMBIE_60@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3649,MD_ZOMBIE_60@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3649,MD_ZOMBIE_60@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3649,MD_ZOMBIE_60@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3650,MD_ZOMBIE_80@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3650,MD_ZOMBIE_80@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3650,MD_ZOMBIE_80@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3650,MD_ZOMBIE_80@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3650,MD_ZOMBIE_80@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3650,MD_ZOMBIE_80@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3650,MD_ZOMBIE_80@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3651,MD_ZOMBIE_100@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3651,MD_ZOMBIE_100@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3651,MD_ZOMBIE_100@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3651,MD_ZOMBIE_100@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3651,MD_ZOMBIE_100@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3651,MD_ZOMBIE_100@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3651,MD_ZOMBIE_100@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3652,MD_ZOMBIE_120@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3652,MD_ZOMBIE_120@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3652,MD_ZOMBIE_120@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3652,MD_ZOMBIE_120@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3652,MD_ZOMBIE_120@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3652,MD_ZOMBIE_120@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3652,MD_ZOMBIE_120@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3653,MD_ZOMBIE_140@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3653,MD_ZOMBIE_140@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3653,MD_ZOMBIE_140@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3653,MD_ZOMBIE_140@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3653,MD_ZOMBIE_140@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3653,MD_ZOMBIE_140@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3653,MD_ZOMBIE_140@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3654,MD_ZOMBIE_160@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3654,MD_ZOMBIE_160@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3654,MD_ZOMBIE_160@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3654,MD_ZOMBIE_160@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3654,MD_ZOMBIE_160@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3654,MD_ZOMBIE_160@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3654,MD_ZOMBIE_160@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-
-// Friday Memorial Dungeon
-3658,MD_LICH_LORD_100@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-3658,MD_LICH_LORD_100@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-3658,MD_LICH_LORD_100@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
-3658,MD_LICH_LORD_100@MG_FIREWALL,chase,18,10,2000,500,5000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_HELLJUDGEMENT,chase,662,5,10000,800,10000,no,self,always,0,,,,,,36,
-3658,MD_LICH_LORD_100@NPC_HELLJUDGEMENT,attack,662,5,10000,800,10000,no,self,always,0,,,,,,36,
-3658,MD_LICH_LORD_100@NPC_DARKBLESSING,attack,203,1,500,800,5000,no,target,always,0,,,,,,9,
-3658,MD_LICH_LORD_100@NPC_HELMBRAKE,attack,345,10,2000,500,5000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_SUMMONSLAVE,attack,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3658,MD_LICH_LORD_100@NPC_SUMMONSLAVE,idle,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3658,MD_LICH_LORD_100@WZ_METEOR,attack,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@WZ_METEOR,chase,83,11,5000,500,2000,no,target,skillused,18,,,,,,,
-3658,MD_LICH_LORD_100@WZ_METEOR,chase,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_CRITICALWOUND,attack,673,3,500,0,5000,yes,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-3659,MD_LICH_LORD_160@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-3659,MD_LICH_LORD_160@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
-3659,MD_LICH_LORD_160@MG_FIREWALL,chase,18,10,2000,500,5000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_HELLJUDGEMENT,chase,662,10,10000,800,10000,no,self,always,0,,,,,,36,
-3659,MD_LICH_LORD_160@NPC_HELLJUDGEMENT,attack,662,10,10000,800,10000,no,self,always,0,,,,,,36,
-3659,MD_LICH_LORD_160@NPC_DARKBLESSING,attack,203,1,500,800,5000,no,target,always,0,,,,,,9,
-3659,MD_LICH_LORD_160@NPC_HELMBRAKE,attack,345,10,2000,500,5000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_SUMMONSLAVE,attack,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3659,MD_LICH_LORD_160@NPC_SUMMONSLAVE,idle,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3659,MD_LICH_LORD_160@WZ_METEOR,attack,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@WZ_METEOR,chase,83,11,5000,500,2000,no,target,skillused,18,,,,,,,
-3659,MD_LICH_LORD_160@WZ_METEOR,chase,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_CRITICALWOUND,attack,673,3,500,0,5000,yes,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_MENTALBREAKER,attack,159,1,500,800,5000,no,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_MENTALBREAKER,attack,159,1,500,800,5000,no,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,,
-3662,MD_JAKK_100@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3662,MD_JAKK_100@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3662,MD_JAKK_100@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3662,MD_JAKK_100@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
-3662,MD_JAKK_100@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-3662,MD_JAKK_100@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,0x3695,,,,,
-3663,MD_JAKK_160@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3663,MD_JAKK_160@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3663,MD_JAKK_160@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3663,MD_JAKK_160@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
-3663,MD_JAKK_160@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-3663,MD_JAKK_160@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,0x3695,,,,,
-3664,MD_GHOUL_100@NPC_POISON,angry,176,3,500,800,5000,no,target,always,0,,,,,,,
-3664,MD_GHOUL_100@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
-3665,MD_GHOUL_160@NPC_POISON,angry,176,3,500,800,5000,no,target,always,0,,,,,,,
-3665,MD_GHOUL_160@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
-3666,MD_DRAINLIAR_100@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3666,MD_DRAINLIAR_100@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
-3666,MD_DRAINLIAR_100@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3667,MD_DRAINLIAR_160@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3667,MD_DRAINLIAR_160@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
-3667,MD_DRAINLIAR_160@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-
 // ep16.2
 3621,EP16_2_MM_CUTIE@NPC_AGIUP,attack,350,1,10000,0,20000,yes,self,always,0,,,,,,,
 3621,EP16_2_MM_CUTIE@NPC_MENTALBREAKER,attack,159,2,10000,1000,30000,no,target,always,0,,,,,,,
@@ -12863,37 +12605,12 @@
 3765,Deranged Adventurer@NPC_TALK,idle,682,10,2500,0,35000,yes,self,always,0,,,,,,,53
 3765,Deranged Adventurer@NPC_TALK,idle,682,10,2500,0,30000,yes,self,always,0,,,,,,,54
 
-// Poring Village instance
-3810,MD_KING_PORING@SM_BASH,attack,5,3,1000,1000,9000,yes,target,always,0,,,,,,,60
-3810,MD_KING_PORING@MG_FIREBALL,attack,17,3,1000,1000,9000,yes,target,always,0,,,,,,,61
-3810,MD_KING_PORING@MC_MAMMONITE,attack,42,3,1000,1000,9000,yes,target,always,0,,,,,,,62
-3810,MD_KING_PORING@AC_DOUBLE,attack,46,3,1000,1000,9000,yes,target,always,0,,,,,,,63
-3810,MD_KING_PORING@TF_POISON,attack,52,3,1000,1000,9000,yes,target,always,0,,,,,,,64
-3810,MD_KING_PORING@AL_DECAGI,attack,30,3,1000,1000,9000,yes,target,always,0,,,,,,,65
-3811,MD_GOLDRING@NPC_STUNATTACK,attack,179,5,3500,1000,10000,no,target,always,0,,,,,,,
-// todo NPC_WIDECONFUSE2
-//3812,MD_AMERING@NPC_WIDECONFUSE2,attack,762,1,3000,2000,20000,yes,target,always,0,,,,,,,
-3812,MD_AMERING@NPC_WIDECONFUSE,attack,667,1,3000,2000,20000,yes,target,always,0,,,,,,,
-3813,MD_DROPS@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,,
-3813,MD_DROPS@NPC_FIREATTACK,attack,186,1,2000,100,5000,yes,target,always,0,,,,,,,
-3813,MD_DROPS@NPC_BLINDATTACK,attack,177,3,2000,1000,15000,yes,target,always,0,,,,,,,67
-3814,MD_POPORING@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,2,
-3814,MD_POPORING@NPC_POISON,attack,176,1,500,1000,15000,no,target,always,0,,,,,,,
-3814,MD_POPORING@NPC_POISONATTACK,attack,188,1,2000,900,15000,yes,target,always,0,,,,,,,68
-3815,MD_PORING@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,2,
-3815,MD_PORING@NPC_SILENCEATTACK,attack,178,2,1500,1000,15000,no,target,always,0,,,,,,,70
-3816,MD_MARIN@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,2,
-3816,MD_MARIN@NPC_WATERATTACK,attack,184,1,2000,1000,15000,yes,target,always,0,,,,,,,
-3816,MD_MARIN@AL_HEAL,idle,28,1,10000,500,5000,yes,friend,myhpltmaxrate,90,,,,,,2,
-3816,MD_MARIN@AL_HEAL,attack,28,1,10000,500,5000,yes,friend,myhpltmaxrate,90,,,,,,,69
-
 // 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,
 20340,EL-A17T@NPC_CRITICALSLASH,attack,170,1,2000,500,5000,no,target,always,0,,,,,,,
 20340,EL-A17T@AS_SONICBLOW,attack,136,10,1000,0,10000,yes,target,always,0,,,,,,2,
 20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
-20340,EL-A17T@SA_LANDPROTECTOR,attack,288,3,10000,500,150000,no,self,groundattacked,0,,,,,,,
 20341,E-EA1L@AL_DECAGI,attack,30,1,500,1000,5000,no,target,always,0,,,,,,29,
 20341,E-EA1L@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,0,,,,,,9,
 20341,E-EA1L@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,0,,,,,,9,
@@ -13040,51 +12757,3 @@
 20836,ABR_MOTHER_NET@ABR_NET_SUPPORT,attack,8604,1,10000,500,5000,yes,self,always,0,,,,,,,
 20837,ABR_INFINITY@ABR_INFINITY_BUSTER,chase,8605,1,10000,500,5000,yes,target,always,0,,,,,,,
 20837,ABR_INFINITY@ABR_INFINITY_BUSTER,attack,8605,1,10000,500,5000,yes,target,always,0,,,,,,,
-
-// Training Ground outside Prontera
-21064,S_DUMMY_100_SMALL@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21064,S_DUMMY_100_SMALL@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21065,S_DUMMY_100_MEDIUM@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21065,S_DUMMY_100_MEDIUM@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21066,S_DUMMY_100_LARGE@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21066,S_DUMMY_100_LARGE@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21067,S_DUMMY_100_NOTHING@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21067,S_DUMMY_100_NOTHING@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21068,S_DUMMY_100_DRAGON@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21068,S_DUMMY_100_DRAGON@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21069,S_DUMMY_100_ANIMAL@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21069,S_DUMMY_100_ANIMAL@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21070,S_DUMMY_100_HUMAN@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21070,S_DUMMY_100_HUMAN@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21071,S_DUMMY_100_INSECT@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21071,S_DUMMY_100_INSECT@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21072,S_DUMMY_100_FISH@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21072,S_DUMMY_100_FISH@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21073,S_DUMMY_100_DEMON@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21073,S_DUMMY_100_DEMON@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21074,S_DUMMY_100_PLANT@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21074,S_DUMMY_100_PLANT@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21075,S_DUMMY_100_ANGEL@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21075,S_DUMMY_100_ANGEL@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21076,S_DUMMY_100_UNDEAD@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21076,S_DUMMY_100_UNDEAD@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21077,S_DUMMY_100_NOTHING2@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21077,S_DUMMY_100_NOTHING2@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21078,S_DUMMY_100_WATER@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21078,S_DUMMY_100_WATER@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21079,S_DUMMY_100_GROUND@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21079,S_DUMMY_100_GROUND@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21080,S_DUMMY_100_FIRE@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21080,S_DUMMY_100_FIRE@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21081,S_DUMMY_100_WIND@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21081,S_DUMMY_100_WIND@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21082,S_DUMMY_100_POISON@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21082,S_DUMMY_100_POISON@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21083,S_DUMMY_100_SAINT@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21083,S_DUMMY_100_SAINT@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21084,S_DUMMY_100_DARKNESS@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21084,S_DUMMY_100_DARKNESS@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21085,S_DUMMY_100_TELEKINESIS@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21085,S_DUMMY_100_TELEKINESIS@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21086,S_DUMMY_100_UNDEAD2@NPC_ALLHEAL,attack,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,
-21086,S_DUMMY_100_UNDEAD2@NPC_ALLHEAL,idle,687,1,10000,0,500,no,self,myhpltmaxrate,90,,,,,,,