Merge branch 'master' into hotfix/issue4984

Added a missing map entry assignment from an invalid DBMap ensure conversion.

Fixes #7538

Thanks to @MaouDaiou and @zdurexz

.github/ISSUE_TEMPLATE/bug_report.md

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

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

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

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

@@ -0,0 +1,32 @@
+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/analysis_codeql.yml

@@ -0,0 +1,91 @@
+name: Analyse servers with CodeQL
+# analysis_codeql.yml
+
+concurrency:
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    paths:
+      # Always trigger all Github Actions if an action or something CI related was changed
+      - '.github/workflows/**'
+      - 'tools/ci/**'
+      # This workflow should run when a file in a source directory has been modified.
+      - 'src/**'
+      - '3rdparty/**'
+
+jobs:
+  analyze:
+    # Github Actions checks for '[ci skip]', '[skip ci]', '[no ci]', '[skip actions]', or '[actions skip]' but not a hyphenated version.
+    # It's a catch-all incase a Pull Request has been opened and someone is on auto-pilot.
+    if: "!contains(github.event.head_commit.message, 'ci-skip')"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
+          os: [ubuntu-latest]
+          # Older versions of GCC are not available via unaltered aptitude repo lists.
+          gcc: ['10']
+          # We run build checks for both Renewal and PRE-Renewal
+          mode: ['PRE','RE']
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+           # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+           # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+           languages: cpp
+           # Trigger security and quality findings
+           # https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+           # TODO: Resolve the issues and then enable it again
+           #queries: +security-and-quality
+
+      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
+      - name: Variable Parsing - PRE
+        if: ${{ matrix.mode == 'PRE' }} 
+        run: |
+          echo "PRERE=yes" >> $GITHUB_ENV
+      - name: Variable Parsing - RE
+        if: ${{ matrix.mode == 'RE' }} 
+        run: |
+          echo "PRERE=no" >> $GITHUB_ENV
+
+      - name: Update & Install packages
+        # Ubuntu runners already have most of the packages rAthena requires to build.
+        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
+        run: |
+          sudo apt update
+          sudo apt install zlib1g-dev libpcre3-dev gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      #- name: Autobuild
+      #  uses: github/codeql-action/autobuild@v2
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following
+      #    three lines and modify them (or add more) to build your code if your
+      #    project uses a compiled language
+      - name: Command - configure
+        env:
+            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-prere=${{ env.PRERE }} --enable-buildbot=yes'
+        run: ./configure $CONFIGURE_FLAGS
+
+      - name: Command - make clean
+        run: make clean
+
+      - name: Command - make server
+        run: make server
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/build_servers_clang.yml

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

.github/workflows/build_servers_cmake.yml

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

.github/workflows/build_servers_gcc.yml

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

.github/workflows/build_servers_modes.yml

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

.github/workflows/build_servers_msbuild.yml

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

.github/workflows/build_servers_packetversions.yml

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

.github/workflows/npc_db_validation.yml

@@ -4,6 +4,10 @@ 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: ${{ github.ref != 'refs/heads/master' }}
+
 on:
   push:
     branches:
@@ -25,11 +29,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-18.04.
-          # Available: ubuntu-20.04, ubuntu-18.04	
+          # The ubuntu-latest label currently points to ubuntu-22.04.
+          # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
           # Only a single version of GCC is required for validating NPC scripts and database changes.
-          gcc: ['10']
+          gcc: ['11']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE', 'RE']
 

.gitignore

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

3rdparty/CMakeLists.txt

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

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

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

@@ -0,0 +1,160 @@
+<?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

@@ -0,0 +1,21 @@
+<?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

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

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

@@ -0,0 +1,177 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  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,6 +226,10 @@ 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

@@ -0,0 +1,126 @@
+# 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,11 +4,12 @@ HAVE_MYSQL=@HAVE_MYSQL@
 OMAP=@OMAP@
 ifeq ($(HAVE_MYSQL),yes)
 	ALL_DEPENDS=server tools
-	SERVER_DEPENDS=common login char map import
+	SERVER_DEPENDS=common login char map web 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
@@ -16,6 +17,7 @@ else
 	LOGIN_DEPENDS=needs_mysql
 	CHAR_DEPENDS=needs_mysql
 	MAP_DEPENDS=needs_mysql
+	WEB_DEPENDS=needs_mysql
 endif
 
 
@@ -25,6 +27,7 @@ endif
 	login \
 	char \
 	map \
+	web \
 	tools \
 	import \
 	clean help \
@@ -49,11 +52,15 @@ 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
@@ -61,6 +68,9 @@ rapidyaml:
 yaml-cpp:
 	@$(MAKE) -C 3rdparty/yaml-cpp
 
+httplib:
+	@$(MAKE) -C 3rdparty/httplib
+
 import:
 # 1) create conf/import folder
 # 2) add missing files
@@ -81,9 +91,11 @@ 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:
@@ -93,9 +105,11 @@ 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,8 +20,7 @@ print_start() {
 get_status(){
 	PIDFILE=.$1.pid
 	if [ -e ${PIDFILE} ]; then
-		ISRUN=$(ps ax | grep $(cat ${PIDFILE}) | grep $1)
-		PSRUN=$(echo "$ISRUN" | awk '{ print $1 }')
+		PSRUN=$(pgrep -F ${PIDFILE})
 	fi
 	#return ${PSRUN} #seems to cause an issue for some os
 }
@@ -36,11 +35,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
@@ -48,7 +47,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
@@ -61,25 +60,25 @@ watch_serv(){
 	#now checking status and looping
 	count=0;
 	while true; do
-		for i in ${L_SRV} ${C_SRV} ${M_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_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
@@ -89,7 +88,7 @@ watch_serv(){
 restart(){
 	$0 stop
 	if [ $1 ]; then sleep $1; fi
-	for i in ${L_SRV} ${C_SRV} ${M_SRV}
+	for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
 	do
 		FIFO="$1_fifo"
 		while true; do
@@ -101,11 +100,11 @@ restart(){
 			fi
 		done
 	done
-  $0 start
+	$0 start
 }
 
 case $1 in
-    'start')
+	'start')
 		print_start
 		check_files
 		echo "Check complete."
@@ -117,26 +116,26 @@ case $1 in
 		else
 		 echo "Logging is disabled"
 		fi
-		for i in ${L_SRV} ${C_SRV} ${M_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_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}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
 		do
 			start_serv $i 1
 		done
 		watch_serv $Restart_count $Restart_sleep
 		echo "Watching rAthena now."
-	;;	
+	;;
 	'stop')
-		for i in ${M_SRV} ${C_SRV} ${L_SRV}
+		for i in ${W_SRV} ${M_SRV} ${C_SRV} ${L_SRV}
 		do
 			PIDFILE=.${i}.pid
 			if [ -e ./${PIDFILE} ]; then
@@ -155,23 +154,23 @@ case $1 in
 		done
 	;;
 	'restart')
-		 restart
+		 restart "$@"
 	;;
 	'status')
-		for i in ${L_SRV} ${C_SRV} ${M_SRV}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_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}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_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}
+		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
 		do
 			valgrind --leak-check=full --show-leak-kinds=all ./$i > "log/$i.runonce.leak"
 		done
@@ -181,7 +180,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"
@@ -205,11 +204,11 @@ case $1 in
 			;;
 			'val_runonce')
 				echo "syntax: 'val_runonce'"
-				echo "This option will run valgrin with run-once to check the servers"
+				echo "This option will run valgrind with run-once to check the servers"
 			;;
 			'valchk')
 				echo "syntax: 'valchk'"
-				echo "This option will run valgrin with the servers"
+				echo "This option will run valgrind with the servers"
 			;;
 			*)
 				echo "Please specify a command you would like more info on { start | stop | restart | status | watch }"

conf/atcommands.yml

@@ -664,6 +664,9 @@ 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>
@@ -1010,6 +1013,12 @@ Body:
     Aliases:
       - famepoint
       - famepoints
+  - Command: enchantgradeui
+    Help: |
+      Opens the enchantgrade UI.
+  - Command: roulette
+    Help: |
+      Opens the roulette UI.
 
 Footer:
   Imports:

conf/battle/battle.conf

@@ -167,3 +167,9 @@ warg_can_falcon: no
 // Should the target be able of dodging damage by snapping away to the edge of the screen?
 // Official behavior is "no"
 snap_dodge: no
+
+// Grant player skills/items the ability to "break" non-player equipment. (Note 1)
+// This will effectively apply the strip equip effect to the non-player target.
+// NOTE: WS_MELTDOWN is exempt from this check when disabled.
+// Official: no
+break_mob_equip: no

conf/battle/client.conf

@@ -118,12 +118,6 @@ 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.
@@ -154,3 +148,24 @@ 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
+
+// Macro Detector punishment type
+// 0 - Ban
+// 1 - Jail
+// Official: 0
+macro_detection_punishment: 0
+
+// Macro Detector punishment duration
+// Amount of time in minutes that the punishment type is active for. Use 0 for infinite.
+// Official: 0
+macro_detection_punishment_time: 0

conf/battle/feature.conf

@@ -56,7 +56,7 @@ feature.autotrade_head_direction: 0
 //  1 = Sitting
 feature.autotrade_sit: 1
 
-// Delay in miliseconds to open vending/buyingsotre after player logged in.
+// Delay in milliseconds 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.
@@ -67,6 +67,10 @@ feature.bgqueue: on
 // Requires: 2014-10-22bRagexe or later
 feature.roulette: on
 
+// Roulette bonus reward
+// Multiply amount by 2 if the reward item ID is the same as bonus item ID
+feature.roulette_bonus_reward: on
+
 // Achievement (Note 1)
 // Requires: 2015-05-13aRagexe or later
 feature.achievement: on
@@ -119,3 +123,30 @@ 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
+
+// Stylist UI (Note 1)
+// Requires: 2015-11-04 or later
+feature.stylist: on

conf/battle/guild.conf

@@ -17,7 +17,13 @@ guild_exp_limit: 50
 guild_max_castles: 0
 
 // Activate guild skills delay by relog?
-// Official setting is 5 minutes (300000 ms), otherwise allow guild leaders to relog to cancel the 5 minute delay.
+// 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).
 // 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.
+// obtained an item with special broadcast flag or refined an item at a level with 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/battle/monster.conf

@@ -19,52 +19,57 @@ monster_hp_rate: 100
 monster_max_aspd: 199
 
 // Defines various mob AI related settings. (Note 3)
-// 0x001: When enabled mobs will update their target cell every few iterations
-//        (normally they never update their target cell until they reach it while
-//        chasing)
-// 0x002: Makes mob use their "rude attack" skill (usually warping away) if they
-//        are attacked and they can't attack back regardless of how they were
-//        attacked (eg: GrimTooth), otherwise, their rude attack" is only activated
-//        if they can't melee reach the target (eg: sniping)
-// 0x004: If not set, mobs that can change target only do so when attacked within a
-//        distance of [attack range+1], otherwise mobs may change target and chase 
-//        ranged attackers. This flag also overrides the 'provoke' target.
-// 0x008: When set, mobs scatter as soon as they lose their target. Use this mode
-//        to make it much harder to mob-train by hiding and collecting them on a
-//        single spot (ie: GrimTooth training)
-// 0x010: If set, mob skills defined for friends will also trigger on themselves.
-// 0x020: When set, the monster ai is executed for all monsters in maps that 
-//        have players on them, instead of only for mobs who are in the vicinity
-//        of players.
-// 0x040: When set, when the mob's target changes map, the mob will walk towards
-//        any npc-warps in it's sight of view (use with mob_warp below)
-// 0x080: If not set, mobs on attack state will only change targets when attacked
-//        by normal attacks. Set this if you want mobs to also switch targets when
-//        hit by skills.
-// 0x100: When set, a mob will pick a random skill from it's list and start from
-//        that instead of checking skills in orders (when unset, if a mob has too
-//        many skills, the ones near the end will rarely get selected)
-// 0x200: When set, a mob's skill re-use delay will not be applied to all entries of
-//        the same skill, instead, only to that particular entry (eg: Mob has heal
-//        on six lines in the mob_skill_db, only the entry that is actually used
-//        will receive the delay). This will make monsters harder, especially MvPs.
-// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they 
-//        will obey the normal skill range rules.
-// 0x800: When set, monsters that are provoked will always change target to the
-//        provoking person, even if they would usually not change target on attack.
+// 0x0001: When enabled mobs will update their target cell every few iterations
+//         (normally they never update their target cell until they reach it while
+//         chasing)
+// 0x0002: Makes mob use their "rude attack" skill (usually warping away) if they
+//         are attacked and they can't attack back regardless of how they were
+//         attacked (eg: GrimTooth), otherwise, their "rude attack" is only activated
+//         if they can't melee reach the target (eg: sniping)
+// 0x0004: If not set, mobs that can change target only do so when attacked within a
+//         distance of [attack range+1], otherwise mobs may change target and chase 
+//         ranged attackers. This flag also overrides the 'provoke' target.
+// 0x0008: When set, mobs scatter as soon as they lose their target. Use this mode
+//         to make it much harder to mob-train by hiding and collecting them on a
+//         single spot (ie: GrimTooth training)
+// 0x0010: If set, mob skills defined for friends will also trigger on themselves.
+// 0x0020: When set, the monster ai is executed for all monsters in maps that 
+//         have players on them, instead of only for mobs who are in the vicinity
+//         of players.
+// 0x0040: When set, when the mob's target changes map, the mob will walk towards
+//         any npc-warps in it's sight of view (use with mob_warp below)
+// 0x0080: If not set, mobs on attack state will only change targets when attacked
+//         by normal attacks. Set this if you want mobs to also switch targets when
+//         hit by skills.
+// 0x0100: When set, a mob will pick a random skill from it's list and start from
+//         that instead of checking skills in orders (when unset, if a mob has too
+//         many skills, the ones near the end will rarely get selected)
+// 0x0200: When set, a mob's skill re-use delay will not be applied to all entries of
+//         the same skill, instead, only to that particular entry (eg: Mob has heal
+//         on six lines in the mob_skill_db, only the entry that is actually used
+//         will receive the delay). This will make monsters harder, especially MvPs.
+// 0x0400: Set this to make mobs have a range of 9 for all skills. Otherwise, they 
+//         will obey the normal skill range rules.
+// 0x0800: When set, monsters that are provoked will always change target to the
+//         provoking person, even if they would usually not change target on attack.
+// 0x1000: When set, when a monster picks a skill but can't use it because there is
+//         no valid target in range, it will look for another skill it can use.
+//         This makes e.g. Greatest General use "Earth Spike" at range 8-9 whereas
+//         officially it would only use it after already having used "Blind Attack"
+//         at range 0-7.
 // Example: 0x140 -> Chase players through warps + use skills in random order.
 monster_ai: 0
 
 // How often should a monster rethink its chase?
 // 0: Every 100ms (MIN_MOBTHINKTIME)
 // 1: Every cell moved
-// 2: Every 2 cells moved
-// 3: Every 3 cells moved (official)
-// x: Every x cells moved
-// Regardless of this setting, a monster will always rethink its chase if it has 
-// reached its target. Increase this value if you want to make monsters continue
-// moving after they lost their target (hide, no line of sight, etc.).
-monster_chase_refresh: 3
+// x: Every x cells moved or at end of the chase path
+// 30 (max): Only at end of the chase path (official)
+// Regardless of this setting, a monster will always check for targets in attack
+// range. Decrease this value if you want to make monsters to be more reactive while
+// chasing. This also defines the maximum amount of cells monsters will move after
+// they lost their target (hide, no line of sight, etc.).
+monster_chase_refresh: 30
 
 // Should mobs be able to be warped (add as needed)?
 // 0: Disable.
@@ -292,3 +297,8 @@ achievement_mob_share: no
 // Should slaves teleport back to their master if they get too far during chase? (Note 1)
 // Default (Official): no
 slave_stick_with_master: no
+
+// Absolute minimum respawn time in milliseconds of a monster.
+// Also used in delaying the spawning of guardians when a guild is not loaded.
+// Default (Official): 1000
+mob_respawn_time: 1000

conf/battle/player.conf

@@ -155,8 +155,8 @@ friend_auto_add: yes
 invite_request_check: yes
 
 // Players' will drop a 'Skull' when killed?
-// Note: The 'Skull' item (ID 7420) is trade restricted by default. Please check
-// the item_trade database to adjust accordingly.
+// Note: The 'Skull' item (ID 7420) is trade restricted by default. You need
+// to remove the "NoTrade" flag on the item for this feature to work.
 // 0 = Disabled
 // 1 = Dropped only in PvP maps
 // 2 = Dropped in all situations

conf/battle/skill.conf

@@ -174,8 +174,13 @@ sense_type: 1
 finger_offensive_type: 0
 
 // Grandcross Settings (Don't mess with these)
-// If set to no, hit interval is increased based on the amount of mobs standing on the same cell
-// (means that when there's stacked mobs in the same cell, they won't receive all hits)
+// Officially, Grand Cross has four damage waves, but each cell will stop
+// dealing damage on the next wave after it already dealt at least 3 hits.
+// A moving monster can take up to 4 hits, while a stack of monsters may only
+// take 1-3 hits.
+// Set this to yes if you want all waves to deal damage to all targets.
+// Hint: If you want to reduce the number of waves, you need to reduce the
+// duration of the skill (e.g. to 800ms for three damage waves).
 gx_allhit: no
 
 // Grandcross display type (Default 1)
@@ -220,6 +225,10 @@ backstab_bow_penalty: yes
 // Use 0 to disable (max allowed value is 255)
 skill_steal_max_tries: 0
 
+// Should random options be applied to stolen items? (Note 1)
+// Official: no
+skill_steal_random_options: no
+
 // Level and Strength of "MVP heal". When someone casts a heal of this level or
 // above, the heal formula is bypassed and this value is used instead.
 max_heal: 9999

conf/char_athena.conf

@@ -121,7 +121,8 @@ 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
+start_items: 1201,1,2:2301,1,16:23484,1,0
+start_items_pre: 1201,1,2:2301,1,16
 start_items_doram: 1681,1,2:2301,1,16
 
 // Starting zeny for new characters
@@ -197,6 +198,9 @@ char_del_restriction: 3
 // Uncomment to customize the restriction
 //allowed_job_flag: 3
 
+// Should parties that don't have any members be cleared from the party_db table at start up?
+clear_parties: no
+
 // Folder that contains the database files.
 db_path: db
 

conf/groups.conf

@@ -1,303 +0,0 @@
-/*
-
-Player groups configuration file
----------------------------------
-
-This file defines "player groups" and their privileges.
-
-Each group has its id and name, lists of available commands and other 
-permissions, and a list of other groups it inherits from.
-
-
-Group settings
---------------
-<id>
-Unique group number. The only required field.
-
-<name>
-Any string. If empty, defaults to "Group <id>". It is used in several @who 
-commands.
-
-<level>
-Equivalent of GM level, which was used in revisions before r15572. You can 
-set it to any number, but usually it's between 0 (default) and 99. Members of 
-groups with lower level can not perform some actions/commands (like @kick) on 
-members of groups with higher level. It is what script command getgmlevel() 
-returns. Group level can also be used to override trade restrictions 
-(db/item_trade.txt).
-
-<commands>
-A group of settings
-	<command name> : <bool>
-or
-	<commandname> : [ <bool>, <bool> ]
-First boolean value is for atcommand, second one for charcommand. If set to 
-true, group can use command. If only atcommand value is provided, false is 
-assumed for charcommand. If a command name is not included, false is assumed for 
-both atcommand and charcommand.
-For a full list of available commands, see: doc/atcommands.txt.
-Command names must not be aliases.
-
-<log_commands>
-Boolean value. If true then all commands used by the group will be logged to 
-atcommandlog. If setting is omitted in a group definition, false is assumed.
-Requires 'log_commands' to be enabled in 'conf/log_athena.conf'.
-
-<permissions>
-A group of settings
-	<permission> : <bool>
-If a permission is not included, false is assumed.
-For a full list of available permissions, see: doc/permissions.txt
-
-<inherit>
-A list of group names that given group will inherit commands and permissions 
-from. Group names are case-sensitive.
-
-Inheritance results
--------------------
-Both multiple inheritance (Group 2 -> Group 1 and Group 3 -> Group 1) and
-recursive inheritance (Group 3 -> Group 2 -> Group 1) are allowed.
-
-Inheritance rules should not create cycles (eg Group 1 inherits from Group 2, 
-and Group inherits from Group 1 at the same time). Configuration with cycles is 
-considered faulty and can't be processed fully by server.
-
-Command or permission is inherited ONLY if it's not already defined for the 
-group.
-If group inherits from multiple groups, and the same command or permission is 
-defined for more than one of these groups, it's undefined which one will be 
-inherited.
-
-Syntax
-------
-This config file uses libconfig syntax: 
-http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files
-
-
-Upgrading from revisions before r15572
--------------------------------------
-http://rathena.org/board/index.php?showtopic=58877
-*/
-
-groups: (
-{
-	id: 0 /* group 0 is the default group for every new account */
-	name: "Player"
-	level: 0
-	inherit: ( /*empty list*/ )
-	commands: {
-		changedress: true
-		resurrect: true
-	}
-	permissions: {
-		/* without this basic permissions regular players could not 
-		trade or party */
-		can_trade: true
-		can_party: true
-		attendance: true
-	}
-},
-{
-	id: 1
-	name: "Super Player"
-	inherit: ( "Player" ) /* can do everything Players can and more */
-	level: 0
-	commands: {
-		/* informational commands */
-		commands: true
-		charcommands: true
-		help: true
-		rates: true
-		uptime: true
-		showdelay: true
-		exp: true
-		mobinfo: true
-		iteminfo: true
-		whodrops: true
-		time: true
-		jailtime: true
-		hominfo: true
-		homstats: true
-		showexp: true
-		showzeny: true
-		whereis: true
-		/* feature commands */
-		refresh: true
-		noask: true
-		noks: true
-		autoloot: true
-		alootid: true
-		autoloottype: true
-		autotrade: true
-		request: true
-		go: true
-		breakguild: true
-		channel: true
-		langtype: true
-	}
-	permissions: {
-		attendance: false
-	}
-},
-{
-	id: 2
-	name: "Support"
-	inherit: ( "Super Player" )
-	level: 1
-	commands: {
-		version: true
-		where: true
-		jumpto: true
-		who: true
-		who2: true
-		who3: true
-		whomap: true
-		whomap2: true
-		whomap3: true
-		users: true
-		broadcast: true
-		localbroadcast: true
-	}
-	log_commands: true
-	permissions: {
-		receive_requests: true
-		view_equipment: true
-	}
-},
-{
-	id: 3
-	name: "Script Manager"
-	inherit: ( "Support" )
-	level: 1
-	commands: {
-		tonpc: true
-		hidenpc: true
-		shownpc: true
-		loadnpc: true
-		unloadnpc: true
-		npcmove: true
-		addwarp: true
-	}
-	log_commands: true
-	permissions: {
-		any_warp: true
-	}
-},
-{
-	id: 4
-	name: "Event Manager"
-	inherit: ( "Support" )
-	level: 1
-	commands: {
-		monster: true
-		monstersmall: true
-		monsterbig: true
-		killmonster2: true
-		cleanarea: true
-		cleanmap: true
-		item: [true, true]
-		zeny: [true, true]
-		disguise: [true, true]
-		undisguise: [true, true]
-		size: [true, true]
-		raise: true
-		raisemap: true
-		day: true
-		night: true
-		skillon: true
-		skilloff: true
-		pvpon: true
-		pvpoff: true
-		gvgon: true
-		gvgoff: true
-		allowks: true
-		me: true
-		marry: true
-		divorce: true
-		refreshall: true
-	}
-	log_commands: true
-	permissions: {
-		can_trade: false
-		any_warp: true
-	}
-},
-{
-	id: 5
-	name: "VIP"
-	inherit: ( "Player" ) /* can do everything Players can */
-	level: 0
-	commands: {
-		rates: true
-		who: true
-	}
-	permissions: {
-		/* no permissions by default */
-	}
-},
-{
-	id: 10
-	name: "Law Enforcement"
-	inherit: ( "Support" )
-	level: 2
-	commands: {
-		hide: true
-		follow: true
-		kick: true
-		disguise: true
-		fakename: true
-		option: true
-		speed: true
-		warp: true
-		kill: true
-		recall: true
-		ban: true
-		block: true
-		jail: true
-		jailfor: true
-		mute: true
-		storagelist: true
-		cartlist: true
-		itemlist: true
-		stats: true
-	}
-	log_commands: true
-	permissions: {
-		join_chat: true
-		kick_chat: true
-		hide_session: true
-		who_display_aid: true
-		hack_info: true
-		any_warp: true
-		view_hpmeter: true
-	}
-},
-{
-	id: 99
-	name: "Admin"
-	level: 99
-	inherit: ( "Support", "Law Enforcement" )
-	commands: {
-		/* not necessary due to all_commands: true */
-	}
-	log_commands: true
-	permissions: {
-		can_trade: true
-		can_party: true
-		command_enable: true
-		all_skill: false
-		all_equipment: false
-		skill_unconditional: false
-		use_check: true
-		use_changemaptype: true
-		all_commands: true
-		channel_admin: true
-		can_trade_bounded: true
-		item_unconditional: false
-		bypass_stat_onclone: true
-		bypass_max_stat: true
-		/* all_permission: true */
-	}
-}
-)
-

conf/groups.yml

@@ -0,0 +1,247 @@
+# 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/>.
+#
+###########################################################################
+# Player Group Database
+###########################################################################
+#
+# Player Group Settings
+#
+###########################################################################
+# - Id                    Group ID.
+#   Name                  Group name.
+#   Level                 GM Level used for ranking groups. (Default: 0)
+#   LogCommands           Whether atcommands should be logged or not. (Default: false)
+#   Commands:             List of atcommands that can be used by this group. (Default: none)
+#     <atcommand name>    Whether the specified atcommand can be used by this group or not.
+#   CharCommands:         List of charcommands that can be used by this group. (Default: none)
+#     <charcommand name>  Whether the specified charcommand can be used by this group or not.
+#   Permissions:          List of permissions the group has. (Default: none)
+#     <permission name>   Whether the group has this permission or not.
+#   Inherit:              List of groups that will be inherited. (Default: none)
+#     <group name>        Whether this group will be inherited or not.
+###########################################################################
+
+Header:
+  Type: PLAYER_GROUP_DB
+  Version: 1
+
+Body:
+  - Id: 0
+    # group 0 is the default group for every new account
+    Name: Player
+    Level: 0
+    Commands:
+      changedress: true
+      resurrect: true
+    Permissions:
+      # without this basic permissions regular players could not trade or party
+      can_trade: true
+      can_party: true
+      attendance: true
+  - Id: 1
+    Name: Super Player
+    # Can do everything Players can and more
+    Inherit:
+      Player: true
+    Level: 0
+    Commands:
+      # Informational commands
+      commands: true
+      charcommands: true
+      help: true
+      rates: true
+      uptime: true
+      showdelay: true
+      exp: true
+      mobinfo: true
+      iteminfo: true
+      whodrops: true
+      time: true
+      jailtime: true
+      hominfo: true
+      homstats: true
+      showexp: true
+      showzeny: true
+      whereis: true
+      # Feature commands
+      refresh: true
+      noask: true
+      noks: true
+      autoloot: true
+      alootid: true
+      autoloottype: true
+      autotrade: true
+      request: true
+      go: true
+      breakguild: true
+      channel: true
+      langtype: true
+    Permissions:
+      attendance: false
+  - Id: 2
+    Name: Support
+    Inherit:
+      Super Player: true
+    Level: 1
+    Commands:
+      version: true
+      where: true
+      jumpto: true
+      who: true
+      who2: true
+      who3: true
+      whomap: true
+      whomap2: true
+      whomap3: true
+      users: true
+      broadcast: true
+      localbroadcast: true
+    LogCommands: true
+    Permissions:
+      receive_requests: true
+      view_equipment: true
+  - Id: 3
+    Name: Script Manager
+    Inherit:
+      Support: true
+    Level: 1
+    Commands:
+      tonpc: true
+      hidenpc: true
+      shownpc: true
+      loadnpc: true
+      unloadnpc: true
+      npcmove: true
+      addwarp: true
+    LogCommands: true
+    Permissions:
+      any_warp: true
+  - Id: 4
+    Name: Event Manager
+    Inherit:
+      Support: true
+    Level: 1
+    Commands:
+      monster: true
+      monstersmall: true
+      monsterbig: true
+      killmonster2: true
+      cleanarea: true
+      cleanmap: true
+      item: true
+      zeny: true
+      disguise: true
+      undisguise: true
+      size: true
+      raise: true
+      raisemap: true
+      day: true
+      night: true
+      skillon: true
+      skilloff: true
+      pvpon: true
+      pvpoff: true
+      gvgon: true
+      gvgoff: true
+      allowks: true
+      me: true
+      marry: true
+      divorce: true
+      refreshall: true
+    CharCommands:
+      item: true
+      zeny: true
+      disguise: true
+      undisguise: true
+      size: true
+    LogCommands: true
+    Permissions:
+      can_trade: false
+      any_warp: true
+  - Id: 5
+    Name: VIP
+    # Can do everything Players can
+    Inherit:
+      Player: true
+    Level: 0
+    Commands:
+      rates: true
+      who: true
+  - Id: 10
+    Name: Law Enforcement
+    Inherit:
+      Support: true
+    Level: 2
+    Commands:
+      hide: true
+      follow: true
+      kick: true
+      disguise: true
+      fakename: true
+      option: true
+      speed: true
+      warp: true
+      kill: true
+      recall: true
+      ban: true
+      block: true
+      jail: true
+      jailfor: true
+      mute: true
+      storagelist: true
+      cartlist: true
+      itemlist: true
+      stats: true
+    LogCommands: true
+    Permissions:
+      join_chat: true
+      kick_chat: true
+      hide_session: true
+      who_display_aid: true
+      hack_info: true
+      any_warp: true
+      view_hpmeter: true
+      macro_detect: true
+  - Id: 99
+    Name: Admin
+    Level: 99
+    Inherit:
+      Support: true
+      Law Enforcement: true
+    LogCommands: true
+    Permissions:
+      can_trade: true
+      can_party: true
+      command_enable: true
+      all_skill: false
+      all_equipment: false
+      skill_unconditional: false
+      use_check: true
+      use_changemaptype: true
+      all_commands: true
+      channel_admin: true
+      can_trade_bounded: true
+      item_unconditional: false
+      bypass_stat_onclone: true
+      bypass_max_stat: true
+      macro_register: true
+      #all_permission: true
+
+Footer:
+  Imports:
+  - Path: conf/import/groups.yml

conf/import-tmpl/groups.yml

@@ -0,0 +1,41 @@
+# 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/>.
+#
+###########################################################################
+# Player Group Database
+###########################################################################
+#
+# Player Group Settings
+#
+###########################################################################
+# - Id                    Group ID.
+#   Name                  Group name.
+#   Level                 GM Level used for ranking groups. (Default: 0)
+#   LogCommands           Whether atcommands should be logged or not. (Default: false)
+#   Commands:             List of atcommands that can be used by this group. (Default: none)
+#     <atcommand name>    Whether the specified atcommand can be used by this group or not.
+#   CharCommands:         List of charcommands that can be used by this group. (Default: none)
+#     <charcommand name>  Whether the specified charcommand can be used by this group or not.
+#   Permissions:          List of permissions the group has. (Default: none)
+#     <permission name>   Whether the group has this permission or not.
+#   Inherit:              List of groups that will be inherited. (Default: none)
+#     <group name>        Whether this group will be inherited or not.
+###########################################################################
+
+Header:
+  Type: PLAYER_GROUP_DB
+  Version: 1

conf/inter_athena.conf

@@ -15,6 +15,12 @@ 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:
@@ -58,6 +64,13 @@ 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
@@ -134,8 +147,6 @@ item_table: item_db
 renewal-item_table: item_db_re
 item2_table: item_db2
 renewal-item2_table: item_db2_re
-item_cash_table: item_cash_db
-item_cash2_table: item_cash_db2
 mob_table: mob_db
 renewal-mob_table: mob_db_re
 mob2_table: mob_db2
@@ -145,6 +156,7 @@ renewal-mob_skill_table: mob_skill_db_re
 mob_skill2_table: mob_skill_db2
 renewal-mob_skill2_table: mob_skill_db2_re
 mapreg_table: mapreg
+partybookings_table: party_bookings
 sales_table: sales
 vending_table: vendings
 vending_items_table: vending_items
@@ -152,6 +164,14 @@ 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 (party,guild) tables and map (party_bookings), 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/log_athena.conf

@@ -8,37 +8,40 @@
 //--------------------------------------------------------------
 
 // Enable Logs? (Note 3)
-// 0x0000000 - Don't log at all
-// 0x0000001 - (T) Log trades
-// 0x0000002 - (V) Log vending transactions
-// 0x0000004 - (P) Log items drop/picked by players
-// 0x0000008 - (L) Log items drop/looted by monsters
-// 0x0000010 - (S) Log NPC transactions (buy/sell)
-// 0x0000020 - (N) Log Script transactions (items deleted/acquired through quests)
-// 0x0000040 - (D) Log items stolen from mobs (Steal/Gank)
-// 0x0000080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
-// 0x0000100 - (O) Log produced/ingredient items
-// 0x0000200 - (U) Log MVP prize items
-// 0x0000400 - (A) Log player created/deleted items (through @/# commands)
-// 0x0000800 - (R) Log items placed/retrieved from storage.
-// 0x0001000 - (G) Log items placed/retrieved from guild storage.
-// 0x0002000 - (E) Log mail system transactions.
-// 0x0004000 - (I) Log auction system transactions.
-// 0x0008000 - (B) Log buying store transactions
-// 0x0010000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
+// 0x00000000 - Don't log at all
+// 0x00000001 - (T) Log trades
+// 0x00000002 - (V) Log vending transactions
+// 0x00000004 - (P) Log items drop/picked by players
+// 0x00000008 - (L) Log items drop/looted by monsters
+// 0x00000010 - (S) Log NPC transactions (buy/sell)
+// 0x00000020 - (N) Log Script transactions (items deleted/acquired through quests)
+// 0x00000040 - (D) Log items stolen from mobs (Steal/Gank)
+// 0x00000080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
+// 0x00000100 - (O) Log produced/ingredient items
+// 0x00000200 - (U) Log MVP prize items
+// 0x00000400 - (A) Log player created/deleted items (through @/# commands)
+// 0x00000800 - (R) Log items placed/retrieved from storage.
+// 0x00001000 - (G) Log items placed/retrieved from guild storage.
+// 0x00002000 - (E) Log mail system transactions.
+// 0x00004000 - (I) Log auction system transactions.
+// 0x00008000 - (B) Log buying store transactions
+// 0x00010000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
 //           rings deleted by divorce/pet egg (un)hatching/pet armor (un)equipping/Weapon Refine skill/Remove Trap skill/Stylist)
-// 0x0020000 - ($) Log cash transactions
-// 0x0040000 - (K) Log account bank transactions
-// 0x0080000 - (F) Removed bound items when guild/party is broken
-// 0x0100000 - (Y) Log Roulette Lottery
-// 0x0200000 - (Z) Merged items from item mergers process.
-// 0x0400000 - (Q) Log items given from quest-granted drops.
-// 0x0800000 - (H) Log items consumed by Private Airship system
-// 0x1000000 - (J) Log Barter Shop transactions
-// 0x2000000 - (W) Log Laphine system transactions
+// 0x00020000 - ($) Log cash transactions
+// 0x00040000 - (K) Log account bank transactions
+// 0x00080000 - (F) Removed bound items when guild/party is broken
+// 0x00100000 - (Y) Log Roulette Lottery
+// 0x00200000 - (Z) Merged items from item mergers process.
+// 0x00400000 - (Q) Log items given from quest-granted drops.
+// 0x00800000 - (H) Log items consumed by Private Airship system
+// 0x01000000 - (J) Log Barter Shop transactions
+// 0x02000000 - (W) Log Laphine system transactions
+// 0x04000000 - (0) Enchantgrade UI
+// 0x08000000 - (1) Reform UI
+// 0x10000000 - (2) Enchant UI
 // Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059
 // Please note that moving items from inventory to cart and back is not logged by design.
-enable_logs: 0xFFFFFFF
+enable_logs: 0xFFFFFFFF
 
 // Use MySQL Logs? (Note 1)
 sql_logs: yes

conf/login_athena.conf

@@ -167,6 +167,11 @@ 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

@@ -1483,5 +1483,92 @@ map: verus02_b
 map: tur_d04ia
 map: tur_d04ib
 
+// Episode 19
+map: icecastle
+map: icas_in
+map: jor_tail
+map: jor_back1
+map: jor_back2
+map: jor_back3
+map: jor_nest
+map: jor_dun01
+map: jor_dun02
+map: jor_dun03
+map: jor_ab01
+map: jor_ab02
+map: jor_que
+map: air_if
+map: 1@iwp
+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
+map: bl_soul
+map: bl_temple
+map: bl_venom
+
+// 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@vrac1
+map: 1@vrac2
+map: 1@vrclo
+map: 1@vrhha
+map: 2@vrclo
+
+// ??
+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
+
+// Level 260 Expansion
+map: mjo_wst01
+map: ra_pol01
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------

conf/msg_conf/map_msg.conf

@@ -921,7 +921,16 @@
 // @mobinfo RES/MRES
 827:  RES:%d  MRES:%d
 
-//828-899 free
+// 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.
+
+// @reloadbarterdb
+830: Barter database has been reloaded.
+
+//831-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1106,8 +1115,7 @@
 // @partyrecall
 1035: Please enter a party name/ID (usage: @partyrecall <party_name/ID>).
 
-// @reloadatcommand
-1036: Error reading groups.conf, reload failed.
+//1036 free
 //1037 free
 
 // @mapinfo
@@ -1784,5 +1792,9 @@
 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/map_msg_chn.conf

@@ -865,8 +865,7 @@
 // @partyrecall
 1035: 請輸入隊伍名稱/ID (用法: @partyrecall <party_name/ID>).
 
-// @reloadatcommand
-1036: Error reading groups.conf, reload failed.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_frn.conf

@@ -877,8 +877,7 @@
 // @partyrecall
 1035: Entrez un nom/ID d'Equipe (usage: @partyrecall <nom/ID_party>).
 
-// @reloadatcommand
-1036: Erreur à la lecture de groups.conf, reload échoué.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_idn.conf

@@ -964,8 +964,7 @@
 // @partyrecall
 1035: Harap masukkan nama party/ID. (Penggunaan: @partyrecall <nama party/ID>).
 
-// @reloadatcommand
-1036: Terjadi kesalahan saat membaca groups.conf, tidak berhasil dimuat ulang.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_por.conf

@@ -1046,8 +1046,7 @@
 // @partyrecall
 1035: Digite o nome/ID de um grupo (uso: @partyrecall <nome/ID_do_grupo>).
 
-// @reloadatcommand
-1036: Erro na leitura do grups.conf, recarregamento falhou.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_rus.conf

@@ -878,8 +878,7 @@
 // @partyrecall
 1035: Введите ID/название группы (Использование: @partyrecall <ID/название группы>).
 
-// @reloadatcommand
-1036: Ошибка чтения файла groups.conf, перезагрузка не удалась.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_spn.conf

@@ -1015,8 +1015,7 @@
 // @partyrecall
 1035: Introduce el nombre/ID de un grupo (instrucciones: @partyrecall <nombre/ID del grupo>).
 
-// @reloadatcommand
-1036: Ha ocurrido un error al cargar el archivo groups.conf.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_tha.conf

@@ -871,8 +871,7 @@
 // @partyrecall
 1035: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID party (<28><>¸<EFBFBD>ד×י: @partyrecall <×<>ט<EFBFBD>/ID party>).
 
-// @reloadatcommand
-1036: א<><D790>´¢י<C2A2>¼<EFBFBD>´¾<C2B4><C2BE>´ד¹<D793><C2B9><EFBFBD>¼ט<C2BC>¹ה<C2B9><D794>ל groups.conf, <20><><EFBFBD>ג<EFBFBD><D792>´ד<C2B4><D793>ט<EFBFBD>י<EFBFBD>א<EFBFBD><D790><EFBFBD>.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/web_msg.conf

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

conf/web_athena.conf

@@ -0,0 +1,56 @@
+// 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.in Revision.
+# From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -642,6 +642,7 @@ ac_ct_CC
 CFLAGS
 CC
 SET_MAKE
+OWEB
 OMAP
 OCHR
 OLOG
@@ -674,6 +675,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -712,6 +714,7 @@ with_maxconn
 with_outputlogin
 with_outputchar
 with_outputmap
+with_outputweb
 with_mysql
 with_MYSQL_CFLAGS
 with_MYSQL_LIBS
@@ -768,6 +771,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1020,6 +1024,15 @@ 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=* \
@@ -1157,7 +1170,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
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1310,6 +1323,7 @@ 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]
@@ -1367,9 +1381,10 @@ 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)
@@ -1377,6 +1392,8 @@ 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
@@ -1718,44 +1735,6 @@ $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.
@@ -1802,6 +1781,44 @@ 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
@@ -2740,12 +2757,14 @@ 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"
+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 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'
@@ -3284,11 +3303,10 @@ 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
 #
@@ -3464,18 +3482,24 @@ fi
 
 
 #
-# Optionally set the max number of network conenctions
-# the core will be support
+# Optionally set the maximum number of network connections
+# the core will be able to handle
 #
 
 # 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
+		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"
+
+
 fi
 
 
@@ -3520,6 +3544,18 @@ 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
 #
@@ -7027,7 +7063,6 @@ fi
 
 
 
-
 #
 # Host specific stuff
 #
@@ -7092,8 +7127,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" >&5
-$as_echo "$as_me: output name =  $output_login, $output_char, $output_map" >&6;}
+{ $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;}
 
 ###############################################################################
 cat >confcache <<\_ACEOF
@@ -7807,10 +7842,12 @@ 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.ac

@@ -8,9 +8,10 @@ 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])
+AC_CONFIG_FILES([3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile 3rdparty/rapidyaml/Makefile 3rdparty/httplib/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
 
@@ -46,7 +47,7 @@ AC_ARG_ENABLE(
 	[packetver],
 	AC_HELP_STRING(
 		[--enable-packetver=ARG],
-		[Sets the PACKETVER define. (see src/common/mmo.h)]
+		[Sets the PACKETVER define. (see src/common/mmo.hpp)]
 	),
 	[enable_packetver="$enableval"],
 	[enable_packetver=""]
@@ -302,7 +303,8 @@ 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 is used.]
+		[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.]
 	),
 	[
 		if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
@@ -353,6 +355,17 @@ 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
@@ -635,7 +648,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"
@@ -670,7 +683,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"
@@ -1301,7 +1314,6 @@ AC_SUBST([PCRE_VERSION])
 AC_SUBST([PCRE_LIBS])
 AC_SUBST([PCRE_CFLAGS])
 
-
 #
 # Host specific stuff
 #
@@ -1356,7 +1368,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])
+AC_MSG_NOTICE([output name =  $output_login, $output_char, $output_map, $output_web])
 
 ###############################################################################
 AC_OUTPUT

db/captcha_db.yml

@@ -0,0 +1,37 @@
+# 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/castle_db.yml

@@ -26,11 +26,18 @@
 #   Map               Map name to be considered as the castle map.
 #   Name              Name of the castle (used by scripts and guardian name tags).
 #   Npc               NPC unique name to invoke ::OnGuildBreak on, when a occupied castle is abandoned during guild break.
+#   Type              The WoE type this castle belongs to. (Default: First_Edition)
+#   ClientId          Client side ID of the castle. (Default: 0)
+#   WarpEnabled       If the warp to the castle is enabled. (Default: false)
+#   WarpX             X coordinate to warp to. (Default: 0)
+#   WarpY             Y coordinate to warp to. (Default: 0)
+#   WarpCost          Zeny cost to use the warp. (Default: 100)
+#   WarpCostSiege     Zeny cost to use the warp during WoE. (Default: 100000)
 ###########################################################################
 
 Header:
   Type: CASTLE_DB
-  Version: 1
+  Version: 2
 
 Footer:
   Imports:

db/enchantgrade.yml

@@ -0,0 +1,60 @@
+# 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/>.
+#
+###########################################################################
+# Enchantgrade Database
+###########################################################################
+#
+# Enchantgrade Settings
+#
+###########################################################################
+# - Type                                Item type.
+#   Levels:                             Enchantgrade settings per item level.
+#     - Level                           Item level.
+#       Grades:                         Enchantgrade settings per grade level.
+#         - Grade                       Enchantgrade level.
+#           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.
+#           Catalyst:                   Catalyst item to increase chance of success.
+#             Item                      The item that can be used.
+#             AmountPerStep             Amount of Item needed.
+#                                       Set to 0 to disable the catalyst.
+#             MaximumSteps              Maximum amount of times Item can be used.
+#             ChanceIncrease            Amount at which the chance increases for each Item used.
+#           Options:                    Success chance based on cost type.
+#             - Option                  Index of the client option.
+#               Item                    Required item.
+#               Amount                  Amount of required item. (Default: 1)
+#                                       Set to 0 to remove an option.
+#               Price                   Amount of zeny required. (Default: 0)
+#               BreakingRate            Chance of item breaking out of 0~10000. (Default: 0)
+#               DowngradeAmount         Number of refine levels reduced on failure. (Default: 0)
+###########################################################################
+
+Header:
+  Type: ENCHANTGRADE_DB
+  Version: 2
+
+Footer:
+  Imports:
+  - Path: db/re/enchantgrade.yml
+    Mode: Renewal
+  - Path: db/import/enchantgrade.yml

db/import-tmpl/captcha_db.yml

@@ -0,0 +1,33 @@
+# 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/castle_db.yml

@@ -26,8 +26,15 @@
 #   Map               Map name to be considered as the castle map.
 #   Name              Name of the castle (used by scripts and guardian name tags).
 #   Npc               NPC unique name to invoke ::OnGuildBreak on, when a occupied castle is abandoned during guild break.
+#   Type              The WoE type this castle belongs to. (Default: First_Edition)
+#   ClientId          Client side ID of the castle. (Default: 0)
+#   WarpEnabled       If the warp to the castle is enabled. (Default: false)
+#   WarpX             X coordinate to warp to. (Default: 0)
+#   WarpY             Y coordinate to warp to. (Default: 0)
+#   WarpCost          Zeny cost to use the warp. (Default: 100)
+#   WarpCostSiege     Zeny cost to use the warp during WoE. (Default: 100000)
 ###########################################################################
 
 Header:
   Type: CASTLE_DB
-  Version: 1
+  Version: 2

db/import-tmpl/enchantgrade.yml

@@ -0,0 +1,54 @@
+# 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/>.
+#
+###########################################################################
+# Enchantgrade Database
+###########################################################################
+#
+# Enchantgrade Settings
+#
+###########################################################################
+# - Type                                Item type.
+#   Levels:                             Enchantgrade settings per item level.
+#     - Level                           Item level.
+#       Grades:                         Enchantgrade settings per grade level.
+#         - Grade                       Enchantgrade level.
+#           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.
+#           Catalyst:                   Catalyst item to increase chance of success.
+#             Item                      The item that can be used.
+#             AmountPerStep             Amount of Item needed.
+#                                       Set to 0 to disable the catalyst.
+#             MaximumSteps              Maximum amount of times Item can be used.
+#             ChanceIncrease            Amount at which the chance increases for each Item used.
+#           Options:                    Success chance based on cost type.
+#             - Option                  Index of the client option.
+#               Item                    Required item.
+#               Amount                  Amount of required item. (Default: 1)
+#                                       Set to 0 to remove an option.
+#               Price                   Amount of zeny required. (Default: 0)
+#               BreakingRate            Chance of item breaking out of 0~10000. (Default: 0)
+#               DowngradeAmount         Number of refine levels reduced on failure. (Default: 0)
+###########################################################################
+
+Header:
+  Type: ENCHANTGRADE_DB
+  Version: 2

db/import-tmpl/item_cash.yml

@@ -0,0 +1,33 @@
+# 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 Cash Database
+###########################################################################
+#
+# Item Cash Settings
+#
+###########################################################################
+# - Tab                     Cash shop tab. Available tabs are New, Hot, Limited, Rental, Permanent, Scrolls, Consumables, Other, Sale.
+#   Items:                  List of possible items.
+#     - Item                Item name.
+#       Price               Item cost in cash points (#CASHPOINTS).
+###########################################################################
+
+Header:
+  Type: ITEM_CASH_DB
+  Version: 1

db/import-tmpl/item_cash_db.txt

@@ -1,19 +0,0 @@
-// Cash Shop Database
-// Contains the items sold in the ingame cash shop.
-//
-// Structure of Database:
-// Type,ItemID,Price
-//
-// Type:
-//    0: New
-//    1: Hot
-//    2: Limited
-//    3: Rental
-//    4: Gear
-//    5: Buff
-//    6: Heal
-//    7: Other
-//    8: Sale
-//
-// Price:
-//    Item cost, in cash points (#CASHPOINTS).

db/import-tmpl/item_db.yml

@@ -44,6 +44,7 @@
 #   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)
@@ -85,7 +86,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 2
+  Version: 3
 
 #Body:
 # THQ Quest Items

db/import-tmpl/item_enchant.yml

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

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

@@ -0,0 +1,44 @@
+# 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/job_stats.yml

@@ -25,9 +25,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 #Body:
 ###########################################################################

db/import-tmpl/map_drops.yml

@@ -0,0 +1,44 @@
+# 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_avail.yml

@@ -33,6 +33,7 @@
 #   HeadTop                 Item name of headgear (if Sprite is a player). (Default: 0)
 #   HeadMid                 Item name of headgear (if Sprite is a player). (Default: 0)
 #   HeadLow                 Item name of headgear (if Sprite is a player). (Default: 0)
+#   Robe                    Item name of robe (if Sprite is a player). (Default: 0)
 #   PetEquip                Item name of pet equipment (if Mob is a valid pet). (Default: 0)
 #   Options:                Set an option for an object. (Optional)
 #     <Option>: bool
@@ -68,6 +69,7 @@ Header:
 #    HeadTop: Sahkkat
 #    HeadMid: Sunglasses
 #    HeadLow: Cigar
+#    Robe: Archangel_Wing
 #    Options:
 #      Falcon: true
   # Valaris Worshiper

db/import-tmpl/mob_skill_db.txt

@@ -43,6 +43,9 @@
 //	afterskill		After mob casts the specified skill.
 //	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/quest_db.yml

@@ -22,37 +22,29 @@
 # Quest Settings
 #
 ###########################################################################
-# - Id              Quest ID.
-#   Title           Quest title.
-#   TimeLimit       Amount of time before the quest expires. (Default: 0)
-#                   Use a number following by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-#                   Specify with "+" for how long until the quest expires.
-#                   Specify without "+" for the exact time the quest expires using "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional) format.
-#                   Please note the number before "d" only shift the exact timer to the given day(s).
-#   Targets:        Quest objective target. (Default: null)
-#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
-#                   If Mob is supplied, Count is required and the other fields are ignored.
-#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
-#                   If Id is supplied, Count is required for each new entry.
-#     - Mob         Monster to kill (aegis monster name).
-#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
-#       Id          Unique target index for the quest Id. Requires a positive number.
-#       Race        Monster race target (default All). Valid races are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
-#       Size        Monster size target (default All). Valid sizes are Small, Medium, Large, All.
-#       Element     Monster element target (default All). Valid elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
-#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
-#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
-#       Location    Map name where kills are counted. (Default any location)
-#                   On normal maps only kills of permanently spawned monsters increase the counter.
-#                   On instance maps all monster kills increase the counter.
-#       MapName     Displayed map name in quest UI. (Default: empty string)
-#   Drops:          Quest item drop targets. (Default: null)
-#     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
-#       Item        Item to drop.
-#       Count       Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
-#       Rate        Item drop rate. (10000 = 100%)
+# - Id                     Quest ID.
+#   Title                  Quest title.
+#   TimeLimit              Amount of time before the quest expires. (Default: 0)
+#   Targets:               Quest objective target. (Default: null)
+#     - Mob                Name of monster to kill.
+#       Count              Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id                 Unique target index for the quest Id. Requires a positive number.
+#       Race               Monster race target. (Default: All)
+#       Size               Monster size target. (Default: All)
+#       Element            Monster element target. (Default: All)
+#       MinLevel           Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel           Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
+#       Location           Map name where kills are counted. (Default: All)
+#       MapName            Displayed map name in quest UI. (Default: empty string)
+#       MapMobTargets      List of monster names. Only names in the list will increase the kill counter. Only active when Id is used. (Default: all monsters)
+#         <name>: <bool>   Monster name and whether the monster is added or removed from the list.
+#   Drops:                 Quest item drop targets. (Default: null)
+#     - Mob                Monster to kill. 0 will apply to all monsters. (Default: 0)
+#       Item               Item to drop.
+#       Count              Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
+#       Rate               Item drop rate. (10000 = 100%)
 ###########################################################################
 
 Header:
   Type: QUEST_DB
-  Version: 2
+  Version: 3

db/import-tmpl/refine.yml

@@ -30,6 +30,8 @@
 #           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)
@@ -41,7 +43,7 @@
 
 Header:
   Type: REFINE_DB
-  Version: 1
+  Version: 2
 
 ###########################################################################
 # Event Refine Rates

db/import-tmpl/reputation.yml

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

@@ -0,0 +1,33 @@
+# 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,10 +35,11 @@
 #   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)
-#   End:                      List of Status Changes that will end when the status activates. (Optional)
+#   EndOnStart:               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: 2
+  Version: 3

db/item_cash.yml

@@ -0,0 +1,37 @@
+# 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 Cash Database
+###########################################################################
+#
+# Item Cash Settings
+#
+###########################################################################
+# - Tab                     Cash shop tab. Available tabs are New, Hot, Limited, Rental, Permanent, Scrolls, Consumables, Other, Sale.
+#   Items:                  List of possible items.
+#     - Item                Item name.
+#       Price               Item cost in cash points (#CASHPOINTS).
+###########################################################################
+
+Header:
+  Type: ITEM_CASH_DB
+  Version: 1
+
+Footer:
+  Imports:
+    - Path: db/import/item_cash.yml

db/item_db.yml

@@ -44,6 +44,7 @@
 #   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)
@@ -85,7 +86,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 2
+  Version: 3
 
 Footer:
   Imports:

db/item_enchant.yml

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

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

@@ -0,0 +1,50 @@
+# 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/job_stats.yml

@@ -23,11 +23,11 @@
 #
 ###########################################################################
 # - Jobs:                    List of jobs associated to group.
-#     Job                    Job ID.
+#     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 Footer:
   Imports:

db/map_drops.yml

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

@@ -1143,6 +1143,73 @@ que_thr
 tur_d04ia
 tur_d04ib
 wolfvill
+icecastle
+icas_in
+jor_tail
+jor_back1
+jor_back2
+jor_back3
+jor_nest
+jor_dun01
+jor_dun02
+jor_dun03
+jor_ab01
+jor_ab02
+jor_que
+air_if
+1@iwp
+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
+1@vrac1
+1@vrac2
+1@vrclo
+1@vrhha
+2@vrclo
+bl_soul
+bl_temple
+bl_venom
+mjo_wst01
+ra_pol01
 
 //======================================================================================
 // - Other/Extra maps -

db/mob_chat_db.yml

@@ -126,6 +126,26 @@ 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/pre-re/castle_db.yml

@@ -26,11 +26,18 @@
 #   Map               Map name to be considered as the castle map.
 #   Name              Name of the castle (used by scripts and guardian name tags).
 #   Npc               NPC unique name to invoke ::OnGuildBreak on, when a occupied castle is abandoned during guild break.
+#   Type              The WoE type this castle belongs to. (Default: First_Edition)
+#   ClientId          Client side ID of the castle. (Default: 0)
+#   WarpEnabled       If the warp to the castle is enabled. (Default: false)
+#   WarpX             X coordinate to warp to. (Default: 0)
+#   WarpY             Y coordinate to warp to. (Default: 0)
+#   WarpCost          Zeny cost to use the warp. (Default: 100)
+#   WarpCostSiege     Zeny cost to use the warp during WoE. (Default: 100000)
 ###########################################################################
 
 Header:
   Type: CASTLE_DB
-  Version: 1
+  Version: 2
 
 Body:
 # WOE FE castle
@@ -39,200 +46,222 @@ Body:
     Name: Neuschwanstein
     #Name: Noisyubantian
     Npc: Agit#aldeg_cas01
+    Type: First_Edition
+    ClientId: 6
   - Id: 1
     Map: aldeg_cas02
     Name: Hohenschwangau
     #Name: Hohensyubangawoo
     Npc: Agit#aldeg_cas02
+    Type: First_Edition
+    ClientId: 7
   - Id: 2
     Map: aldeg_cas03
     Name: Nuernberg
     #Name: Nyirenverk
     Npc: Agit#aldeg_cas03
+    Type: First_Edition
+    ClientId: 8
   - Id: 3
     Map: aldeg_cas04
     Name: Wuerzburg
     #Name: Byirtsburi
     Npc: Agit#aldeg_cas04
+    Type: First_Edition
+    ClientId: 9
   - Id: 4
     Map: aldeg_cas05
     Name: Rothenburg
     #Name: Rotenburk
     Npc: Agit#aldeg_cas05
+    Type: First_Edition
+    ClientId: 10
   - Id: 5
     Map: gefg_cas01
     Name: Repherion
     #Name: Reprion
     Npc: Agit#gefg_cas01
+    Type: First_Edition
+    ClientId: 11
   - Id: 6
     Map: gefg_cas02
     Name: Eeyolbriggar
     #Name: Yolbriger
     Npc: Agit#gefg_cas02
+    Type: First_Edition
+    ClientId: 12
   - Id: 7
     Map: gefg_cas03
     Name: Yesnelph
     #Name: Isinlife
     Npc: Agit#gefg_cas03
+    Type: First_Edition
+    ClientId: 13
   - Id: 8
     Map: gefg_cas04
     Name: Bergel
     #Name: Berigel
     Npc: Agit#gefg_cas04
+    Type: First_Edition
+    ClientId: 14
   - Id: 9
     Map: gefg_cas05
     Name: Mersetzdeitz
     #Name: Melsedetsu
     Npc: Agit#gefg_cas05
+    Type: First_Edition
+    ClientId: 15
   - Id: 10
     Map: payg_cas01
     Name: Bright Arbor
     #Name: Mingting
     Npc: Agit#payg_cas01
+    Type: First_Edition
+    ClientId: 16
   - Id: 11
     Map: payg_cas02
     Name: Scarlet Palace
     #Name: Tiantan
     Npc: Agit#payg_cas02
+    Type: First_Edition
+    ClientId: 17
   - Id: 12
     Map: payg_cas03
     Name: Holy Shadow
     #Name: Fuying
     Npc: Agit#payg_cas03
+    Type: First_Edition
+    ClientId: 18
   - Id: 13
     Map: payg_cas04
     Name: Sacred Altar
     #Name: Honglou
     Npc: Agit#payg_cas04
+    Type: First_Edition
+    ClientId: 19
   - Id: 14
     Map: payg_cas05
     Name: Bamboo Grove Hill
     #Name: Zhulinxian
     Npc: Agit#payg_cas05
+    Type: First_Edition
+    ClientId: 20
   - Id: 15
     Map: prtg_cas01
     Name: Kriemhild
     #Name: Creamhilt
     Npc: Agit#prtg_cas01
+    Type: First_Edition
+    ClientId: 1
   - Id: 16
     Map: prtg_cas02
     Name: Swanhild
     #Name: Sbanhealt
     Npc: Agit#prtg_cas02
+    Type: First_Edition
+    ClientId: 2
   - Id: 17
     Map: prtg_cas03
     Name: Fadhgridh
     #Name: Lazrigees
     Npc: Agit#prtg_cas03
+    Type: First_Edition
+    ClientId: 3
   - Id: 18
     Map: prtg_cas04
     Name: Skoegul
     #Name: Squagul
     Npc: Agit#prtg_cas04
+    Type: First_Edition
+    ClientId: 4
   - Id: 19
     Map: prtg_cas05
     Name: Gondul
     #Name: Guindull
     Npc: Agit#prtg_cas05
+    Type: First_Edition
+    ClientId: 5
 
 # WOE NGuild castle
   - Id: 20
     Map: nguild_alde
     Name: Earth
     Npc: Agit_N01
+    Type: First_Edition
   - Id: 21
     Map: nguild_gef
     Name: Air
     Npc: Agit_N02
+    Type: First_Edition
   - Id: 22
     Map: nguild_pay
     Name: Water
     Npc: Agit_N03
+    Type: First_Edition
   - Id: 23
     Map: nguild_prt
     Name: Fire
     Npc: Agit_N04
+    Type: First_Edition
 
 # WOE SE castle
   - Id: 24
     Map: schg_cas01
     Name: Himinn
     Npc: Manager#schg_cas01
+    Type: Second_Edition
+    ClientId: 26
   - Id: 25
     Map: schg_cas02
     Name: Andlangr
     Npc: Manager#schg_cas02
+    Type: Second_Edition
+    ClientId: 27
   - Id: 26
     Map: schg_cas03
     Name: Viblainn
     Npc: Manager#schg_cas03
+    Type: Second_Edition
+    ClientId: 28
   - Id: 27
     Map: schg_cas04
     Name: Hljod
     Npc: Manager#schg_cas04
+    Type: Second_Edition
+    ClientId: 29
   - Id: 28
     Map: schg_cas05
     Name: Skidbladnir
     Npc: Manager#schg_cas05
+    Type: Second_Edition
+    ClientId: 30
   - Id: 29
     Map: arug_cas01
     Name: Mardol
     Npc: Manager#arug_cas01
+    Type: Second_Edition
+    ClientId: 21
   - Id: 30
     Map: arug_cas02
     Name: Cyr
     Npc: Manager#arug_cas02
+    Type: Second_Edition
+    ClientId: 22
   - Id: 31
     Map: arug_cas03
     Name: Horn
     Npc: Manager#arug_cas03
+    Type: Second_Edition
+    ClientId: 23
   - Id: 32
     Map: arug_cas04
     Name: Gefn
     Npc: Manager#arug_cas04
+    Type: Second_Edition
+    ClientId: 24
   - Id: 33
     Map: arug_cas05
     Name: Bandis
     Npc: Manager#arug_cas05
-
-# WOE TE castle
-  - Id: 34
-    Map: te_aldecas1
-    Name: Kafragarten 1
-    Npc: Manager_TE#Glaris
-  - Id: 35
-    Map: te_aldecas2
-    Name: Kafragarten 2
-    Npc: Manager_TE#Defolty
-  - Id: 36
-    Map: te_aldecas3
-    Name: Kafragarten 3
-    Npc: Manager_TE#Sorin
-  - Id: 37
-    Map: te_aldecas4
-    Name: Kafragarten 4
-    Npc: Manager_TE#Bennit
-  - Id: 38
-    Map: te_aldecas5
-    Name: Kafragarten 5
-    Npc: Manager_TE#W
-  - Id: 39
-    Map: te_prtcas01
-    Name: Gloria 1
-    Npc: Manager_TE#Gaebolg
-  - Id: 40
-    Map: te_prtcas02
-    Name: Gloria 2
-    Npc: Manager_TE#Richard
-  - Id: 41
-    Map: te_prtcas03
-    Name: Gloria 3
-    Npc: Manager_TE#Wigner
-  - Id: 42
-    Map: te_prtcas04
-    Name: Gloria 4
-    Npc: Manager_TE#Heine
-  - Id: 43
-    Map: te_prtcas05
-    Name: Gloria 5
-    Npc: Manager_TE#Nerious
+    Type: Second_Edition
+    ClientId: 25

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_cash_db.txt

@@ -1,19 +0,0 @@
-// Cash Shop Database
-// Contains the items sold in the ingame cash shop.
-//
-// Structure of Database:
-// Type,ItemID,Price
-//
-// Type:
-//    0: New
-//    1: Hot
-//    2: Limited
-//    3: Rental
-//    4: Gear
-//    5: Buff
-//    6: Heal
-//    7: Other
-//    8: Sale
-//
-// Price:
-//    Item cost, in cash points (#CASHPOINTS).

db/pre-re/item_db.yml

@@ -44,6 +44,7 @@
 #   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)
@@ -85,7 +86,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 2
+  Version: 3
 
 Footer:
   Imports:

db/pre-re/item_db_equip.yml

@@ -44,6 +44,7 @@
 #   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)
@@ -85,7 +86,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 2
+  Version: 3
 
 Body:
   - Id: 1101
@@ -844,7 +845,6 @@ Body:
     Refineable: true
     Script: |
       skill "TF_DOUBLE",5;
-      bonus bDoubleRate,25;
       bonus2 bAddRace,RC_DemiHuman,5;
       bonus2 bAddRace,RC_Player_Human,5;
   - Id: 1131
@@ -10432,8 +10432,9 @@ Body:
       bonus bDex,1;
       bonus bAtkEle,Ele_Undead;
       bonus bMatkRate,20;
-      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine();
-      if (getrefine()>=9) {
+      .@r = getrefine();
+      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+.@r;
+      if (.@r>=9) {
          bonus bMatkRate,3;
          bonus bMaxSP,300;
       }
@@ -10485,8 +10486,9 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,10+getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,10+getrefine();
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r;
   - Id: 1627
     AegisName: Staffy
     Name: Staffy
@@ -10781,9 +10783,10 @@ Body:
       bonus bInt,3;
       bonus bDex,3;
       bonus bMatkRate,20;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,getrefine();
-      bonus bDelayRate,-(getrefine()*3/2);
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,.@r;
+      bonus bDelayRate,-(.@r*3/2);
   - Id: 1637
     AegisName: Eraser
     Name: Eraser
@@ -10908,12 +10911,14 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
+      bonus bMatkRate,15;
       bonus2 bMagicAddRace,RC_DemiHuman,15;
       bonus2 bMagicAddRace,RC_Player_Human,15;
-      bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25 + ((getrefine()>5) ? 5 : 0);
-      bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25 + ((getrefine()>5) ? 5 : 0);
+      .@r = getrefine();
+      bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25 + ((.@r>5) ? 5 : 0);
+      bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25 + ((.@r>5) ? 5 : 0);
       bonus bUnbreakableWeapon;
-      if (getrefine()>8) {
+      if (.@r>8) {
          bonus bCastrate,-5;
          bonus bDelayRate,-5;
          bonus bMatkRate,5;
@@ -10948,17 +10953,19 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
+      bonus bMatkRate,15;
       bonus bHealPower,14;
       bonus bDelayRate,-10;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5) {
+      .@r = getrefine();
+      if (.@r>5) {
          bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5;
          bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5;
-         bonus bHealPower,5+(getrefine()-5)*2;
+         bonus bHealPower,5+(.@r-5)*2;
       }
-      if (getrefine()>8)
+      if (.@r>8)
          bonus5 bAutoSpellOnSkill,"AL_HEAL","AL_HEAL",10,100,1;
-      if (getrefine()>9) {
+      if (.@r>9) {
          bonus bHealPower,10;
       }
   - Id: 1642
@@ -11016,10 +11023,11 @@ Body:
     EquipLevelMin: 70
     Refineable: true
     Script: |
-      bonus bMatk,15;
+      bonus bMatkRate,15;
       bonus bInt,4;
-      if (getrefine()>5) {
-         bonus bInt,getrefine()-5;
+      .@r = getrefine();
+      if (.@r>5) {
+         bonus bInt,.@r-5;
          bonus bMaxHP,-200;
          bonus bMaxSP,-100;
       }
@@ -11057,8 +11065,9 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,10+getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,10+getrefine();
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r;
   - Id: 1645
     AegisName: Lich_Bone_Wand_M
     Name: Lich's Bone Wand
@@ -11096,8 +11105,9 @@ Body:
       bonus bDex,1;
       bonus bAtkEle,Ele_Undead;
       bonus bMatkRate,20;
-      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine();
-      if (getrefine()>=9) {
+      .@r = getrefine();
+      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+.@r;
+      if (.@r>=9) {
          bonus bMatkRate,3;
          bonus bMaxSP,300;
       }
@@ -11125,9 +11135,10 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus bMdef,getrefine();
-      bonus2 bSkillAtk,"WZ_STORMGUST",getrefine();
-      if (getrefine()>9)
+      .@r = getrefine();
+      bonus bMdef,.@r;
+      bonus2 bSkillAtk,"WZ_STORMGUST",.@r;
+      if (.@r>9)
          bonus2 bCastrate,"WZ_STORMGUST",-8;
   - Id: 1647
     AegisName: Croce_Staff
@@ -14223,11 +14234,12 @@ Body:
     EquipLevelMin: 80
     Refineable: true
     Script: |
-      bonus bMatkRate,25+getrefine()/2;
+      .@r = getrefine();
+      bonus bMatkRate,25+(.@r/2);
       bonus bInt,3;
       bonus bAgi,10;
-      bonus bUseSPrate,(getrefine()*2);
-      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(getrefine()*20);
+      bonus bUseSPrate,(.@r*2);
+      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(.@r*20);
       bonus2 bCastrate,"HW_MAGICPOWER",-50;
   - Id: 2001
     AegisName: Divine_Cross
@@ -14281,19 +14293,20 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bMatkRate,getrefine();
+      .@r = getrefine();
+      bonus bMatkRate,15 + .@r;
       bonus2 bMagicAddRace,RC_DemiHuman,15;
       bonus2 bMagicAddRace,RC_Player_Human,15;
       bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25;
       bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5) {
-         bonus2 bMagicAddRace,RC_DemiHuman,(getrefine()-5)*2;
-         bonus2 bMagicAddRace,RC_Player_Human,(getrefine()-5)*2;
-         bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(getrefine()-5)*2;
-         bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5+(getrefine()-5)*2;
+      if (.@r>5) {
+         bonus2 bMagicAddRace,RC_DemiHuman,(.@r-5)*2;
+         bonus2 bMagicAddRace,RC_Player_Human,(.@r-5)*2;
+         bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(.@r-5)*2;
+         bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5+(.@r-5)*2;
       }
-      if (getrefine()>8) {
+      if (.@r>8) {
          bonus5 bAutoSpellOnSkill,"WZ_STORMGUST","MG_SAFETYWALL",10,200,1;
          bonus5 bAutoSpellOnSkill,"WZ_METEOR","MG_SAFETYWALL",10,200,1;
          bonus5 bAutoSpellOnSkill,"WZ_VERMILION","MG_SAFETYWALL",10,200,1;
@@ -14326,11 +14339,12 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bMatkRate,25+getrefine()/2;
+      .@r = getrefine();
+      bonus bMatkRate,25+(.@r/2);
       bonus bInt,3;
       bonus bAgi,10;
-      bonus bUseSPrate,(getrefine()*2);
-      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(getrefine()*20);
+      bonus bUseSPrate,(.@r*2);
+      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(.@r*20);
       bonus2 bCastrate,"HW_MAGICPOWER",-50;
   - Id: 2004
     AegisName: Kronos
@@ -14353,9 +14367,10 @@ Body:
     EquipLevelMin: 50
     Refineable: true
     Script: |
+      .@r = getrefine();
       bonus bMatkRate,20;
-      bonus bInt,3+(getrefine()/2);
-      bonus bMaxHP,300+(50*getrefine()/2);
+      bonus bInt,3+(.@r/2);
+      bonus bMaxHP,300+(50*.@r/2);
       autobonus "{ bonus bMatkRate,12; bonus buseSPRate,20; }",1,5000,BF_MAGIC,"{ specialeffect2 EF_ENHANCE; }";
   - Id: 2005
     AegisName: Dea_Staff
@@ -14384,29 +14399,6 @@ Body:
       bonus bInt,6;
       bonus bVit,2;
       autobonus3 "{ }",20,1000,"AL_HEAL","{ specialeffect2 EF_MAGICALATTHIT; heal 0,200; }";
-  - Id: 2006
-    AegisName: G_Staff_Of_Light
-    Name: Staff Of Light
-    Type: Weapon
-    SubType: 2hStaff
-    Buy: 20
-    Weight: 1900
-    Attack: 80
-    Range: 1
-    Jobs:
-      Mage: true
-      Sage: true
-      SoulLinker: true
-      Wizard: true
-    Locations:
-      Both_Hand: true
-    WeaponLevel: 4
-    EquipLevelMin: 60
-    Refineable: true
-    Script: |
-      /* bonus bMatk,150;
-      */ bonus bAtkEle,Ele_Holy;
-      bonus bInt,6;
   - Id: 2101
     AegisName: Guard
     Name: Guard
@@ -24702,7 +24694,6 @@ Body:
     Script: |
       bonus bMaxSP,100;
       skill "TF_DOUBLE",3;
-      bonus bDoubleRate,15;
       skill "TF_STEAL",1;
       skill "TF_HIDING",1;
       skill "TF_POISON",1;
@@ -28300,8 +28291,6 @@ Body:
       bonus bMaxHP,50;
       bonus bMaxSP,10;
       skill "AL_RUWACH",1;
-    UnEquipScript: |
-      sc_end SC_RUWACH;
   - Id: 5213
     AegisName: Black_Bunny_Band
     Name: Sheila Hairnet
@@ -29769,7 +29758,6 @@ Body:
       bonus bMaxHP,50;
       bonus bMaxSP,50;
       skill "TF_DOUBLE",2;
-      bonus bDoubleRate,10;
       bonus2 bSubRace,RC_DemiHuman,3;
       bonus2 bSubRace,RC_Player_Human,3;
   - Id: 5284
@@ -31603,8 +31591,6 @@ Body:
     Script: |
       bonus bVit,1;
       skill "AL_ANGELUS",1;
-    UnEquipScript: |
-      sc_end SC_ANGELUS;
   - Id: 5383
     AegisName: Hunting_Cap
     Name: Hunter's Cap
@@ -31732,7 +31718,6 @@ Body:
       NoGuildStorage: true
     Script: |
       skill "TF_DOUBLE",5;
-      bonus bDoubleRate,25;
   - Id: 5389
     AegisName: Angel_Spirit
     Name: Angel Spirit
@@ -34175,9 +34160,7 @@ Body:
     View: 525
     Script: |
       bonus bDex,2;
-      .@bonus = max(getskilllv("TF_DOUBLE"), 5);
-      skill "TF_DOUBLE",.@bonus;
-      bonus bDoubleRate,.@bonus * 5;
+      skill "TF_DOUBLE",5;
   - Id: 5532
     AegisName: Pirate_Dagger_J
     Name: Pirate Dagger
@@ -39967,7 +39950,6 @@ Body:
     WeaponLevel: 4
     Script: |
       skill "TF_DOUBLE",5;
-      bonus bDoubleRate,25;
       bonus2 bAddRace,RC_DemiHuman,40;
       bonus2 bAddRace,RC_Player_Human,40;
   - Id: 13408
@@ -40354,14 +40336,16 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bInt,getrefine()-5;
+      .@r = getrefine();
+      bonus bInt,6;
+      bonus bInt,.@r-5;
       bonus bMatkRate,10;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5)
+      if (.@r>5)
          bonus bUseSPrate,-10;
-      if (getrefine()>8)
+      if (.@r>8)
          bonus4 bAutoSpellOnSkill,"PA_PRESSURE","PR_LEXAETERNA",1,1000;
-      if (getrefine()>9)
+      if (.@r>9)
          bonus bInt,5;
   - Id: 13419
     AegisName: Holy_Saber

db/pre-re/item_db_etc.yml

@@ -44,6 +44,7 @@
 #   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)
@@ -85,7 +86,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 2
+  Version: 3
 
 Body:
   - Id: 670
@@ -4026,7 +4027,6 @@ Body:
       BuyingStore: true
     Script: |
       skill "TF_DOUBLE",1;
-      bonus bDoubleRate,5;
   - Id: 4118
     AegisName: Petit_Card
     Name: Earth Petite Card
@@ -6451,8 +6451,6 @@ Body:
       BuyingStore: true
     Script: |
       bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;
-    UnEquipScript: |
-      sc_end SC_AUTOGUARD;
   - Id: 4300
     AegisName: Chimera_Card
     Name: Chimera Card

db/pre-re/item_db_usable.yml

@@ -44,6 +44,7 @@
 #   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)
@@ -85,7 +86,7 @@
 
 Header:
   Type: ITEM_DB
-  Version: 2
+  Version: 3
 
 Body:
   - Id: 501

db/pre-re/item_group_db.yml

@@ -7433,3 +7433,45 @@ Body:
             Rate: 1
           - Item: Gold_Tiara_
             Rate: 1
+  - Group: MF_NOTELEPORT
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Item: Wing_Of_Fly
+          - Item: Giant_Fly_Wing
+          - Item: N_Fly_Wing
+          - Item: E_Giant_Fly_Wing
+          - Item: F_Giant_Fly_Wing
+  - Group: MF_NORETURN
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Item: Wing_Of_Butterfly
+          - Item: N_Butterfly_Wing
+          - Item: Dun_Tele_Scroll1
+          - Item: Dun_Tele_Scroll2
+          - Item: Dun_Tele_Scroll3
+          - Item: E_Dun_Tele_Scroll1
+          - Item: F_Dun_Tele_Scroll1
+          - Item: WOB_Rune
+          - Item: E_WOB_Rune
+          - Item: F_WOB_Rune
+          - Item: WOB_Schwaltz
+          - Item: E_WOB_Schwaltz
+          - Item: F_WOB_Schwaltz
+          - Item: WOB_Rachel
+          - Item: E_WOB_Rachel
+          - Item: F_WOB_Rachel
+          - Item: WOB_Local
+          - Item: E_WOB_Local
+          - Item: F_WOB_Local
+          - Item: Siege_Teleport_Scroll
+          - Item: Siege_Teleport_Scroll2
+          - Item: E_Siege_Teleport_Scroll
+  - Group: GIANT_FLY_WING
+    SubGroups:
+      - SubGroup: 0
+        List:
+          - Item: Giant_Fly_Wing
+          - Item: E_Giant_Fly_Wing
+          - Item: F_Giant_Fly_Wing