Removed extra script_reportdata

Terminate the script when SCRIPT_CMD_FAILURE is returned

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,9 @@ body:
     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.
+      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

.github/workflows/analysis_codeql.yml

@@ -0,0 +1,92 @@
+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:
+  workflow_dispatch:
+  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,7 +1,12 @@
 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:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -22,9 +27,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # The ubuntu-latest label currently points to ubuntu-22.04.
           # Available: ubuntu-22.04, ubuntu-20.04
-          os: [ubuntu-latest]
+          os: [ubuntu-20.04]
           # Version list can be found on https://github.com/marketplace/actions/install-clang
           clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13']
 

.github/workflows/build_servers_cmake.yml

@@ -1,7 +1,12 @@
 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:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -22,7 +27,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-20.04.
+          # The ubuntu-latest label currently points to ubuntu-22.04.
           # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
 

.github/workflows/build_servers_gcc.yml

@@ -1,7 +1,12 @@
 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:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -22,11 +27,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-20.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,7 +1,12 @@
 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:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -22,11 +27,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-20.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,7 +1,12 @@
 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:
+  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/build_servers_packetversions.yml

@@ -1,7 +1,12 @@
 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:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -22,11 +27,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-20.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,7 +1,12 @@
 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:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -22,11 +27,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-20.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,7 +4,12 @@ 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:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -25,11 +30,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-20.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

@@ -39,6 +39,7 @@ Thumbs.db
 /Makefile
 /Makefile.cache
 /map-server
+/map-server-generator
 /mapcache
 /nbproject
 /web-server
@@ -136,6 +137,7 @@ Thumbs.db
 /webserv.bat
 /yaml2sql.bat
 /yamlupgrade.bat
+/navigenerator.bat
 
 # dlls
 /libmysql.dll

3rdparty/CMakeLists.txt

@@ -48,6 +48,7 @@ endmacro( CONFIGURE_WITH_LOCAL_OR_SYSTEM )
 
 
 add_subdirectory( httplib )
+add_subdirectory( json )
 add_subdirectory( libconfig )
 add_subdirectory( mysql )
 add_subdirectory( pcre )

3rdparty/README.txt

@@ -6,3 +6,4 @@ libconfig - library for processing structured configuration files (http://www.hy
 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/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

@@ -35,7 +35,7 @@ project( rAthena )
 if( CYGWIN )
 	unset( WIN32 )
 endif()
-set(CMAKE_CXX_STANDARD 11) # C++11...
+set(CMAKE_CXX_STANDARD 14) # C++14...
 set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
 #set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
 

README.md

@@ -1,7 +1,7 @@
 <img src="doc/logo.png" align="right" height="90" />
 
 # rAthena
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/alerts/) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/context:cpp) ![GitHub](https://img.shields.io/github/license/rathena/rathena.svg) ![GitHub repo size](https://img.shields.io/github/repo-size/rathena/rathena.svg)
+![clang](https://img.shields.io/github/actions/workflow/status/rathena/rathena/build_servers_clang.yml?label=clang%20build&logo=llvm) ![cmake](https://img.shields.io/github/actions/workflow/status/rathena/rathena/build_servers_cmake.yml?label=cmake%20build&logo=cmake) ![gcc](https://img.shields.io/github/actions/workflow/status/rathena/rathena/build_servers_gcc.yml?label=gcc%20build&logo=gnu) ![ms](https://img.shields.io/github/actions/workflow/status/rathena/rathena/build_servers_msbuild.yml?label=ms%20build&logo=visualstudio) ![GitHub](https://img.shields.io/github/license/rathena/rathena.svg) ![commit activity](https://img.shields.io/github/commit-activity/w/rathena/rathena) ![GitHub repo size](https://img.shields.io/github/repo-size/rathena/rathena.svg)
 > rAthena is a collaborative software development project revolving around the creation of a robust massively multiplayer online role playing game (MMORPG) server package. Written in C, the program is very versatile and provides NPCs, warps and modifications. The project is jointly managed by a group of volunteers located around the world as well as a tremendous community providing QA and support. rAthena is a continuation of the eAthena project.
 
 [Forum](https://rathena.org/board)|[Discord](https://rathena.org/discord)|[Wiki](https://github.com/rathena/rathena/wiki)|[FluxCP](https://github.com/rathena/FluxCP)|[Crowdfunding](https://rathena.org/board/crowdfunding/)|[Fork and Pull Request Q&A](https://rathena.org/board/topic/86913-pull-request-qa/)
@@ -30,7 +30,7 @@ Disk Space | 300 MB | 500 MB
 Operating System | Compiler
 ------|------
 Linux  | [gcc-5 or newer](https://www.gnu.org/software/gcc/gcc-5/) / [Make](https://www.gnu.org/software/make/)
-Windows | [MS Visual Studio 2013, 2015, 2017](https://www.visualstudio.com/downloads/)
+Windows | [MS Visual Studio 2017 or newer](https://www.visualstudio.com/downloads/)
 
 ### Required Applications
 Application | Name

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
@@ -66,20 +65,20 @@ watch_serv(){
 			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
@@ -101,11 +100,11 @@ restart(){
 			fi
 		done
 	done
-  $0 start
+	$0 start
 }
 
 case $1 in
-    'start')
+	'start')
 		print_start
 		check_files
 		echo "Check complete."
@@ -123,7 +122,7 @@ case $1 in
 		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
@@ -134,7 +133,7 @@ case $1 in
 		done
 		watch_serv $Restart_count $Restart_sleep
 		echo "Watching rAthena now."
-	;;	
+	;;
 	'stop')
 		for i in ${W_SRV} ${M_SRV} ${C_SRV} ${L_SRV}
 		do
@@ -155,7 +154,7 @@ case $1 in
 		done
 	;;
 	'restart')
-		 restart
+		 restart "$@"
 	;;
 	'status')
 		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
@@ -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

@@ -1016,6 +1016,9 @@ Body:
   - Command: enchantgradeui
     Help: |
       Opens the enchantgrade UI.
+  - Command: roulette
+    Help: |
+      Opens the roulette UI.
 
 Footer:
   Imports:

conf/battle/client.conf

@@ -148,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

@@ -33,6 +33,11 @@ feature.warp_suggestions: off
 // Requires: 2013-07-24aRagexe or later
 feature.banking: on
 
+// Should Banking strictly checks the UI state on zeny deposit and withdrawal? (Note 1)
+// Note: Disabled by default because existing official clients do not report the banking UI state to the server.
+// But this config could be useful in case of clients that actually report the UI state or custom clients.
+feature.banking_state_enforce: no
+
 // Autotrade persistency (Note 1)
 // Should vendors that used @autotrade be restored after a restart?
 feature.autotrade: on
@@ -56,7 +61,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 +72,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 +128,50 @@ 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 an itemlink 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: 2015-11-04Ragexe or later
+feature.itemlink: on
+
+// Itemlink System on NPC messages (Note 1)
+// Generates an itemlink string for an item and can be used for NPC's mes command.
+// Requires: 2010-01-01 or later
+feature.mesitemlink: on
+
+// Force all mesitemlinks to be wrapped in brackets (Note 1)
+// Default: no
+feature.mesitemlink_brackets: no
+
+// Force all mesitemlinks to use the database name (Note 1)
+// Default: no
+feature.mesitemlink_dbname: no
+
+// Stylist UI (Note 1)
+// Requires: 2015-11-04 or later
+feature.stylist: on
+
+// Are players allowed to reconnect into instances? (Note 1)
+// This is enabled by default in Renewal mode and
+// disabled by default in Pre-Renewal mode.
+// If this is allowed the "nosave" mapflag is still being respected
+// and may prevent players from warping back into the instance.
+//feature.instance_allow_reconnect: yes

conf/battle/homunc.conf

@@ -50,7 +50,7 @@ homunculus_auto_vapor: 80
 homunculus_max_level: 99
 
 // Max level for Homunculus S
-homunculus_S_max_level: 175
+homunculus_S_max_level: 250
 
 // Growth level for Homunculus S
 // This is the level at which homunculus S can use their growth tables

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

@@ -297,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/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.yml

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

conf/inter_athena.conf

@@ -147,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
@@ -158,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
@@ -166,7 +165,7 @@ roulette_table: db_roulette
 guild_storage_log: guild_storage_log
 
 // Web Database Tables
-// NOTE: The web server reads the login (login) and char (guild) tables, so it needs
+// 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

conf/maps_athena.conf

@@ -1517,6 +1517,9 @@ 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
@@ -1535,12 +1538,59 @@ 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
+
+// Episode 20
+map: 1@20cn1
+map: 1@20cn2
+map: 1@slug
+map: 1@twas
+map: 1@twbs
+map: 1@twig
+map: 1@twsd
+map: icas_in2
+map: jor_back4
+map: jor_back5
+map: jor_back6
+map: jor_maze
+map: jor_root1
+map: jor_root2
+map: jor_root3
+map: jor_safty1
+map: jor_safty2
+map: jor_sanct
+map: jor_twice
+map: jor_twig
 
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------

conf/msg_conf/map_msg.conf

@@ -927,7 +927,10 @@
 // Enchant UI
 829: Enchanting is not possible for your item's enchant grade.
 
-//830-899 free
+// @reloadbarterdb
+830: Barter database has been reloaded.
+
+//831-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1444,7 +1447,7 @@
 
 // @iteminfo
 1276: Please enter an item name/ID (usage: @ii/@iteminfo <item name/ID>).
-1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s' (%u) Type: %s | Extra Effect: %s
 1278: None
 1279: With script
 1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f
@@ -1454,7 +1457,7 @@
 
 // @whodrops
 1284: Please enter item name/ID (usage: @whodrops <item name/ID>).
-1285: Item: '%s'[%d] (ID: %u)
+1285: Item: '%s' (ID: %u)
 1286:  - Item is not dropped by mobs.
 1287:  - Common mobs with highest drop chance (only max %d are listed):
 

conf/msg_conf/map_msg_chn.conf

@@ -1192,7 +1192,7 @@
 
 // @iteminfo
 1276: 請輸入 物品名稱/ID (用法: @ii/@iteminfo <物品名稱/ID>).
-1277: 物品: '%s'/'%s'[%d] (%u) 類型: %s | 額外效果: %s
+1277: 物品: '%s'/'%s' (%u) 類型: %s | 額外效果: %s
 1278: None
 1279: With script
 1280: NPC 買價:%dz, 賣價:%dz | 重量: %.1f 
@@ -1202,7 +1202,7 @@
 
 // @whodrops
 1284: Please enter 物品名稱/ID (用法: @whodrops <物品名稱/ID>).
-1285: Item: '%s'[%d] (ID:%d)
+1285: Item: '%s' (ID:%d)
 1286:  - Item is not dropped by mobs.
 1287:  - Common mobs with highest drop chance (only max %d are listed):
 

conf/msg_conf/map_msg_frn.conf

@@ -1205,7 +1205,7 @@
 
 // @iteminfo
 1276: Entrez un nom/ID d'objet (usage: @ii/@iteminfo <nom/ID>).
-1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s' (%u) Type: %s | Extra Effect: %s
 1278: Aucun
 1279: Avec script
 1280: NPC Acheté:%dz, Vendu:%dz | Poids: %.1f 
@@ -1215,7 +1215,7 @@
 
 // @whodrops
 1284: Entrez un nom/ID d'Objet (usage: @whodrops <nom/ID_objet>).
-1285: Objet: '%s'[%d] (ID:%d)
+1285: Objet: '%s' (ID:%d)
 1286:  - Cet Objet n'est lâché par aucun monstre.
 1287:  - Monstres communs avec la plus grande chance de drop (seuls %d max sont listés):
 

conf/msg_conf/map_msg_idn.conf

@@ -1293,7 +1293,7 @@
 
 // @iteminfo
 1276: Harap masukkan nama/ID item. (Penggunaan: @ii/@iteminfo <nama/ID item>).
-1277: Item: '%s'/'%s'[%d] (%u) Jenis: %s | Efek tambahan: %s
+1277: Item: '%s'/'%s' (%u) Jenis: %s | Efek tambahan: %s
 1278: Tidak ada
 1279: Dengan script.
 1280: NPC Harga Beli:%dz, Harga jual:%dz | Berat: %.1f 
@@ -1303,7 +1303,7 @@
 
 // @whodrops
 1284: Harap masukkan nama/ID item. (Penggunaan: @whodrops <nama/ID item>).
-1285: Item: '%s'[%d] (ID:%d)
+1285: Item: '%s' (ID:%d)
 1286:  - Item ini tidak dijatuhkan dari monster.
 1287:  - Monster biasa dengan kemungkinan menjatuhkan barang tertinggi. (Maks. hanya %d yang ditampilkan):
 

conf/msg_conf/map_msg_por.conf

@@ -1375,7 +1375,7 @@
 
 // @iteminfo
 1276: Digite o nome/ID de um item (uso: @ii/@iteminfo <nome do item/ID>).
-1277: Item: '%s'/'%s'[%d] (%u) Tipo: %s | Efeito Extra: %s
+1277: Item: '%s'/'%s' (%u) Tipo: %s | Efeito Extra: %s
 1278: Nenhum
 1279: Com script
 1280: NPC Compra:%dz, Venda:%dz | Peso: %.1f 
@@ -1385,7 +1385,7 @@
 
 // @whodrops
 1284: Digite o nome/ID de um item (uso: @whodrops <nome do item/ID>).
-1285: Item: '%s'[%d] (ID:%d)
+1285: Item: '%s' (ID:%d)
 1286:  - Item não derrubado por monstros.
 1287:  - Monstros comuns com maiores chances de drop (somente máx %d são listados):
 

conf/msg_conf/map_msg_rus.conf

@@ -1205,7 +1205,7 @@
 
 // @iteminfo
 1276: Введите ID/название предмета (Использование: @ii/@iteminfo <ID/название предмета>).
-1277: Предмет: '%s'/'%s'[%d] (%u) Тип: %s | Доп. эффект: %s
+1277: Предмет: '%s'/'%s' (%u) Тип: %s | Доп. эффект: %s
 1278: Пусто
 1279: Скрипт
 1280: НИП покупка:%d зени, продажа:%d зени | Вес: %.1f 
@@ -1215,7 +1215,7 @@
 
 // @whodrops
 1284: Введите ID/название предмета (Использование: @whodrops <ID/название предмета>).
-1285: Предмет: '%s'[%d] (ID:%d)
+1285: Предмет: '%s' (ID:%d)
 1286:  - Предмет не падает с монстров.
 1287:  - Обычные монстры с высоким шансом выпадения (перечислено только %d):
 

conf/msg_conf/map_msg_spn.conf

@@ -1344,7 +1344,7 @@
 
 // @iteminfo
 1276: Introduce el nombre/ID de un objeto (instrucciones: @ii/@iteminfo <nombre/ID del objeto>).
-1277: Objeto: '%s'/'%s'[%d] (%u) Tipo: %s | Efecto: %s
+1277: Objeto: '%s'/'%s' (%u) Tipo: %s | Efecto: %s
 1278: Ninguno
 1279: Contiene código
 1280: Compra en NPC:%dz, Venta:%dz | Peso: %.1f
@@ -1354,7 +1354,7 @@
 
 // @whodrops
 1284: Introduce el nombre/ID de un objeto (instrucciones: @whodrops <nombre/ID del objeto>). 
-1285: Objeto: '%s'[%d] (ID:%d)
+1285: Objeto: '%s' (ID:%d)
 1286: - Ningún monstruo tiene ese objeto.
 1287: - Estos monstruos tienen ese objeto (sólo se muestran un máximo de %d):
 

conf/msg_conf/map_msg_tha.conf

@@ -1198,7 +1198,7 @@
 
 // @iteminfo
 1276: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID item (<28><>¸<EFBFBD>ד×י: @ii/@iteminfo <×<>ט<EFBFBD>/ID item>).
-1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s' (%u) Type: %s | Extra Effect: %s
 1278: None
 1279: With script
 1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f
@@ -1208,7 +1208,7 @@
 
 // @whodrops
 1284: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID item (<28><>¸<EFBFBD>ד×י: @whodrops <×<>ט<EFBFBD>/ID item>).
-1285: Item: '%s'[%d] (ID:%d)
+1285: Item: '%s' (ID:%d)
 1286:  - Item ¹<>יה<D799>ט<EFBFBD><D798>µ<EFBFBD>¨<EFBFBD><C2A8> monster.
 1287:  - Monster ·<>ט<EFBFBD>ה»·<C2BB>ט<EFBFBD><D798>ג<EFBFBD><D792><EFBFBD><EFBFBD>µ<EFBFBD><C2B5><EFBFBD>§<EFBFBD><C2A7>´ (ב<>´§א¾<D790><C2BE>§ %d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>):
 

configure

@@ -4538,9 +4538,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 CFLAGS="$CFLAGS -pipe -ffast-math -Wall"
 CPPFLAGS="$CPPFLAGS -I../common"
-CXXFLAGS="$CXXFLAGS -std=c++11"
-#CXXFLAGS="$CXXFLAGS -std=gnu++11"
-CXXFLAG_CLEARS="-std=c++11"
+CXXFLAGS="$CXXFLAGS -std=c++14"
+#CXXFLAGS="$CXXFLAGS -std=gnu++14"
+CXXFLAG_CLEARS="-std=c++14"
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -7109,7 +7109,7 @@ else
 $as_echo "no" >&6; }
 fi
 
-CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS"
+CXXFLAG_CLEARS="-std=c++14 $CPPFLAGS"
 CFLAGS="$OPT_LTO $CFLAGS"
 CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 

configure.ac

@@ -483,9 +483,9 @@ AC_LANG([C++])
 
 CFLAGS="$CFLAGS -pipe -ffast-math -Wall"
 CPPFLAGS="$CPPFLAGS -I../common"
-CXXFLAGS="$CXXFLAGS -std=c++11"
-#CXXFLAGS="$CXXFLAGS -std=gnu++11"
-CXXFLAG_CLEARS="-std=c++11"
+CXXFLAGS="$CXXFLAGS -std=c++14"
+#CXXFLAGS="$CXXFLAGS -std=gnu++14"
+CXXFLAG_CLEARS="-std=c++14"
 
 AC_C_BIGENDIAN(
 	[AC_MSG_ERROR([[bigendian is not supported... stopping]])],
@@ -620,7 +620,7 @@ if test "$enable_lto" != "no" ; then
 	)
 	CFLAGS="$OLD_CFLAGS"
 	LDFLAGS="$OLD_LDFLAGS"
-	
+
 	CFLAGS="$CFLAGS -flto -fuse-linker-plugin"
 	LDFLAGS="$LDFLAGS -flto -fuse-linker-plugin"
 	
@@ -1355,7 +1355,7 @@ else
 	AC_MSG_RESULT([no])
 fi
 
-CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS"
+CXXFLAG_CLEARS="-std=c++14 $CPPFLAGS"
 CFLAGS="$OPT_LTO $CFLAGS" 
 CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 AC_SUBST([CFLAGS_AR])

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,174 +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
-
-Body:
-# WOE FE castle
-  - Id: 0
-    Map: aldeg_cas01
-    Name: Neuschwanstein
-    #Name: Noisyubantian
-    Npc: Agit#aldeg_cas01
-  - Id: 1
-    Map: aldeg_cas02
-    Name: Hohenschwangau
-    #Name: Hohensyubangawoo
-    Npc: Agit#aldeg_cas02
-  - Id: 2
-    Map: aldeg_cas03
-    Name: Nuernberg
-    #Name: Nyirenverk
-    Npc: Agit#aldeg_cas03
-  - Id: 3
-    Map: aldeg_cas04
-    Name: Wuerzburg
-    #Name: Byirtsburi
-    Npc: Agit#aldeg_cas04
-  - Id: 4
-    Map: aldeg_cas05
-    Name: Rothenburg
-    #Name: Rotenburk
-    Npc: Agit#aldeg_cas05
-  - Id: 5
-    Map: gefg_cas01
-    Name: Repherion
-    #Name: Reprion
-    Npc: Agit#gefg_cas01
-  - Id: 6
-    Map: gefg_cas02
-    Name: Eeyolbriggar
-    #Name: Yolbriger
-    Npc: Agit#gefg_cas02
-  - Id: 7
-    Map: gefg_cas03
-    Name: Yesnelph
-    #Name: Isinlife
-    Npc: Agit#gefg_cas03
-  - Id: 8
-    Map: gefg_cas04
-    Name: Bergel
-    #Name: Berigel
-    Npc: Agit#gefg_cas04
-  - Id: 9
-    Map: gefg_cas05
-    Name: Mersetzdeitz
-    #Name: Melsedetsu
-    Npc: Agit#gefg_cas05
-  - Id: 10
-    Map: payg_cas01
-    Name: Bright Arbor
-    #Name: Mingting
-    Npc: Agit#payg_cas01
-  - Id: 11
-    Map: payg_cas02
-    Name: Scarlet Palace
-    #Name: Tiantan
-    Npc: Agit#payg_cas02
-  - Id: 12
-    Map: payg_cas03
-    Name: Holy Shadow
-    #Name: Fuying
-    Npc: Agit#payg_cas03
-  - Id: 13
-    Map: payg_cas04
-    Name: Sacred Altar
-    #Name: Honglou
-    Npc: Agit#payg_cas04
-  - Id: 14
-    Map: payg_cas05
-    Name: Bamboo Grove Hill
-    #Name: Zhulinxian
-    Npc: Agit#payg_cas05
-  - Id: 15
-    Map: prtg_cas01
-    Name: Kriemhild
-    #Name: Creamhilt
-    Npc: Agit#prtg_cas01
-  - Id: 16
-    Map: prtg_cas02
-    Name: Swanhild
-    #Name: Sbanhealt
-    Npc: Agit#prtg_cas02
-  - Id: 17
-    Map: prtg_cas03
-    Name: Fadhgridh
-    #Name: Lazrigees
-    Npc: Agit#prtg_cas03
-  - Id: 18
-    Map: prtg_cas04
-    Name: Skoegul
-    #Name: Squagul
-    Npc: Agit#prtg_cas04
-  - Id: 19
-    Map: prtg_cas05
-    Name: Gondul
-    #Name: Guindull
-    Npc: Agit#prtg_cas05
-
-# WOE NGuild castle
-  - Id: 20
-    Map: nguild_alde
-    Name: Earth
-    Npc: Agit_N01
-  - Id: 21
-    Map: nguild_gef
-    Name: Air
-    Npc: Agit_N02
-  - Id: 22
-    Map: nguild_pay
-    Name: Water
-    Npc: Agit_N03
-  - Id: 23
-    Map: nguild_prt
-    Name: Fire
-    Npc: Agit_N04
-
-# WOE SE castle
-  - Id: 24
-    Map: schg_cas01
-    Name: Himinn
-    Npc: Manager#schg_cas01
-  - Id: 25
-    Map: schg_cas02
-    Name: Andlangr
-    Npc: Manager#schg_cas02
-  - Id: 26
-    Map: schg_cas03
-    Name: Viblainn
-    Npc: Manager#schg_cas03
-  - Id: 27
-    Map: schg_cas04
-    Name: Hljod
-    Npc: Manager#schg_cas04
-  - Id: 28
-    Map: schg_cas05
-    Name: Skidbladnir
-    Npc: Manager#schg_cas05
-  - Id: 29
-    Map: arug_cas01
-    Name: Mardol
-    Npc: Manager#arug_cas01
-  - Id: 30
-    Map: arug_cas02
-    Name: Cyr
-    Npc: Manager#arug_cas02
-  - Id: 31
-    Map: arug_cas03
-    Name: Horn
-    Npc: Manager#arug_cas03
-  - Id: 32
-    Map: arug_cas04
-    Name: Gefn
-    Npc: Manager#arug_cas04
-  - Id: 33
-    Map: arug_cas05
-    Name: Bandis
-    Npc: Manager#arug_cas05
+  Version: 2
 
 Footer:
   Imports:

db/enchantgrade.yml

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
+#   Copyright(C) 2023 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27,10 +27,13 @@
 #     - 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.
+#           Chances:                    Chance settings per refine level.
+#             - Refine                  Refine level.
+#               Chance                  Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
-#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
+#           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.
@@ -49,7 +52,7 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 1
+  Version: 3
 
 Footer:
   Imports:

db/homun_skill_tree.txt

@@ -1,119 +0,0 @@
-// Homunculus Skill Tree Database
-//
-// Structure of Database:
-// Class,SkillID,MaxLv,NeedLevel,Prerequisite SkillID1,Prerequisite SkillLv1,PrereqSkillID2,PrereqSkillLv2,PrereqSkillID3,PrereqSkillLv3,PrereqSkillID4,PrereqSkillLv4,PrereqSkillID5,PrereqSkillLv5,IntimacyLvReq //SKILLNAME#Skill Name#
-//
-// 01. Class                    Homunculus ID.
-// 02. SkillID                  Skill ID of the homunuculus skill.
-// 03. MaxLv                    Maximum level of the homunuculus skill.
-// 04. NeedLevel                Homunculus level required for the skill to become available
-// 05. Prerequisite SkillID     Homunculus skill required for the skill to become available.
-// 06. Prerequisite SkillLv     Level of the required homunculus skill.
-// ...
-// 15. IntimacyLvReq			Minimum level of intimacy to unlock skill.
-//
-// NOTE: MAX_PC_SKILL_REQUIRE (typically 5) ID/Lv pairs must be specified.
-
-//Lif
-6001,8001,5,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
-6001,8002,5,0,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID
-6001,8003,5,0,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN
-//Amistr
-6002,8005,5,0,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE
-6002,8006,5,0,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE
-6002,8007,5,0,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN
-//Filir
-6003,8009,5,0,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON
-6003,8010,5,0,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET
-6003,8011,5,0,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED
-//Vanilmirth
-6004,8013,5,0,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE
-6004,8014,5,0,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC
-6004,8015,5,0,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT
-//Lif2
-6005,8001,5,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
-6005,8002,5,0,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID
-6005,8003,5,0,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN
-//Amistr2
-6006,8005,5,0,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE
-6006,8006,5,0,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE
-6006,8007,5,0,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN
-//Filir2
-6007,8009,5,0,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON
-6007,8010,5,0,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET
-6007,8011,5,0,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED
-//Vanilmirth2
-6008,8013,5,0,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE
-6008,8014,5,0,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC
-6008,8015,5,0,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT
-//Lif_H
-6009,8001,5,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
-6009,8002,5,0,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID
-6009,8003,5,0,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN
-6009,8004,3,0,0,0,0,0,0,0,0,0,0,0,910 //HLIF_CHANGE
-//Amistr_H
-6010,8005,5,0,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE
-6010,8006,5,0,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE
-6010,8007,5,0,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN
-6010,8008,3,0,0,0,0,0,0,0,0,0,0,0,910 //HAMI_BLOODLUST
-//Filir_H
-6011,8009,5,0,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON
-6011,8010,5,0,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET
-6011,8011,5,0,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED
-6011,8012,3,0,0,0,0,0,0,0,0,0,0,0,910 //HFLI_SBR44
-//Vanilmirth_H
-6012,8013,5,0,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE
-6012,8014,5,0,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC
-6012,8015,5,0,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT
-6012,8016,3,0,0,0,0,0,0,0,0,0,0,0,910 //HVAN_EXPLOSION
-//Lif2_H
-6013,8001,5,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
-6013,8002,5,0,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID
-6013,8003,5,0,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN
-6013,8004,3,0,0,0,0,0,0,0,0,0,0,0,910 //HLIF_CHANGE
-//Amistr2_H
-6014,8005,5,0,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE
-6014,8006,5,0,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE
-6014,8007,5,0,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN
-6014,8008,3,0,0,0,0,0,0,0,0,0,0,0,910 //HAMI_BLOODLUST
-//Filir2_H
-6015,8009,5,0,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON
-6015,8010,5,0,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET
-6015,8011,5,0,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED
-6015,8012,3,0,0,0,0,0,0,0,0,0,0,0,910 //HFLI_SBR44
-//Vanilmirth2_H
-6016,8013,5,0,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE
-6016,8014,5,0,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC
-6016,8015,5,0,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT
-6016,8016,3,0,0,0,0,0,0,0,0,0,0,0,910 //HVAN_EXPLOSION
-//Eira
-6048,8022,5,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_LIGHT_OF_REGENE
-6048,8023,5,114,0,0,0,0,0,0,0,0,0,0,0	//MH_OVERED_BOOST
-6048,8024,10,106,0,0,0,0,0,0,0,0,0,0,0	//MH_ERASER_CUTTER
-6048,8025,10,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_XENO_SLASHER
-6048,8026,5,137,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILENT_BREEZE
-//Bayeri
-6049,8031,10,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_STAHL_HORN
-6049,8032,5,112,0,0,0,0,0,0,0,0,0,0,0 	//MH_GOLDENE_FERSE
-6049,8033,5,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_STEINWAND
-6049,8034,10,138,0,0,0,0,0,0,0,0,0,0,0	//MH_HEILIGE_STANGE
-6049,8035,5,130,0,0,0,0,0,0,0,0,0,0,0	//MH_ANGRIFFS_MODUS
-//Sera
-6050,8018,5,132,0,0,0,0,0,0,0,0,0,0,0 	//MH_SUMMON_LEGION
-6050,8019,10,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_NEEDLE_OF_PARALYZE
-6050,8020,5,116,0,0,0,0,0,0,0,0,0,0,0 	//MH_POISON_MIST
-6050,8021,10,123,0,0,0,0,0,0,0,0,0,0,0 	//MH_PAIN_KILLER
-//Dieter
-6051,8039,5,122,0,0,0,0,0,0,0,0,0,0,0 	//MH_MAGMA_FLOW
-6051,8040,5,116,0,0,0,0,0,0,0,0,0,0,0 	//MH_GRANITIC_ARMOR
-6051,8041,10,109,0,0,0,0,0,0,0,0,0,0,0 	//MH_LAVA_SLIDE
-6051,8042,10,131,0,0,0,0,0,0,0,0,0,0,0 	//MH_PYROCLASTIC
-6051,8043,5,102,0,0,0,0,0,0,0,0,0,0,0 	//MH_VOLCANIC_ASH
-//Elanor
-6052,8027,1,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_STYLE_CHANGE
-6052,8028,5,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_SONIC_CRAW
-6052,8029,10,114,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILVERVEIN_RUSH
-6052,8030,10,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_MIDNIGHT_FRENZY
-6052,8036,5,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_TINDER_BREAKER
-6052,8037,5,112,0,0,0,0,0,0,0,0,0,0,0 	//MH_CBC
-6052,8038,5,133,0,0,0,0,0,0,0,0,0,0,0 	//MH_EQC

db/homunculus_db.yml

@@ -0,0 +1,65 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2023 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# 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/>.
+#
+###########################################################################
+# Homunculus Database
+###########################################################################
+#
+# Homunculus Settings
+#
+###########################################################################
+# - BaseClass               Base class.
+#   Name                    Name of homunculus.
+#   EvolutionClass          Evolution class.
+#   Food                    Homunculus food item. (Default: Pet_Food)
+#   HungryDelay             Time interval in milliseconds after which the hunger value is altered. (Default: 60000)
+#   Race                    Race. (Default: Demihuman)
+#   Element                 Element. (Default: Neutral)
+#   Size                    Size. (Default: Small)
+#   EvolutionSize           Evolution size. (Default: Medium)
+#   AttackDelay             Base ASPD. (Default: 700)
+#   Status:                 Homunculus stats.
+#     - Type                Type of status.
+#       Base                Base value of this status. (Default: 1)
+#       GrowthMinimum       Minimum growth of this status. (Default: 0)
+#       GrowthMaximum       Maximum growth of this status. (Default: 0)
+#       EvolutionMinimum    Minimum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#       EvolutionMaximum    Maximum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#   SkillTree:              Skill tree.
+#     - Skill               Skill name.
+#       Clear               True to remove the given skill name. (Optional)
+#       MaxLevel            Maximum level of skill.
+#       RequiredLevel       Required base level of homunculus to learn. (Default: 0)
+#       RequiredIntimacy    Required intimacy of homunculus to learn. (Default: 0)
+#       RequireEvolution    Require the homunculus to be evolved to be available. (Default: false)
+#       Required:           Prerequisite skills. (Default: null)
+#         - Skill           Prerequisite skill name.
+#           Level           Level of prerequisite skill.
+#           Clear           True to remove the given prerequisite skill name. (Optional)
+###########################################################################
+
+Header:
+  Type: HOMUNCULUS_DB
+  Version: 1
+
+Footer:
+  Imports:
+  - Path: db/pre-re/homunculus_db.yml
+    Mode: Prerenewal
+  - Path: db/re/homunculus_db.yml
+    Mode: Renewal
+  - Path: db/import/homunculus_db.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

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
+#   Copyright(C) 2023 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27,10 +27,13 @@
 #     - 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.
+#           Chances:                    Chance settings per refine level.
+#             - Refine                  Refine level.
+#               Chance                  Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
-#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
+#           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.
@@ -49,4 +52,4 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 1
+  Version: 3

db/import-tmpl/homun_skill_tree.txt

@@ -1,15 +0,0 @@
-// Homunculus Skill Tree Database
-//
-// Structure of Database:
-// Class,SkillID,MaxLv,NeedLevel,Prerequisite SkillID1,Prerequisite SkillLv1,PrereqSkillID2,PrereqSkillLv2,PrereqSkillID3,PrereqSkillLv3,PrereqSkillID4,PrereqSkillLv4,PrereqSkillID5,PrereqSkillLv5,IntimacyLvReq //SKILLNAME#Skill Name#
-//
-// 01. Class                    Homunculus ID.
-// 02. SkillID                  Skill ID of the homunuculus skill.
-// 03. MaxLv                    Maximum level of the homunuculus skill.
-// 04. NeedLevel                Homunculus level required for the skill to become available
-// 05. Prerequisite SkillID     Homunculus skill required for the skill to become available.
-// 06. Prerequisite SkillLv     Level of the required homunculus skill.
-// ...
-// 15. IntimacyLvReq			Minimum level of intimacy to unlock skill.
-//
-// NOTE: MAX_PC_SKILL_REQUIRE (typically 5) ID/Lv pairs must be specified.

db/import-tmpl/homunculus_db.txt

@@ -1,20 +0,0 @@
-// Homunculus Database
-//
-// Structure of Database:
-// Class,EvoClass,Name,FoodID,HungryDelay,BaseSize,EvoSize,Race,Element,bASPD,bHP,bSP,bSTR,bAGI,bVIT,bINT,bDEX,bLUK,gnHP,gxHP,gnSP,gxSP,gnSTR,gxSTR,gnAGI,gxAGI,gnVIT,gxVIT,gnINT,gxINT,gnDEX,gxDEX,gnLUK,gxLUK,enHP,exHP,enSP,exSP,enSTR,exSTR,enAGI,exAGI,enVIT,exVIT,enINT,exINT,enDEX,exDEX,enLUK,exLUK
-//
-// 01. Class        Homunculus ID.
-// 02. EvoClass     Homunculus ID of the evolved version.
-// 03. Name         Name of the homunculus.
-// 04. FoodID       Item ID of the homunuclus food.
-// 05. HungryDelay  Time interval in milliseconds after which the homunculus' hunger value is altered.
-// 06. BaseSize     Size of the base homunculus class (0 = small, 1 = normal, 2 = large).
-// 07. EvoSize      Size of the evolved homunculus class (0 = small, 1 = normal, 2 = large).
-// 08. Race         Race of the homunculus (0 = formless, 1 = undead, 2 = brute, 3 = plant, 4 = insect, 5 = fish, 6 = demon, 7 = demi-human, 8 = angel, 9 = dragon).
-// 09. Element      Element of the homunculus (0 = neutral, 1 = water, 2 = earth, 3 = fire, 4 = wind, 5 = poison, 6 = holy, 7 = dark, 8 = ghost, 9 = undead).
-//                  The element level is always 1.
-// ...
-//
-// Legend: b: base, gn: growth min, gx: growth max, en: evolution min, ex: evolution max
-// NOTE: Only the growth values are in a 1/10 scale, the other stats are 1/1 (eg: 5 gmAGI means 0.5 agi)
-

db/import-tmpl/homunculus_db.yml

@@ -0,0 +1,57 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2023 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# 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/>.
+#
+###########################################################################
+# Homunculus Database
+###########################################################################
+#
+# Homunculus Settings
+#
+###########################################################################
+# - BaseClass               Base class.
+#   Name                    Name of homunculus.
+#   EvolutionClass          Evolution class.
+#   Food                    Homunculus food item. (Default: Pet_Food)
+#   HungryDelay             Time interval in milliseconds after which the hunger value is altered. (Default: 60000)
+#   Race                    Race. (Default: Demihuman)
+#   Element                 Element. (Default: Neutral)
+#   Size                    Size. (Default: Small)
+#   EvolutionSize           Evolution size. (Default: Medium)
+#   AttackDelay             Base ASPD. (Default: 700)
+#   Status:                 Homunculus stats.
+#     - Type                Type of status.
+#       Base                Base value of this status. (Default: 1)
+#       GrowthMinimum       Minimum growth of this status. (Default: 0)
+#       GrowthMaximum       Maximum growth of this status. (Default: 0)
+#       EvolutionMinimum    Minimum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#       EvolutionMaximum    Maximum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#   SkillTree:              Skill tree.
+#     - Skill               Skill name.
+#       Clear               True to remove the given skill name. (Optional)
+#       MaxLevel            Maximum level of skill.
+#       RequiredLevel       Required base level of homunculus to learn. (Default: 0)
+#       RequiredIntimacy    Required intimacy of homunculus to learn. (Default: 0)
+#       RequireEvolution    Require the homunculus to be evolved to be available. (Default: false)
+#       Required:           Prerequisite skills. (Default: null)
+#         - Skill           Prerequisite skill name.
+#           Level           Level of prerequisite skill.
+#           Clear           True to remove the given prerequisite skill name. (Optional)
+###########################################################################
+
+Header:
+  Type: HOMUNCULUS_DB
+  Version: 1

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/map_drops.yml

@@ -27,7 +27,7 @@
 #                                   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.
+#       Rate                        Drop rate of item, n/100000.
 #       RandomOptionGroup           Random Option Group applied to item on drop. (Default: None)
 #   SpecificDrops                   Drops for specific monsters on this map. (Default: empty)
 #     - Monster                     Monster name.
@@ -35,10 +35,10 @@
 #                                   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.
+#           Rate                    Drop rate of item, n/100000.
 #           RandomOptionGroup       Random Option Group applied to item on drop. (Default: None)
 ###########################################################################
 
 Header:
   Type: MAP_DROP_DB
-  Version: 1
+  Version: 2

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_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/map_drops.yml

@@ -27,7 +27,7 @@
 #                                   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.
+#       Rate                        Drop rate of item, n/100000.
 #       RandomOptionGroup           Random Option Group applied to item on drop. (Default: None)
 #   SpecificDrops                   Drops for specific monsters on this map. (Default: empty)
 #     - Monster                     Monster name.
@@ -35,13 +35,13 @@
 #                                   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.
+#           Rate                    Drop rate of item, n/100000.
 #           RandomOptionGroup       Random Option Group applied to item on drop. (Default: None)
 ###########################################################################
 
 Header:
   Type: MAP_DROP_DB
-  Version: 1
+  Version: 2
 
 Footer:
   Imports:

db/map_index.txt

@@ -1185,6 +1185,51 @@ prt_elib
 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
+1@20cn1
+1@20cn2
+1@slug
+1@twas
+1@twbs
+1@twig
+1@twsd
+icas_in2
+jor_back4
+jor_back5
+jor_back6
+jor_maze
+jor_root1
+jor_root2
+jor_root3
+jor_safty1
+jor_safty2
+jor_sanct
+jor_twice
+jor_twig
 
 //======================================================================================
 // - 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,8 +26,242 @@
 #   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
+  - Id: 0
+    Map: aldeg_cas01
+    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
+    Type: Second_Edition
+    ClientId: 25

db/pre-re/homunculus_db.txt

@@ -1,33 +0,0 @@
-// Homunculus Database
-//
-// Structure of Database:
-// Class,EvoClass,Name,FoodID,HungryDelay,BaseSize,EvoSize,Race,Element,bASPD,bHP,bSP,bSTR,bAGI,bVIT,bINT,bDEX,bLUK,gnHP,gxHP,gnSP,gxSP,gnSTR,gxSTR,gnAGI,gxAGI,gnVIT,gxVIT,gnINT,gxINT,gnDEX,gxDEX,gnLUK,gxLUK,enHP,exHP,enSP,exSP,enSTR,exSTR,enAGI,exAGI,enVIT,exVIT,enINT,exINT,enDEX,exDEX,enLUK,exLUK
-//
-// 01. Class        Homunculus ID.
-// 02. EvoClass     Homunculus ID of the evolved version.
-// 03. Name         Name of the homunculus.
-// 04. FoodID       Item ID of the homunuclus food.
-// 05. HungryDelay  Time interval in milliseconds after which the homunculus' hunger value is altered.
-// 06. BaseSize     Size of the base homunculus class (0 = small, 1 = normal, 2 = large).
-// 07. EvoSize      Size of the evolved homunculus class (0 = small, 1 = normal, 2 = large).
-// 08. Race         Race of the homunculus (0 = formless, 1 = undead, 2 = brute, 3 = plant, 4 = insect, 5 = fish, 6 = demon, 7 = demi-human, 8 = angel, 9 = dragon).
-// 09. Element      Element of the homunculus (0 = neutral, 1 = water, 2 = earth, 3 = fire, 4 = wind, 5 = poison, 6 = holy, 7 = dark, 8 = ghost, 9 = undead).
-//                  The element level is always 1.
-// ...
-//
-// Legend: b: base, gn: growth min, gx: growth max, en: evolution min, ex: evolution max
-// NOTE: Only the growth values are in a 1/10 scale, the other stats are 1/1 (eg: 5 gmAGI means 0.5 agi)
-
-6001,6009,Lif,537,60000,0,1,7,0,700,150,40,17,20,15,35,24,12,60,100,4,9,5,19,5,19,5,19,4,20,6,20,6,20,1,10,10,20,1,5,1,4,1,5,4,10,1,10,1,3
-6002,6010,Amistr,912,60000,0,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
-6003,6011,Filir,910,60000,0,1,2,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,5,15,5,15,4,10,1,10,1,3,1,4,1,5,1,5
-6004,6012,Vanilmirth,911,60000,0,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,10,1,10,1,10,1,10,1,10,1,10
-6005,6013,Lif,537,60000,0,1,7,0,700,150,40,17,20,15,35,24,12,60,100,4,9,5,19,5,19,5,19,4,20,6,20,6,20,1,10,10,20,1,5,1,4,1,5,4,10,1,10,1,3
-6006,6014,Amistr,912,60000,0,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
-6007,6015,Filir,910,60000,0,1,2,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,5,15,5,15,4,10,1,10,1,3,1,4,1,5,1,5
-6008,6016,Vanilmirth,911,60000,0,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,10,1,10,1,10,1,10,1,10,1,10
-6048,6048,Eira,6098,60000,1,1,7,0,700,150,40,17,20,15,35,24,12,60,100,4,9,5,19,5,19,5,19,4,20,6,20,6,20,1,10,10,20,1,5,1,4,1,5,4,10,1,10,1,3
-6049,6049,Bayeri,6112,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
-6050,6050,Sera,6108,60000,1,1,4,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,5,15,5,15,4,10,1,10,1,3,1,4,1,5,1,5
-6051,6051,Dieter,6104,60000,1,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,10,1,10,1,10,1,10,1,10,1,10
-6052,6052,Eleanor,6115,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5

db/pre-re/homunculus_db.yml

@@ -0,0 +1,623 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2023 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# 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/>.
+#
+###########################################################################
+# Homunculus Database
+###########################################################################
+#
+# Homunculus Settings
+#
+###########################################################################
+# - BaseClass               Base class.
+#   Name                    Name of homunculus.
+#   EvolutionClass          Evolution class.
+#   Food                    Homunculus food item. (Default: Pet_Food)
+#   HungryDelay             Time interval in milliseconds after which the hunger value is altered. (Default: 60000)
+#   Race                    Race. (Default: Demihuman)
+#   Element                 Element. (Default: Neutral)
+#   Size                    Size. (Default: Small)
+#   EvolutionSize           Evolution size. (Default: Medium)
+#   AttackDelay             Base ASPD. (Default: 700)
+#   Status:                 Homunculus stats.
+#     - Type                Type of status.
+#       Base                Base value of this status. (Default: 1)
+#       GrowthMinimum       Minimum growth of this status. (Default: 0)
+#       GrowthMaximum       Maximum growth of this status. (Default: 0)
+#       EvolutionMinimum    Minimum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#       EvolutionMaximum    Maximum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#   SkillTree:              Skill tree.
+#     - Skill               Skill name.
+#       Clear               True to remove the given skill name. (Optional)
+#       MaxLevel            Maximum level of skill.
+#       RequiredLevel       Required base level of homunculus to learn. (Default: 0)
+#       RequiredIntimacy    Required intimacy of homunculus to learn. (Default: 0)
+#       RequireEvolution    Require the homunculus to be evolved to be available. (Default: false)
+#       Required:           Prerequisite skills. (Default: null)
+#         - Skill           Prerequisite skill name.
+#           Level           Level of prerequisite skill.
+#           Clear           True to remove the given prerequisite skill name. (Optional)
+###########################################################################
+
+Header:
+  Type: HOMUNCULUS_DB
+  Version: 1
+
+Body:
+  - Class: Lif
+    Name: Lif
+    EvolutionClass: Lif_H
+    Status:
+      - Type: Hp
+        Base: 150
+        GrowthMinimum: 60
+        GrowthMaximum: 100
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Sp
+        Base: 40
+        GrowthMinimum: 4
+        GrowthMaximum: 9
+        EvolutionMinimum: 10
+        EvolutionMaximum: 20
+      - Type: Str
+        Base: 17
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Agi
+        Base: 20
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 4
+      - Type: Vit
+        Base: 15
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Int
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 4
+        EvolutionMaximum: 10
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 3
+    SkillTree:
+      - Skill: HLIF_HEAL
+        MaxLevel: 5
+      - Skill: HLIF_AVOID
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 3
+      - Skill: HLIF_BRAIN
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 5
+      - Skill: HLIF_CHANGE
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Amistr
+    Name: Amistr
+    EvolutionClass: Amistr_H
+    Food: Zargon
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 320
+        GrowthMinimum: 80
+        GrowthMaximum: 130
+        EvolutionMinimum: 10
+        EvolutionMaximum: 20
+      - Type: Sp
+        Base: 10
+        GrowthMinimum: 1
+        GrowthMaximum: 4
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Str
+        Base: 20
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Agi
+        Base: 17
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Vit
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 4
+        EvolutionMaximum: 10
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 1
+        EvolutionMaximum: 3
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 4
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+    SkillTree:
+      - Skill: HAMI_CASTLE
+        MaxLevel: 5
+      - Skill: HAMI_DEFENCE
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_CASTLE
+            Level: 5
+      - Skill: HAMI_SKIN
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_DEFENCE
+            Level: 3
+      - Skill: HAMI_BLOODLUST
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Filir
+    Name: Filir
+    EvolutionClass: Filir_H
+    Food: Garlet
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 90
+        GrowthMinimum: 45
+        GrowthMaximum: 75
+        EvolutionMinimum: 5
+        EvolutionMaximum: 15
+      - Type: Sp
+        Base: 25
+        GrowthMinimum: 3
+        GrowthMaximum: 6
+        EvolutionMinimum: 5
+        EvolutionMaximum: 15
+      - Type: Str
+        Base: 29
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 4
+        EvolutionMaximum: 10
+      - Type: Agi
+        Base: 35
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Vit
+        Base: 9
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 1
+        EvolutionMaximum: 3
+      - Type: Int
+        Base: 8
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 4
+      - Type: Dex
+        Base: 30
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Luk
+        Base: 9
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+    SkillTree:
+      - Skill: HFLI_MOON
+        MaxLevel: 5
+      - Skill: HFLI_FLEET
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_MOON
+            Level: 3
+      - Skill: HFLI_SPEED
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_FLEET
+            Level: 3
+      - Skill: HFLI_SBR44
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Vanilmirth
+    Name: Vanilmirth
+    EvolutionClass: Vanilmirth_H
+    Food: Scell
+    Race: Formless
+    Status:
+      - Type: Hp
+        Base: 80
+        GrowthMinimum: 30
+        GrowthMaximum: 150
+        EvolutionMinimum: 1
+        EvolutionMaximum: 30
+      - Type: Sp
+        Base: 11
+        GrowthMinimum: 0
+        GrowthMaximum: 7
+        EvolutionMinimum: 1
+        EvolutionMaximum: 30
+      - Type: Str
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Agi
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Vit
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Dex
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Luk
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+    SkillTree:
+      - Skill: HVAN_CAPRICE
+        MaxLevel: 5
+      - Skill: HVAN_CHAOTIC
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 3
+      - Skill: HVAN_INSTRUCT
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 5
+      - Skill: HVAN_EXPLOSION
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Lif2
+    Name: Lif
+    EvolutionClass: Lif_H2
+    Status:
+      - Type: Hp
+        Base: 150
+        GrowthMinimum: 60
+        GrowthMaximum: 100
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Sp
+        Base: 40
+        GrowthMinimum: 4
+        GrowthMaximum: 9
+        EvolutionMinimum: 10
+        EvolutionMaximum: 20
+      - Type: Str
+        Base: 17
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Agi
+        Base: 20
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 4
+      - Type: Vit
+        Base: 15
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Int
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 4
+        EvolutionMaximum: 10
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 3
+    SkillTree:
+      - Skill: HLIF_HEAL
+        MaxLevel: 5
+      - Skill: HLIF_AVOID
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 3
+      - Skill: HLIF_BRAIN
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 5
+      - Skill: HLIF_CHANGE
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Amistr2
+    Name: Amistr
+    EvolutionClass: Amistr_H2
+    Food: Zargon
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 320
+        GrowthMinimum: 80
+        GrowthMaximum: 130
+        EvolutionMinimum: 10
+        EvolutionMaximum: 20
+      - Type: Sp
+        Base: 10
+        GrowthMinimum: 1
+        GrowthMaximum: 4
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Str
+        Base: 20
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Agi
+        Base: 17
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Vit
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 4
+        EvolutionMaximum: 10
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 1
+        EvolutionMaximum: 3
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 4
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+    SkillTree:
+      - Skill: HAMI_CASTLE
+        MaxLevel: 5
+      - Skill: HAMI_DEFENCE
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_CASTLE
+            Level: 5
+      - Skill: HAMI_SKIN
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_DEFENCE
+            Level: 3
+      - Skill: HAMI_BLOODLUST
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Filir2
+    Name: Filir
+    EvolutionClass: Filir_H2
+    Food: Garlet
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 90
+        GrowthMinimum: 45
+        GrowthMaximum: 75
+        EvolutionMinimum: 5
+        EvolutionMaximum: 15
+      - Type: Sp
+        Base: 25
+        GrowthMinimum: 3
+        GrowthMaximum: 6
+        EvolutionMinimum: 5
+        EvolutionMaximum: 15
+      - Type: Str
+        Base: 29
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 4
+        EvolutionMaximum: 10
+      - Type: Agi
+        Base: 35
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Vit
+        Base: 9
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 1
+        EvolutionMaximum: 3
+      - Type: Int
+        Base: 8
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 4
+      - Type: Dex
+        Base: 30
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+      - Type: Luk
+        Base: 9
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 1
+        EvolutionMaximum: 5
+    SkillTree:
+      - Skill: HFLI_MOON
+        MaxLevel: 5
+      - Skill: HFLI_FLEET
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_MOON
+            Level: 3
+      - Skill: HFLI_SPEED
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_FLEET
+            Level: 3
+      - Skill: HFLI_SBR44
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Vanilmirth2
+    Name: Vanilmirth
+    EvolutionClass: Vanilmirth_H2
+    Food: Scell
+    Race: Formless
+    Status:
+      - Type: Hp
+        Base: 80
+        GrowthMinimum: 30
+        GrowthMaximum: 150
+        EvolutionMinimum: 1
+        EvolutionMaximum: 30
+      - Type: Sp
+        Base: 11
+        GrowthMinimum: 0
+        GrowthMaximum: 7
+        EvolutionMinimum: 1
+        EvolutionMaximum: 30
+      - Type: Str
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Agi
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Vit
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Dex
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+      - Type: Luk
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 1
+        EvolutionMaximum: 10
+    SkillTree:
+      - Skill: HVAN_CAPRICE
+        MaxLevel: 5
+      - Skill: HVAN_CHAOTIC
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 3
+      - Skill: HVAN_INSTRUCT
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 5
+      - Skill: HVAN_EXPLOSION
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true

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

db/pre-re/mob_skill_db.txt

@@ -717,8 +717,8 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,target,alchemist,,,,,,,,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,master,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,afterskill,331,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
 1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,

db/pre-re/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
 
 Body:
   - Group: Armor

db/pre-re/skill_db.yml

@@ -9325,15 +9325,13 @@ Body:
     Name: NPC_WEAPONBRAKER
     Description: Break weapon
     MaxLevel: 10
-    Type: Weapon
-    TargetType: Attack
+    TargetType: Self
     Flags:
       IsNpc: true
-    Range: 9
     Hit: Single
     HitCount: 1
-    Element: Weapon
-    Status: BrokenWeapon
+    Duration: 30000
+    Status: WeaponBreaker
   - Id: 344
     Name: NPC_ARMORBRAKE
     Description: Break armor

db/re/achievement_db.yml

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

db/re/attr_fix.yml

@@ -120,7 +120,7 @@ Body:
       Holy: 125
       Dark: 0
       Ghost: 100
-      Undead: -25
+      Undead: 0
     Ghost:
       Neutral: 90
       Water: 100
@@ -136,8 +136,8 @@ Body:
       Neutral: 100
       Water: 100
       Earth: 100
-      Fire: 100
-      Wind: 90
+      Fire: 90
+      Wind: 100
       Poison: 75
       Holy: 125
       Dark: 0
@@ -217,7 +217,7 @@ Body:
       Fire: 100
       Wind: 100
       Poison: 75
-      Holy: -25
+      Holy: 0
       Dark: 150
       Ghost: 100
       Undead: 150
@@ -229,9 +229,9 @@ Body:
       Wind: 100
       Poison: 75
       Holy: 150
-      Dark: -25
+      Dark: 0
       Ghost: 100
-      Undead: -50
+      Undead: 0
     Ghost:
       Neutral: 70
       Water: 100
@@ -268,7 +268,7 @@ Body:
       Undead: 100
     Water:
       Neutral: 100
-      Water: -25
+      Water: 0
       Earth: 100
       Fire: 200
       Wind: 70
@@ -280,7 +280,7 @@ Body:
     Earth:
       Neutral: 100
       Water: 100
-      Earth: -25
+      Earth: 0
       Fire: 70
       Wind: 200
       Poison: 125
@@ -292,7 +292,7 @@ Body:
       Neutral: 100
       Water: 70
       Earth: 200
-      Fire: -25
+      Fire: 0
       Wind: 100
       Poison: 125
       Holy: 100
@@ -304,7 +304,7 @@ Body:
       Water: 200
       Earth: 70
       Fire: 100
-      Wind: -25
+      Wind: 0
       Poison: 125
       Holy: 100
       Dark: 100
@@ -328,7 +328,7 @@ Body:
       Fire: 100
       Wind: 100
       Poison: 50
-      Holy: -50
+      Holy: 0
       Dark: 175
       Ghost: 100
       Undead: 175
@@ -340,9 +340,9 @@ Body:
       Wind: 100
       Poison: 50
       Holy: 175
-      Dark: -50
+      Dark: 0
       Ghost: 100
-      Undead: -75
+      Undead: 0
     Ghost:
       Neutral: 50
       Water: 100
@@ -379,7 +379,7 @@ Body:
       Undead: 100
     Water:
       Neutral: 100
-      Water: -50
+      Water: 0
       Earth: 100
       Fire: 200
       Wind: 60
@@ -391,7 +391,7 @@ Body:
     Earth:
       Neutral: 100
       Water: 100
-      Earth: -50
+      Earth: 0
       Fire: 60
       Wind: 200
       Poison: 125
@@ -403,7 +403,7 @@ Body:
       Neutral: 100
       Water: 60
       Earth: 200
-      Fire: -50
+      Fire: 0
       Wind: 100
       Poison: 125
       Holy: 100
@@ -415,7 +415,7 @@ Body:
       Water: 200
       Earth: 60
       Fire: 100
-      Wind: -50
+      Wind: 0
       Poison: 125
       Holy: 100
       Dark: 100
@@ -431,7 +431,7 @@ Body:
       Holy: 50
       Dark: 50
       Ghost: 50
-      Undead: -100
+      Undead: 0
     Holy:
       Neutral: 100
       Water: 100
@@ -439,7 +439,7 @@ Body:
       Fire: 100
       Wind: 100
       Poison: 50
-      Holy: -100
+      Holy: 0
       Dark: 200
       Ghost: 100
       Undead: 200
@@ -451,9 +451,9 @@ Body:
       Wind: 100
       Poison: 50
       Holy: 200
-      Dark: -100
+      Dark: 0
       Ghost: 100
-      Undead: -100
+      Undead: 0
     Ghost:
       Neutral: 0
       Water: 100
@@ -471,7 +471,7 @@ Body:
       Earth: 100
       Fire: 60
       Wind: 100
-      Poison: -25
+      Poison: 0
       Holy: 200
       Dark: 0
       Ghost: 175

db/re/castle_db.yml

@@ -26,51 +26,384 @@
 #   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
+  - Id: 0
+    Map: aldeg_cas01
+    Name: Neuschwanstein
+    #Name: Noisyubantian
+    Npc: Agit#aldeg_cas01
+    Type: First_Edition
+    ClientId: 6
+    WarpEnabled: true
+    WarpX: 212
+    WarpY: 175
+  - Id: 1
+    Map: aldeg_cas02
+    Name: Hohenschwangau
+    #Name: Hohensyubangawoo
+    Npc: Agit#aldeg_cas02
+    Type: First_Edition
+    ClientId: 7
+    WarpEnabled: true
+    WarpX: 82
+    WarpY: 71
+  - Id: 2
+    Map: aldeg_cas03
+    Name: Nuernberg
+    #Name: Nyirenverk
+    Npc: Agit#aldeg_cas03
+    Type: First_Edition
+    ClientId: 8
+    WarpEnabled: true
+    WarpX: 109
+    WarpY: 112
+  - Id: 3
+    Map: aldeg_cas04
+    Name: Wuerzburg
+    #Name: Byirtsburi
+    Npc: Agit#aldeg_cas04
+    Type: First_Edition
+    ClientId: 9
+    WarpEnabled: true
+    WarpX: 60
+    WarpY: 116
+  - Id: 4
+    Map: aldeg_cas05
+    Name: Rothenburg
+    #Name: Rotenburk
+    Npc: Agit#aldeg_cas05
+    Type: First_Edition
+    ClientId: 10
+    WarpEnabled: true
+    WarpX: 61
+    WarpY: 185
+  - Id: 5
+    Map: gefg_cas01
+    Name: Repherion
+    #Name: Reprion
+    Npc: Agit#gefg_cas01
+    Type: First_Edition
+    ClientId: 11
+    WarpEnabled: true
+    WarpX: 40
+    WarpY: 43
+  - Id: 6
+    Map: gefg_cas02
+    Name: Eeyolbriggar
+    #Name: Yolbriger
+    Npc: Agit#gefg_cas02
+    Type: First_Edition
+    ClientId: 12
+    WarpEnabled: true
+    WarpX: 22
+    WarpY: 66
+  - Id: 7
+    Map: gefg_cas03
+    Name: Yesnelph
+    #Name: Isinlife
+    Npc: Agit#gefg_cas03
+    Type: First_Edition
+    ClientId: 13
+    WarpEnabled: true
+    WarpX: 112
+    WarpY: 23
+  - Id: 8
+    Map: gefg_cas04
+    Name: Bergel
+    #Name: Berigel
+    Npc: Agit#gefg_cas04
+    Type: First_Edition
+    ClientId: 14
+    WarpEnabled: true
+    WarpX: 58
+    WarpY: 46
+  - Id: 9
+    Map: gefg_cas05
+    Name: Mersetzdeitz
+    #Name: Melsedetsu
+    Npc: Agit#gefg_cas05
+    Type: First_Edition
+    ClientId: 15
+    WarpEnabled: true
+    WarpX: 66
+    WarpY: 48
+  - Id: 10
+    Map: payg_cas01
+    Name: Bright Arbor
+    #Name: Mingting
+    Npc: Agit#payg_cas01
+    Type: First_Edition
+    ClientId: 16
+    WarpEnabled: true
+    WarpX: 115
+    WarpY: 57
+  - Id: 11
+    Map: payg_cas02
+    Name: Scarlet Palace
+    #Name: Tiantan
+    Npc: Agit#payg_cas02
+    Type: First_Edition
+    ClientId: 17
+    WarpEnabled: true
+    WarpX: 26
+    WarpY: 265
+  - Id: 12
+    Map: payg_cas03
+    Name: Holy Shadow
+    #Name: Fuying
+    Npc: Agit#payg_cas03
+    Type: First_Edition
+    ClientId: 18
+    WarpEnabled: true
+    WarpX: 43
+    WarpY: 264
+  - Id: 13
+    Map: payg_cas04
+    Name: Sacred Altar
+    #Name: Honglou
+    Npc: Agit#payg_cas04
+    Type: First_Edition
+    ClientId: 19
+    WarpEnabled: true
+    WarpX: 36
+    WarpY: 272
+  - Id: 14
+    Map: payg_cas05
+    Name: Bamboo Grove Hill
+    #Name: Zhulinxian
+    Npc: Agit#payg_cas05
+    Type: First_Edition
+    ClientId: 20
+    WarpEnabled: true
+    WarpX: 274
+    WarpY: 246
+  - Id: 15
+    Map: prtg_cas01
+    Name: Kriemhild
+    #Name: Creamhilt
+    Npc: Agit#prtg_cas01
+    Type: First_Edition
+    ClientId: 1
+    WarpEnabled: true
+    WarpX: 107
+    WarpY: 180
+  - Id: 16
+    Map: prtg_cas02
+    Name: Swanhild
+    #Name: Sbanhealt
+    Npc: Agit#prtg_cas02
+    Type: First_Edition
+    ClientId: 2
+    WarpEnabled: true
+    WarpX: 94
+    WarpY: 56
+  - Id: 17
+    Map: prtg_cas03
+    Name: Fadhgridh
+    #Name: Lazrigees
+    Npc: Agit#prtg_cas03
+    Type: First_Edition
+    ClientId: 3
+    WarpEnabled: true
+    WarpX: 46
+    WarpY: 97
+  - Id: 18
+    Map: prtg_cas04
+    Name: Skoegul
+    #Name: Squagul
+    Npc: Agit#prtg_cas04
+    Type: First_Edition
+    ClientId: 4
+    WarpEnabled: true
+    WarpX: 260
+    WarpY: 262
+  - Id: 19
+    Map: prtg_cas05
+    Name: Gondul
+    #Name: Guindull
+    Npc: Agit#prtg_cas05
+    Type: First_Edition
+    ClientId: 5
+    WarpEnabled: true
+    WarpX: 26
+    WarpY: 38
+
+# 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
+    WarpEnabled: true
+    WarpX: 233
+    WarpY: 300
+  - Id: 25
+    Map: schg_cas02
+    Name: Andlangr
+    Npc: Manager#schg_cas02
+    Type: Second_Edition
+    ClientId: 27
+    WarpEnabled: true
+    WarpX: 101
+    WarpY: 372
+  - Id: 26
+    Map: schg_cas03
+    Name: Viblainn
+    Npc: Manager#schg_cas03
+    Type: Second_Edition
+    ClientId: 28
+    WarpEnabled: true
+    WarpX: 81
+    WarpY: 94
+  - Id: 27
+    Map: schg_cas04
+    Name: Hljod
+    Npc: Manager#schg_cas04
+    Type: Second_Edition
+    ClientId: 29
+    WarpEnabled: true
+    WarpX: 233
+    WarpY: 300
+  - Id: 28
+    Map: schg_cas05
+    Name: Skidbladnir
+    Npc: Manager#schg_cas05
+    Type: Second_Edition
+    ClientId: 30
+    WarpEnabled: true
+    WarpX: 233
+    WarpY: 300
+  - Id: 29
+    Map: arug_cas01
+    Name: Mardol
+    Npc: Manager#arug_cas01
+    Type: Second_Edition
+    ClientId: 21
+    WarpEnabled: true
+    WarpX: 77
+    WarpY: 371
+  - Id: 30
+    Map: arug_cas02
+    Name: Cyr
+    Npc: Manager#arug_cas02
+    Type: Second_Edition
+    ClientId: 22
+    WarpEnabled: true
+    WarpX: 301
+    WarpY: 332
+  - Id: 31
+    Map: arug_cas03
+    Name: Horn
+    Npc: Manager#arug_cas03
+    Type: Second_Edition
+    ClientId: 23
+    WarpEnabled: true
+    WarpX: 322
+    WarpY: 91
+  - Id: 32
+    Map: arug_cas04
+    Name: Gefn
+    Npc: Manager#arug_cas04
+    Type: Second_Edition
+    ClientId: 24
+    WarpEnabled: true
+    WarpX: 322
+    WarpY: 91
+  - Id: 33
+    Map: arug_cas05
+    Name: Bandis
+    Npc: Manager#arug_cas05
+    Type: Second_Edition
+    ClientId: 25
+    WarpEnabled: true
+    WarpX: 322
+    WarpY: 91
+
 # WOE TE castle
   - Id: 34
     Map: te_aldecas1
     Name: Kafragarten 1
     Npc: Manager_TE#Glaris
+    Type: Third_Edition
   - Id: 35
     Map: te_aldecas2
     Name: Kafragarten 2
     Npc: Manager_TE#Defolty
+    Type: Third_Edition
   - Id: 36
     Map: te_aldecas3
     Name: Kafragarten 3
     Npc: Manager_TE#Sorin
+    Type: Third_Edition
   - Id: 37
     Map: te_aldecas4
     Name: Kafragarten 4
     Npc: Manager_TE#Bennit
+    Type: Third_Edition
   - Id: 38
     Map: te_aldecas5
     Name: Kafragarten 5
     Npc: Manager_TE#W
+    Type: Third_Edition
   - Id: 39
     Map: te_prtcas01
     Name: Gloria 1
     Npc: Manager_TE#Gaebolg
+    Type: Third_Edition
   - Id: 40
     Map: te_prtcas02
     Name: Gloria 2
     Npc: Manager_TE#Richard
+    Type: Third_Edition
   - Id: 41
     Map: te_prtcas03
     Name: Gloria 3
     Npc: Manager_TE#Wigner
+    Type: Third_Edition
   - Id: 42
     Map: te_prtcas04
     Name: Gloria 4
     Npc: Manager_TE#Heine
+    Type: Third_Edition
   - Id: 43
     Map: te_prtcas05
     Name: Gloria 5
     Npc: Manager_TE#Nerious
+    Type: Third_Edition

db/re/enchantgrade.yml

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
+#   Copyright(C) 2023 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27,10 +27,13 @@
 #     - 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.
+#           Chances:                    Chance settings per refine level.
+#             - Refine                  Refine level.
+#               Chance                  Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
-#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
+#           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.
@@ -49,7 +52,7 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 1
+  Version: 3
 
 Body:
   - Type: Armor
@@ -57,8 +60,31 @@ Body:
       - Level: 2
         Grades:
           - Grade: None
-            Refine: 11
-            Chance: 7000
+            Chances:
+              - Refine: 9
+                Chance: 1000
+              - Refine: 10
+                Chance: 2000
+              - Refine: 11
+                Chance: 7000
+              - Refine: 12
+                Chance: 7000
+              - Refine: 13
+                Chance: 7000
+              - Refine: 14
+                Chance: 7000
+              - Refine: 15
+                Chance: 7000
+              - Refine: 16
+                Chance: 7000
+              - Refine: 17
+                Chance: 7000
+              - Refine: 18
+                Chance: 7000
+              - Refine: 19
+                Chance: 7000
+              - Refine: 20
+                Chance: 7000
             Bonus: 10
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -76,8 +102,29 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: D
-            Refine: 11
-            Chance: 6000
+            Chances:
+              - Refine: 10
+                Chance: 2000
+              - Refine: 11
+                Chance: 6000
+              - Refine: 12
+                Chance: 6000
+              - Refine: 13
+                Chance: 6000
+              - Refine: 14
+                Chance: 6000
+              - Refine: 15
+                Chance: 6000
+              - Refine: 16
+                Chance: 6000
+              - Refine: 17
+                Chance: 6000
+              - Refine: 18
+                Chance: 6000
+              - Refine: 19
+                Chance: 6000
+              - Refine: 20
+                Chance: 6000
             Bonus: 30
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -95,9 +142,29 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: C
-            Refine: 11
-            Chance: 5000
+            Chances:
+              - Refine: 11
+                Chance: 5000
+              - Refine: 12
+                Chance: 5000
+              - Refine: 13
+                Chance: 5000
+              - Refine: 14
+                Chance: 5000
+              - Refine: 15
+                Chance: 5000
+              - Refine: 16
+                Chance: 5000
+              - Refine: 17
+                Chance: 5000
+              - Refine: 18
+                Chance: 5000
+              - Refine: 19
+                Chance: 5000
+              - Refine: 20
+                Chance: 5000
             Bonus: 50
+            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 5
@@ -114,9 +181,29 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: B
-            Refine: 11
-            Chance: 4000
+            Chances:
+              - Refine: 11
+                Chance: 4000
+              - Refine: 12
+                Chance: 4000
+              - Refine: 13
+                Chance: 4000
+              - Refine: 14
+                Chance: 4000
+              - Refine: 15
+                Chance: 4000
+              - Refine: 16
+                Chance: 4000
+              - Refine: 17
+                Chance: 4000
+              - Refine: 18
+                Chance: 4000
+              - Refine: 19
+                Chance: 4000
+              - Refine: 20
+                Chance: 4000
             Bonus: 100
+            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 7
@@ -137,8 +224,31 @@ Body:
       - Level: 5
         Grades:
           - Grade: None
-            Refine: 11
-            Chance: 7000
+            Chances:
+              - Refine: 9
+                Chance: 1000
+              - Refine: 10
+                Chance: 2000
+              - Refine: 11
+                Chance: 7000
+              - Refine: 12
+                Chance: 7000
+              - Refine: 13
+                Chance: 7000
+              - Refine: 14
+                Chance: 7000
+              - Refine: 15
+                Chance: 7000
+              - Refine: 16
+                Chance: 7000
+              - Refine: 17
+                Chance: 7000
+              - Refine: 18
+                Chance: 7000
+              - Refine: 19
+                Chance: 7000
+              - Refine: 20
+                Chance: 7000
             Bonus: 10
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -156,8 +266,29 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: D
-            Refine: 11
-            Chance: 6000
+            Chances:
+              - Refine: 10
+                Chance: 2000
+              - Refine: 11
+                Chance: 6000
+              - Refine: 12
+                Chance: 6000
+              - Refine: 13
+                Chance: 6000
+              - Refine: 14
+                Chance: 6000
+              - Refine: 15
+                Chance: 6000
+              - Refine: 16
+                Chance: 6000
+              - Refine: 17
+                Chance: 6000
+              - Refine: 18
+                Chance: 6000
+              - Refine: 19
+                Chance: 6000
+              - Refine: 20
+                Chance: 6000
             Bonus: 30
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -175,9 +306,29 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: C
-            Refine: 11
-            Chance: 5000
+            Chances:
+              - Refine: 11
+                Chance: 5000
+              - Refine: 12
+                Chance: 5000
+              - Refine: 13
+                Chance: 5000
+              - Refine: 14
+                Chance: 5000
+              - Refine: 15
+                Chance: 5000
+              - Refine: 16
+                Chance: 5000
+              - Refine: 17
+                Chance: 5000
+              - Refine: 18
+                Chance: 5000
+              - Refine: 19
+                Chance: 5000
+              - Refine: 20
+                Chance: 5000
             Bonus: 50
+            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 5
@@ -194,9 +345,29 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: B
-            Refine: 11
-            Chance: 4000
+            Chances:
+              - Refine: 11
+                Chance: 4000
+              - Refine: 12
+                Chance: 4000
+              - Refine: 13
+                Chance: 4000
+              - Refine: 14
+                Chance: 4000
+              - Refine: 15
+                Chance: 4000
+              - Refine: 16
+                Chance: 4000
+              - Refine: 17
+                Chance: 4000
+              - Refine: 18
+                Chance: 4000
+              - Refine: 19
+                Chance: 4000
+              - Refine: 20
+                Chance: 4000
             Bonus: 100
+            AnnounceFail: true
             Catalyst:
                 Item: Blessed_Etel_Dust
                 AmountPerStep: 7

db/re/exp_homun.yml

@@ -379,3 +379,154 @@ Body:
     Exp: 87140000
   - Level: 174
     Exp: 94875000
+# TODO: unconfirmed values from here
+  - Level: 175
+    Exp: 104362500
+  - Level: 176
+    Exp: 112711500
+  - Level: 177
+    Exp: 121728420
+  - Level: 178
+    Exp: 131466693
+  - Level: 179
+    Exp: 141984028
+  - Level: 180
+    Exp: 153342750
+  - Level: 181
+    Exp: 165610170
+  - Level: 182
+    Exp: 178858983
+  - Level: 183
+    Exp: 193167701
+  - Level: 184
+    Exp: 208621117
+  - Level: 185
+    Exp: 225310806
+  - Level: 186
+    Exp: 243335670
+  - Level: 187
+    Exp: 262802523
+  - Level: 188
+    Exp: 283826724
+  - Level: 189
+    Exp: 306532861
+  - Level: 190
+    Exp: 331055489
+  - Level: 191
+    Exp: 357539928
+  - Level: 192
+    Exp: 386143122
+  - Level: 193
+    Exp: 417034571
+  - Level: 194
+    Exp: 450397336
+  - Level: 195
+    Exp: 486429122
+  - Level: 196
+    Exp: 525343451
+  - Level: 197
+    Exp: 567370927
+  - Level: 198
+    Exp: 612760601
+  - Level: 199
+    Exp: 661781449
+  - Level: 200
+    Exp: 714723964
+  - Level: 201
+    Exp: 771901881
+  - Level: 202
+    Exp: 833654031
+  - Level: 203
+    Exp: 900346353
+  - Level: 204
+    Exp: 972374061
+  - Level: 205
+    Exp: 1050163985
+  - Level: 206
+    Exp: 1134177103
+  - Level: 207
+    Exp: 1224911271
+  - Level: 208
+    Exp: 1322904172
+  - Level: 209
+    Exp: 1428736505
+  - Level: 210
+    Exp: 1543035425
+  - Level: 211
+    Exp: 1666478259
+  - Level: 212
+    Exp: 1799796519
+  - Level: 213
+    Exp: 1943780240
+  - Level: 214
+    Exp: 2099282659
+  - Level: 215
+    Exp: 2267225271
+  - Level: 216
+    Exp: 2448603292
+  - Level: 217
+    Exp: 2644491555
+  - Level: 218
+    Exp: 2856050879
+  - Level: 219
+    Exp: 3084534949
+  - Level: 220
+    Exp: 3331297744
+  - Level: 221
+    Exp: 3597801563
+  - Level: 222
+    Exp: 3885625688
+  - Level: 223
+    Exp: 4196475743
+  - Level: 224
+    Exp: 4532193802
+  - Level: 225
+    Exp: 4894769306
+  - Level: 226
+    Exp: 5286350850
+  - Level: 227
+    Exp: 5709258918
+  - Level: 228
+    Exp: 6165999631
+  - Level: 229
+    Exp: 6659279601
+  - Level: 230
+    Exp: 7192021969
+  - Level: 231
+    Exp: 7767383726
+  - Level: 232
+    Exp: 8388774424
+  - Level: 233
+    Exp: 9059876377
+  - Level: 234
+    Exp: 9784666487
+  - Level: 235
+    Exp: 10567439805
+  - Level: 236
+    Exp: 11412834989
+  - Level: 237
+    Exp: 12325861788
+  - Level: 238
+    Exp: 13311930731
+  - Level: 239
+    Exp: 14376885189
+  - Level: 240
+    Exp: 15527036004
+  - Level: 241
+    Exp: 16769198884
+  - Level: 242
+    Exp: 18110734794
+  - Level: 243
+    Exp: 19559593577
+  - Level: 244
+    Exp: 21124361063
+  - Level: 245
+    Exp: 22814309948
+  - Level: 246
+    Exp: 24639454743
+  - Level: 247
+    Exp: 26610611122
+  - Level: 248
+    Exp: 28739460011
+  - Level: 249
+    Exp: 31038616811

db/re/generator/reputation.yml

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

db/re/generator/reputation_group.yml

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

db/re/homunculus_db.txt

@@ -1,33 +0,0 @@
-// Homunculus Database
-//
-// Structure of Database:
-// Class,EvoClass,Name,FoodID,HungryDelay,BaseSize,EvoSize,Race,Element,bASPD,bHP,bSP,bSTR,bAGI,bVIT,bINT,bDEX,bLUK,gnHP,gxHP,gnSP,gxSP,gnSTR,gxSTR,gnAGI,gxAGI,gnVIT,gxVIT,gnINT,gxINT,gnDEX,gxDEX,gnLUK,gxLUK,enHP,exHP,enSP,exSP,enSTR,exSTR,enAGI,exAGI,enVIT,exVIT,enINT,exINT,enDEX,exDEX,enLUK,exLUK
-//
-// 01. Class        Homunculus ID.
-// 02. EvoClass     Homunculus ID of the evolved version.
-// 03. Name         Name of the homunculus.
-// 04. FoodID       Item ID of the homunuclus food.
-// 05. HungryDelay  Time interval in milliseconds after which the homunculus' hunger value is altered.
-// 06. BaseSize     Size of the base homunculus class (0 = small, 1 = normal, 2 = large).
-// 07. EvoSize      Size of the evolved homunculus class (0 = small, 1 = normal, 2 = large).
-// 08. Race         Race of the homunculus (0 = formless, 1 = undead, 2 = brute, 3 = plant, 4 = insect, 5 = fish, 6 = demon, 7 = demi-human, 8 = angel, 9 = dragon).
-// 09. Element      Element of the homunculus (0 = neutral, 1 = water, 2 = earth, 3 = fire, 4 = wind, 5 = poison, 6 = holy, 7 = dark, 8 = ghost, 9 = undead).
-//                  The element level is always 1.
-// ...
-//
-// Legend: b: base, gn: growth min, gx: growth max, en: evolution min, ex: evolution max
-// NOTE: Only the growth values are in a 1/10 scale, the other stats are 1/1 (eg: 5 gmAGI means 0.5 agi)
-
-6001,6009,Lif,537,60000,0,1,7,0,700,150,40,17,20,15,35,24,12,60,100,4,9,5,19,5,19,5,19,4,20,6,20,6,20,800,2400,220,480,10,30,10,30,20,40,30,50,20,50,10,30
-6002,6010,Amistr,912,60000,0,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,1600,3600,120,360,20,50,10,30,20,50,20,50,10,30,10,30
-6003,6011,Filir,910,60000,0,1,2,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,1200,3200,200,400,20,50,10,30,20,50,20,50,10,30,10,30
-6004,6012,Vanilmirth,911,60000,0,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1200,4800,480,640,10,30,10,30,10,30,20,50,10,50,10,100
-6005,6013,Lif,537,60000,0,1,7,0,700,150,40,17,20,15,35,24,12,60,100,4,9,5,19,5,19,5,19,4,20,6,20,6,20,800,2400,220,480,10,30,10,30,20,40,30,50,20,50,10,30
-6006,6014,Amistr,912,60000,0,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,1600,3600,120,360,20,50,10,30,20,50,20,50,10,30,10,30
-6007,6015,Filir,910,60000,0,1,2,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,1200,3200,200,400,20,50,10,30,20,50,20,50,10,30,10,30
-6008,6016,Vanilmirth,911,60000,0,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1200,4800,480,640,10,30,10,30,10,30,20,50,10,50,10,100
-6048,6048,Eira,6098,60000,1,1,8,4,700,150,40,17,20,15,35,24,12,40,160,20,42,13,39,28,42,15,25,14,48,16,36,9,18,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
-6049,6049,Bayeri,6112,60000,1,1,2,6,700,320,10,20,17,35,11,24,12,90,360,48,52,18,36,8,36,16,32,22,44,12,24,20,36,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
-6050,6050,Sera,6108,60000,1,1,4,2,700,90,25,29,35,9,8,30,9,60,240,36,64,10,25,16,32,5,25,7,35,28,40,20,40,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
-6051,6051,Dieter,6104,60000,1,1,0,3,700,80,11,11,11,11,11,11,11,240,480,40,120,20,40,13,26,18,36,15,40,16,32,4,16,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
-6052,6052,Eleanor,6115,60000,1,1,7,5,700,320,10,20,17,35,11,24,12,60,300,10,20,20,40,10,50,24,48,5,15,12,36,2,10,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10

db/re/homunculus_db.yml

@@ -0,0 +1,948 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2023 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# 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/>.
+#
+###########################################################################
+# Homunculus Database
+###########################################################################
+#
+# Homunculus Settings
+#
+###########################################################################
+# - BaseClass               Base class.
+#   Name                    Name of homunculus.
+#   EvolutionClass          Evolution class.
+#   Food                    Homunculus food item. (Default: Pet_Food)
+#   HungryDelay             Time interval in milliseconds after which the hunger value is altered. (Default: 60000)
+#   Race                    Race. (Default: Demihuman)
+#   Element                 Element. (Default: Neutral)
+#   Size                    Size. (Default: Small)
+#   EvolutionSize           Evolution size. (Default: Medium)
+#   AttackDelay             Base ASPD. (Default: 700)
+#   Status:                 Homunculus stats.
+#     - Type                Type of status.
+#       Base                Base value of this status. (Default: 1)
+#       GrowthMinimum       Minimum growth of this status. (Default: 0)
+#       GrowthMaximum       Maximum growth of this status. (Default: 0)
+#       EvolutionMinimum    Minimum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#       EvolutionMaximum    Maximum evolution growth of this status. Only applies for homunculus that can evolve. (Default: 0)
+#   SkillTree:              Skill tree.
+#     - Skill               Skill name.
+#       Clear               True to remove the given skill name. (Optional)
+#       MaxLevel            Maximum level of skill.
+#       RequiredLevel       Required base level of homunculus to learn. (Default: 0)
+#       RequiredIntimacy    Required intimacy of homunculus to learn. (Default: 0)
+#       RequireEvolution    Require the homunculus to be evolved to be available. (Default: false)
+#       Required:           Prerequisite skills. (Default: null)
+#         - Skill           Prerequisite skill name.
+#           Level           Level of prerequisite skill.
+#           Clear           True to remove the given prerequisite skill name. (Optional)
+###########################################################################
+
+Header:
+  Type: HOMUNCULUS_DB
+  Version: 1
+
+Body:
+  - Class: Lif
+    Name: Lif
+    EvolutionClass: Lif_H
+    Status:
+      - Type: Hp
+        Base: 150
+        GrowthMinimum: 60
+        GrowthMaximum: 100
+        EvolutionMinimum: 800
+        EvolutionMaximum: 2400
+      - Type: Sp
+        Base: 40
+        GrowthMinimum: 4
+        GrowthMaximum: 9
+        EvolutionMinimum: 220
+        EvolutionMaximum: 480
+      - Type: Str
+        Base: 17
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Agi
+        Base: 20
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 15
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 20
+        EvolutionMaximum: 40
+      - Type: Int
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 30
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+    SkillTree:
+      - Skill: HLIF_HEAL
+        MaxLevel: 5
+      - Skill: HLIF_AVOID
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 3
+      - Skill: HLIF_BRAIN
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 5
+      - Skill: HLIF_CHANGE
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Amistr
+    Name: Amistr
+    EvolutionClass: Amistr_H
+    Food: Zargon
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 320
+        GrowthMinimum: 80
+        GrowthMaximum: 130
+        EvolutionMinimum: 1600
+        EvolutionMaximum: 3600
+      - Type: Sp
+        Base: 10
+        GrowthMinimum: 1
+        GrowthMaximum: 4
+        EvolutionMinimum: 120
+        EvolutionMaximum: 360
+      - Type: Str
+        Base: 20
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Agi
+        Base: 17
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+    SkillTree:
+      - Skill: HAMI_CASTLE
+        MaxLevel: 5
+      - Skill: HAMI_DEFENCE
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_CASTLE
+            Level: 5
+      - Skill: HAMI_SKIN
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_DEFENCE
+            Level: 3
+      - Skill: HAMI_BLOODLUST
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Filir
+    Name: Filir
+    EvolutionClass: Filir_H
+    Food: Garlet
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 90
+        GrowthMinimum: 45
+        GrowthMaximum: 75
+        EvolutionMinimum: 1200
+        EvolutionMaximum: 3200
+      - Type: Sp
+        Base: 25
+        GrowthMinimum: 3
+        GrowthMaximum: 6
+        EvolutionMinimum: 200
+        EvolutionMaximum: 400
+      - Type: Str
+        Base: 29
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Agi
+        Base: 35
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 9
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Int
+        Base: 8
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 30
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Luk
+        Base: 9
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+    SkillTree:
+      - Skill: HFLI_MOON
+        MaxLevel: 5
+      - Skill: HFLI_FLEET
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_MOON
+            Level: 3
+      - Skill: HFLI_SPEED
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_FLEET
+            Level: 3
+      - Skill: HFLI_SBR44
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Vanilmirth
+    Name: Vanilmirth
+    EvolutionClass: Vanilmirth_H
+    Food: Scell
+    Race: Formless
+    Status:
+      - Type: Hp
+        Base: 80
+        GrowthMinimum: 30
+        GrowthMaximum: 150
+        EvolutionMinimum: 1200
+        EvolutionMaximum: 4800
+      - Type: Sp
+        Base: 11
+        GrowthMinimum: 0
+        GrowthMaximum: 7
+        EvolutionMinimum: 480
+        EvolutionMaximum: 640
+      - Type: Str
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Agi
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 50
+      - Type: Luk
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 100
+    SkillTree:
+      - Skill: HVAN_CAPRICE
+        MaxLevel: 5
+      - Skill: HVAN_CHAOTIC
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 3
+      - Skill: HVAN_INSTRUCT
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 5
+      - Skill: HVAN_EXPLOSION
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Lif2
+    Name: Lif
+    EvolutionClass: Lif_H2
+    Status:
+      - Type: Hp
+        Base: 150
+        GrowthMinimum: 60
+        GrowthMaximum: 100
+        EvolutionMinimum: 800
+        EvolutionMaximum: 2400
+      - Type: Sp
+        Base: 40
+        GrowthMinimum: 4
+        GrowthMaximum: 9
+        EvolutionMinimum: 220
+        EvolutionMaximum: 480
+      - Type: Str
+        Base: 17
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Agi
+        Base: 20
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 15
+        GrowthMinimum: 5
+        GrowthMaximum: 19
+        EvolutionMinimum: 20
+        EvolutionMaximum: 40
+      - Type: Int
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 30
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 6
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+    SkillTree:
+      - Skill: HLIF_HEAL
+        MaxLevel: 5
+      - Skill: HLIF_AVOID
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 3
+      - Skill: HLIF_BRAIN
+        MaxLevel: 5
+        Required:
+          - Skill: HLIF_HEAL
+            Level: 5
+      - Skill: HLIF_CHANGE
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Amistr2
+    Name: Amistr
+    EvolutionClass: Amistr_H2
+    Food: Zargon
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 320
+        GrowthMinimum: 80
+        GrowthMaximum: 130
+        EvolutionMinimum: 1600
+        EvolutionMaximum: 3600
+      - Type: Sp
+        Base: 10
+        GrowthMinimum: 1
+        GrowthMaximum: 4
+        EvolutionMinimum: 120
+        EvolutionMaximum: 360
+      - Type: Str
+        Base: 20
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Agi
+        Base: 17
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 35
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+    SkillTree:
+      - Skill: HAMI_CASTLE
+        MaxLevel: 5
+      - Skill: HAMI_DEFENCE
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_CASTLE
+            Level: 5
+      - Skill: HAMI_SKIN
+        MaxLevel: 5
+        Required:
+          - Skill: HAMI_DEFENCE
+            Level: 3
+      - Skill: HAMI_BLOODLUST
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Filir2
+    Name: Filir
+    EvolutionClass: Filir_H2
+    Food: Garlet
+    Race: Brute
+    Status:
+      - Type: Hp
+        Base: 90
+        GrowthMinimum: 45
+        GrowthMaximum: 75
+        EvolutionMinimum: 1200
+        EvolutionMaximum: 3200
+      - Type: Sp
+        Base: 25
+        GrowthMinimum: 3
+        GrowthMaximum: 6
+        EvolutionMinimum: 200
+        EvolutionMaximum: 400
+      - Type: Str
+        Base: 29
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Agi
+        Base: 35
+        GrowthMinimum: 8
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 9
+        GrowthMinimum: 1
+        GrowthMaximum: 10
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Int
+        Base: 8
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 30
+        GrowthMinimum: 4
+        GrowthMaximum: 20
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Luk
+        Base: 9
+        GrowthMinimum: 3
+        GrowthMaximum: 19
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+    SkillTree:
+      - Skill: HFLI_MOON
+        MaxLevel: 5
+      - Skill: HFLI_FLEET
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_MOON
+            Level: 3
+      - Skill: HFLI_SPEED
+        MaxLevel: 5
+        Required:
+          - Skill: HFLI_FLEET
+            Level: 3
+      - Skill: HFLI_SBR44
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Vanilmirth2
+    Name: Vanilmirth
+    EvolutionClass: Vanilmirth_H2
+    Food: Scell
+    Race: Formless
+    Status:
+      - Type: Hp
+        Base: 80
+        GrowthMinimum: 30
+        GrowthMaximum: 150
+        EvolutionMinimum: 1200
+        EvolutionMaximum: 4800
+      - Type: Sp
+        Base: 11
+        GrowthMinimum: 0
+        GrowthMaximum: 7
+        EvolutionMinimum: 480
+        EvolutionMaximum: 640
+      - Type: Str
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Agi
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Vit
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 30
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 20
+        EvolutionMaximum: 50
+      - Type: Dex
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 50
+      - Type: Luk
+        Base: 11
+        GrowthMinimum: 1
+        GrowthMaximum: 30
+        EvolutionMinimum: 10
+        EvolutionMaximum: 100
+    SkillTree:
+      - Skill: HVAN_CAPRICE
+        MaxLevel: 5
+      - Skill: HVAN_CHAOTIC
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 3
+      - Skill: HVAN_INSTRUCT
+        MaxLevel: 5
+        Required:
+          - Skill: HVAN_CAPRICE
+            Level: 5
+      - Skill: HVAN_EXPLOSION
+        MaxLevel: 3
+        RequiredIntimacy: 910
+        RequireEvolution: true
+  - Class: Eira
+    Name: Eira
+    Food: Small_Snow_Flower
+    Race: Angel
+    Element: Wind
+    Size: Medium
+    Status:
+      - Type: Hp
+        Base: 150
+        GrowthMinimum: 40
+        GrowthMaximum: 160
+      - Type: Sp
+        Base: 40
+        GrowthMinimum: 20
+        GrowthMaximum: 42
+      - Type: Str
+        Base: 17
+        GrowthMinimum: 13
+        GrowthMaximum: 39
+      - Type: Agi
+        Base: 20
+        GrowthMinimum: 28
+        GrowthMaximum: 42
+      - Type: Vit
+        Base: 15
+        GrowthMinimum: 15
+        GrowthMaximum: 25
+      - Type: Int
+        Base: 35
+        GrowthMinimum: 14
+        GrowthMaximum: 48
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 16
+        GrowthMaximum: 36
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 9
+        GrowthMaximum: 18
+    SkillTree:
+      - Skill: MH_LIGHT_OF_REGENE
+        MaxLevel: 5
+        RequiredLevel: 128
+      - Skill: MH_OVERED_BOOST
+        MaxLevel: 5
+        RequiredLevel: 114
+      - Skill: MH_ERASER_CUTTER
+        MaxLevel: 10
+        RequiredLevel: 106
+      - Skill: MH_XENO_SLASHER
+        MaxLevel: 10
+        RequiredLevel: 121
+      - Skill: MH_SILENT_BREEZE
+        MaxLevel: 5
+        RequiredLevel: 137
+      - Skill: MH_CLASSY_FLUTTER
+        MaxLevel: 10
+        RequiredLevel: 210
+      - Skill: MH_TWISTER_CUTTER
+        MaxLevel: 10
+        RequiredLevel: 215
+      - Skill: MH_ABSOLUTE_ZEPHYR
+        MaxLevel: 10
+        RequiredLevel: 230
+  - Class: Bayeri
+    Name: Bayeri
+    Food: Fresh_Plant
+    Race: Brute
+    Element: Holy
+    Size: Medium
+    Status:
+      - Type: Hp
+        Base: 320
+        GrowthMinimum: 90
+        GrowthMaximum: 360
+      - Type: Sp
+        Base: 10
+        GrowthMinimum: 48
+        GrowthMaximum: 52
+      - Type: Str
+        Base: 20
+        GrowthMinimum: 18
+        GrowthMaximum: 36
+      - Type: Agi
+        Base: 17
+        GrowthMinimum: 8
+        GrowthMaximum: 36
+      - Type: Vit
+        Base: 35
+        GrowthMinimum: 16
+        GrowthMaximum: 32
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 22
+        GrowthMaximum: 44
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 12
+        GrowthMaximum: 24
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 20
+        GrowthMaximum: 36
+    SkillTree:
+      - Skill: MH_STAHL_HORN
+        MaxLevel: 10
+        RequiredLevel: 105
+      - Skill: MH_GOLDENE_FERSE
+        MaxLevel: 5
+        RequiredLevel: 112
+      - Skill: MH_STEINWAND
+        MaxLevel: 5
+        RequiredLevel: 121
+      - Skill: MH_HEILIGE_STANGE
+        MaxLevel: 10
+        RequiredLevel: 138
+      - Skill: MH_ANGRIFFS_MODUS
+        MaxLevel: 5
+        RequiredLevel: 130
+      - Skill: MH_LICHT_GEHORN
+        MaxLevel: 10
+        RequiredLevel: 210
+      - Skill: MH_GLANZEN_SPIES
+        MaxLevel: 10
+        RequiredLevel: 215
+      - Skill: MH_HEILIGE_PFERD
+        MaxLevel: 10
+        RequiredLevel: 230
+      - Skill: MH_GOLDENE_TONE
+        MaxLevel: 10
+        RequiredLevel: 230
+  - Class: Sera
+    Name: Sera
+    Food: Apple_Pudding
+    Race: Insect
+    Element: Earth
+    Size: Medium
+    Status:
+      - Type: Hp
+        Base: 90
+        GrowthMinimum: 60
+        GrowthMaximum: 240
+      - Type: Sp
+        Base: 25
+        GrowthMinimum: 36
+        GrowthMaximum: 64
+      - Type: Str
+        Base: 29
+        GrowthMinimum: 10
+        GrowthMaximum: 25
+      - Type: Agi
+        Base: 35
+        GrowthMinimum: 16
+        GrowthMaximum: 32
+      - Type: Vit
+        Base: 9
+        GrowthMinimum: 5
+        GrowthMaximum: 25
+      - Type: Int
+        Base: 8
+        GrowthMinimum: 7
+        GrowthMaximum: 35
+      - Type: Dex
+        Base: 30
+        GrowthMinimum: 28
+        GrowthMaximum: 40
+      - Type: Luk
+        Base: 9
+        GrowthMinimum: 20
+        GrowthMaximum: 40
+    SkillTree:
+      - Skill: MH_SUMMON_LEGION
+        MaxLevel: 5
+        RequiredLevel: 132
+      - Skill: MH_NEEDLE_OF_PARALYZE
+        MaxLevel: 10
+        RequiredLevel: 105
+      - Skill: MH_POISON_MIST
+        MaxLevel: 5
+        RequiredLevel: 116
+      - Skill: MH_PAIN_KILLER
+        MaxLevel: 10
+        RequiredLevel: 123
+      - Skill: MH_POLISHING_NEEDLE
+        MaxLevel: 10
+        RequiredLevel: 210
+      - Skill: MH_TOXIN_OF_MANDARA
+        MaxLevel: 10
+        RequiredLevel: 215
+      - Skill: MH_NEEDLE_STINGER
+        MaxLevel: 10
+        RequiredLevel: 230
+  - Class: Dieter
+    Name: Dieter
+    Food: Big_Cell
+    Race: Formless
+    Element: Fire
+    Size: Medium
+    Status:
+      - Type: Hp
+        Base: 80
+        GrowthMinimum: 240
+        GrowthMaximum: 480
+      - Type: Sp
+        Base: 11
+        GrowthMinimum: 40
+        GrowthMaximum: 120
+      - Type: Str
+        Base: 11
+        GrowthMinimum: 20
+        GrowthMaximum: 40
+      - Type: Agi
+        Base: 11
+        GrowthMinimum: 13
+        GrowthMaximum: 26
+      - Type: Vit
+        Base: 11
+        GrowthMinimum: 18
+        GrowthMaximum: 36
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 15
+        GrowthMaximum: 40
+      - Type: Dex
+        Base: 11
+        GrowthMinimum: 16
+        GrowthMaximum: 32
+      - Type: Luk
+        Base: 11
+        GrowthMinimum: 4
+        GrowthMaximum: 16
+    SkillTree:
+      - Skill: MH_MAGMA_FLOW
+        MaxLevel: 5
+        RequiredLevel: 122
+      - Skill: MH_GRANITIC_ARMOR
+        MaxLevel: 5
+        RequiredLevel: 116
+      - Skill: MH_LAVA_SLIDE
+        MaxLevel: 10
+        RequiredLevel: 109
+      - Skill: MH_PYROCLASTIC
+        MaxLevel: 10
+        RequiredLevel: 131
+      - Skill: MH_VOLCANIC_ASH
+        MaxLevel: 5
+        RequiredLevel: 102
+      - Skill: MH_BLAST_FORGE
+        MaxLevel: 10
+        RequiredLevel: 215
+      - Skill: MH_TEMPERING
+        MaxLevel: 10
+        RequiredLevel: 230
+      - Skill: MH_BLAZING_LAVA
+        MaxLevel: 10
+        RequiredLevel: 210
+  - Class: Eleanor
+    Name: Eleanor
+    Food: Bun_
+    Element: Poison
+    Size: Medium
+    Status:
+      - Type: Hp
+        Base: 320
+        GrowthMinimum: 60
+        GrowthMaximum: 300
+      - Type: Sp
+        Base: 10
+        GrowthMinimum: 10
+        GrowthMaximum: 20
+      - Type: Str
+        Base: 20
+        GrowthMinimum: 20
+        GrowthMaximum: 40
+      - Type: Agi
+        Base: 17
+        GrowthMinimum: 10
+        GrowthMaximum: 50
+      - Type: Vit
+        Base: 35
+        GrowthMinimum: 24
+        GrowthMaximum: 48
+      - Type: Int
+        Base: 11
+        GrowthMinimum: 5
+        GrowthMaximum: 15
+      - Type: Dex
+        Base: 24
+        GrowthMinimum: 12
+        GrowthMaximum: 36
+      - Type: Luk
+        Base: 12
+        GrowthMinimum: 2
+        GrowthMaximum: 10
+    SkillTree:
+      - Skill: MH_STYLE_CHANGE
+        MaxLevel: 1
+        RequiredLevel: 100
+      - Skill: MH_SONIC_CRAW
+        MaxLevel: 5
+        RequiredLevel: 100
+      - Skill: MH_SILVERVEIN_RUSH
+        MaxLevel: 10
+        RequiredLevel: 114
+      - Skill: MH_MIDNIGHT_FRENZY
+        MaxLevel: 10
+        RequiredLevel: 128
+      - Skill: MH_TINDER_BREAKER
+        MaxLevel: 5
+        RequiredLevel: 100
+      - Skill: MH_CBC
+        MaxLevel: 5
+        RequiredLevel: 112
+      - Skill: MH_EQC
+        MaxLevel: 5
+        RequiredLevel: 133
+      - Skill: MH_BRUSHUP_CLAW
+        MaxLevel: 10
+        RequiredLevel: 210
+      - Skill: MH_BLAZING_AND_FURIOUS
+        MaxLevel: 10
+        RequiredLevel: 215
+      - Skill: MH_THE_ONE_FIGHTER_RISES
+        MaxLevel: 10
+        RequiredLevel: 230

db/re/instance_db.yml

@@ -67,7 +67,7 @@ Body:
   - Id: 3
     Name: Orc's Memory
     Enter:
-      Map: 1@orcs 
+      Map: 1@orcs
       X: 179
       Y: 15
     AdditionalMaps:
@@ -345,3 +345,234 @@ Body:
       Map: 1@cor
       X: 176
       Y: 169
+  - Id: 44
+    Name: Half Moon In The Daylight
+    TimeLimit: 7200
+    Enter:
+      Map: 1@pop1
+      X: 47
+      Y: 133
+    AdditionalMaps:
+      1@pop2: true
+      1@pop3: true
+  - Id: 45
+    Name: Weekend Dungeon
+    TimeLimit: 3600
+    Enter:
+      Map: 1@md_pay
+      X: 240
+      Y: 29
+  - Id: 46
+    Name: Friday Dungeon
+    TimeLimit: 7200
+    Enter:
+      Map: 1@md_gef
+      X: 106
+      Y: 129
+  - Id: 47
+    Name: Poring Village
+    Enter:
+      Map: 1@begi
+      X: 100
+      Y: 22
+  - Id: 49
+    Name: Old Glast Heim (Challenge Mode)
+    Enter:
+      Map: 1@gl_he
+      X: 150
+      Y: 28
+  - Id: 50
+    Name: Old Glast Heim (Beginner)
+    Enter:
+      Map: 1@gl_k2
+      X: 150
+      Y: 20
+  - Id: 51
+    Name: Fall of Glast Heim (Normal)
+    Enter:
+      Map: 1@gl_prq
+      X: 299
+      Y: 19
+  - Id: 52
+    Name: Fall of Glast Heim (Advanced)
+    Enter:
+      Map: 1@gl_prq
+      X: 79
+      Y: 22
+  - Id: 53
+    Name: Twilight Garden
+    Enter:
+      Map: 1@bamn
+      X: 100
+      Y: 320
+    AdditionalMaps:
+       1@bamq: true
+  - Id: 54
+    Name: Hey! Sweety
+    Enter:
+      Map: 1@bamq
+      X: 16
+      Y: 39
+    AdditionalMaps:
+       1@bamn: true
+  - Id: 55
+    Name: Farm Lost in Time
+    Enter:
+      Map: 1@lost
+      X: 161
+      Y: 42
+  - Id: 56
+    Name: Water Garden
+    Enter:
+      Map: 1@ghg
+      X: 64
+      Y: 69
+  - Id: 57
+    Name: Water Garden Hard
+    Enter:
+      Map: 1@ghg
+      X: 64
+      Y: 69
+  - Id: 58
+    Name: Hidden Flower Garden
+    Enter:
+      Map: 1@herbs
+      X: 51
+      Y: 273
+  - Id: 59
+    Name: Security Area 1
+    Enter:
+      Map: 1@herbs
+      X: 45
+      Y: 208
+  - Id: 60
+    Name: Security Area 2
+    Enter:
+      Map: 1@herbs
+      X: 59
+      Y: 214
+  - Id: 61
+    Name: Sunken Tower
+    Enter:
+      Map: 1@ch_u
+      X: 13
+      Y: 59
+  - Id: 62
+    Name: Constellation Tower
+    Enter:
+      Map: 1@ch_t
+      X: 48
+      Y: 183
+    AdditionalMaps:
+       2@ch_t: true
+       3@ch_t: true
+  - Id: 63
+    Name: Tomb of Remorse
+    Enter:
+      Map: 1@spa2
+      X: 51
+      Y: 197
+  - Id: 64
+    Name: Geffen Night Arena
+    Enter:
+      Map: 1@ge_sn
+      X: 89
+      Y: 48
+  - Id: 65
+    Name: Airship Crash
+    Enter:
+      Map: 1@mjo1
+      X: 219
+      Y: 379
+    AdditionalMaps:
+      1@mjo2: true
+  - Id: 66
+    Name: Thanatos Tower
+    Enter:
+      Map: 1@thts
+      X: 74
+      Y: 371
+    AdditionalMaps:
+      2@thts: true
+      3@thts: true
+      4@thts: true
+      5@thts: true
+      6@thts: true
+      7@thts: true
+      8@thts: true
+  - Id: 67
+    Name: The Maze of Oz
+    Enter:
+      Map: 1@oz
+      X: 284
+      Y: 167
+  - Id: 68
+    Name: Thor Gunsu Base
+    Enter:
+      Map: 1@tcamp
+      X: 103
+      Y: 237
+  - Id: 69
+    Name: A Gathering Place of Wolves
+    Enter:
+      Map: 1@nyr
+      X: 194
+      Y: 30
+    AdditionalMaps:
+      2@nyr: true
+  - Id: 70
+    Name: Sanctuary Purification
+    Enter:
+      Map: 1@nyr
+      X: 194
+      Y: 30
+    AdditionalMaps:
+      2@nyr: true
+  - Id: 71
+    Name: Villa of High Priest
+    Enter:
+      Map: 1@adv
+      X: 123
+      Y: 17
+  - Id: 72
+    Name: Villa of Deception
+    Enter:
+      Map: 1@advs
+      X: 111
+      Y: 19
+  - Id: 73
+    Name: Villa of Deception Advanced
+    Enter:
+      Map: 1@advs
+      X: 111
+      Y: 19
+  - Id: 74
+    Name: Bagot Laboratory
+    Enter:
+      Map: 1@jorlab
+      X: 57
+      Y: 45
+  - Id: 75
+    Name: Confused Snake's Nest
+    Enter:
+      Map: 1@jorchs
+      X: 272
+      Y: 20
+  - Id: 76
+    Name: Iwin Patrol
+    Enter:
+      Map: 1@iwp
+      X: 380
+      Y: 229
+  - Id: 77
+    Name: Airship Destruction
+    Enter:
+      Map: 1@whl
+      X: 32
+      Y: 53
+  - Id: 78
+    Name: Simulation Battle
+    Enter:
+      Map: 1@jorlab
+      X: 57
+      Y: 45

db/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/re/item_noequip.txt

@@ -66,6 +66,60 @@
 11547,1		// Woe_Violet_Potion
 12600,1		// Treasure_Box_Scroll
 
+// Lesser Guild Member's Gear
+2052,1     // Woe_T_Staff1_Z
+1329,1     // Woe_One_Hand_Axe1_Z
+28751,1     // Woe_Knife1_Z
+32103,1    // Woe_Instrument1_Z
+26210,1    // Woe_Whip1_Z
+26019,1    // Woe_T_Lance1_Z
+16085,1    // Woe_Club_1_Z
+26147,1    // Woe_Wand1_Z
+28036,1    // Woe_Katar1_Z
+26146,1    // Woe_Healstaff1_Z
+21044,1    // Woe_Twohand_Sword1_Z
+28133,1    // Woe_Twohand_Axe1_Z
+32015,1    // Woe_Onehand_Spear1_Z
+18175,1    // Woe_Bow1_Z
+13490,1    // Woe_Onehand_Sword1_Z
+650000,1    // Woe_Huuma1_Z
+1859,1    // Woe_Pist1_Z
+22148,1    // Siege_Greave_1Tier
+15216,1    // Siege_Robe_1Tier
+20865,1    // Siege_Muffler_1Tier
+20864,1    // Siege_Manteau_1Tier
+22147,1    // Siege_Boots_1Tier
+22146,1    // Siege_Shoes_1Tier
+15217,1    // Siege_Suits_1Tier
+15218,1    // Siege_Plate_1Tier
+
+// Intermediate Guild Member's Gear
+520001,1    // Woe_One_Hand_Axe2_Z
+570003,1    // Woe_Instrument2_Z
+580003,1    // Woe_Whip2_Z
+510005,1    // Woe_Knife2_Z
+630001,1    // Woe_T_Lance2_Z
+590004,1    // Woe_Club_2_Z
+550005,1    // Woe_Wand2_Z
+610004,1    // Woe_Katar2_Z
+550004,1    // Woe_Healstaff2_Z
+600005,1    // Woe_Twohand_Sword2_Z
+620001,1    // Woe_Twohand_Axe2_Z
+640001,1    // Woe_T_Staff2_Z
+530001,1    // Woe_Onehand_Spear2_Z
+650001,1    // Woe_Huuma2_Z
+500006,1    // Woe_Onehand_Sword2_Z
+560003,1    // Woe_Pist2_Z
+700005,1    // Woe_Bow2_Z
+450012,1    // Siege_Robe_2Tier
+470011,1    // Siege_Shoes_2Tier
+450014,1    // Siege_Plate_2Tier
+450013,1    // Siege_Suits_2Tier
+470012,1    // Siege_Boots_2Tier
+480007,1    // Siege_Muffler_2Tier
+480008,1    // Siege_Manteau_2Tier
+470013,1    // Siege_Greave_2Tier
+
 //----------------------------------------------------------------------------
 // PVP
 //----------------------------------------------------------------------------
@@ -209,6 +263,60 @@
 12600,16	// Treasure_Box_Scroll
 14590,16	// Pty_Assumptio_Scroll
 
+// Lesser Guild Member's Gear
+2052,16     // Woe_T_Staff1_Z
+1329,16     // Woe_One_Hand_Axe1_Z
+28751,16     // Woe_Knife1_Z
+32103,16    // Woe_Instrument1_Z
+26210,16    // Woe_Whip1_Z
+26019,16    // Woe_T_Lance1_Z
+16085,16    // Woe_Club_1_Z
+26147,16    // Woe_Wand1_Z
+28036,16    // Woe_Katar1_Z
+26146,16    // Woe_Healstaff1_Z
+21044,16    // Woe_Twohand_Sword1_Z
+28133,16    // Woe_Twohand_Axe1_Z
+32015,16    // Woe_Onehand_Spear1_Z
+18175,16    // Woe_Bow1_Z
+13490,16    // Woe_Onehand_Sword1_Z
+650000,16    // Woe_Huuma1_Z
+1859,16    // Woe_Pist1_Z
+22148,16    // Siege_Greave_1Tier
+15216,16    // Siege_Robe_1Tier
+20865,16    // Siege_Muffler_1Tier
+20864,16    // Siege_Manteau_1Tier
+22147,16    // Siege_Boots_1Tier
+22146,16    // Siege_Shoes_1Tier
+15217,16    // Siege_Suits_1Tier
+15218,16    // Siege_Plate_1Tier
+
+// Intermediate Guild Member's Gear
+520001,16    // Woe_One_Hand_Axe2_Z
+570003,16    // Woe_Instrument2_Z
+580003,16    // Woe_Whip2_Z
+510005,16    // Woe_Knife2_Z
+630001,16    // Woe_T_Lance2_Z
+590004,16    // Woe_Club_2_Z
+550005,16    // Woe_Wand2_Z
+610004,16    // Woe_Katar2_Z
+550004,16    // Woe_Healstaff2_Z
+600005,16    // Woe_Twohand_Sword2_Z
+620001,16    // Woe_Twohand_Axe2_Z
+640001,16    // Woe_T_Staff2_Z
+530001,16    // Woe_Onehand_Spear2_Z
+650001,16    // Woe_Huuma2_Z
+500006,16    // Woe_Onehand_Sword2_Z
+560003,16    // Woe_Pist2_Z
+700005,16    // Woe_Bow2_Z
+450012,16    // Siege_Robe_2Tier
+470011,16    // Siege_Shoes_2Tier
+450014,16    // Siege_Plate_2Tier
+450013,16    // Siege_Suits_2Tier
+470012,16    // Siege_Boots_2Tier
+480007,16    // Siege_Muffler_2Tier
+480008,16    // Siege_Manteau_2Tier
+470013,16    // Siege_Greave_2Tier
+
 //----------------------------------------------------------------------------
 // Zone 1 - Aldebaran Turbo Track
 //----------------------------------------------------------------------------

db/re/item_packages.yml

@@ -180,34 +180,34 @@ Body:
     Groups:
       - Group: 0
         Items:
-          - Item: Attacker_Booster_Plate_
-          - Item: Attacker_Booster_Manteau_
-          - Item: Attacker_Booster_Greaves_
-          - Item: Attacker_Booster_Ring
+          - Item: Atker_Plate
+          - Item: Atker_Manteau
+          - Item: Atker_Greave
+          - Item: Atker_Ring
           - Item: Boost_Up_1
             Amount: 3
       - Group: 1
         Items:
-          - Item: Ranger_Booster_Suits_
-          - Item: Ranger_Booster_Manteau_
-          - Item: Ranger_Booster_Boots_
-          - Item: Range_Booster_Brooch
+          - Item: Ran_Suits
+          - Item: Ran_Manteau
+          - Item: Ran_Boots
+          - Item: Ran_Brooch
           - Item: Boost_Up_1
             Amount: 3
       - Group: 2
         Items:
-          - Item: Elemental_Booster_Robe_
-          - Item: Elemental_Booster_Muffler_
-          - Item: Elemental_Booster_Shoes_
-          - Item: Elemental_Booster_Earring
+          - Item: Ele_Robe
+          - Item: Ele_Muffler
+          - Item: Ele_Shoes
+          - Item: Ele_Earing
           - Item: Boost_Up_1
             Amount: 3
       - Group: 3
         Items:
-          - Item: Defender_Booster_Robe_
-          - Item: Defender_Booster_Muffler_
-          - Item: Defender_Booster_Shoes_
-          - Item: Defender_Booster_Earring
+          - Item: Defn_Robe
+          - Item: Defn_Muffler
+          - Item: Defn_Shoes
+          - Item: Defn_Earing
           - Item: Boost_Up_1
             Amount: 3
   - Item: Special_Coin_Pack

db/re/map_drops.yml

@@ -27,7 +27,7 @@
 #                                   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.
+#       Rate                        Drop rate of item, n/100000.
 #       RandomOptionGroup           Random Option Group applied to item on drop. (Default: None)
 #   SpecificDrops                   Drops for specific monsters on this map. (Default: empty)
 #     - Monster                     Monster name.
@@ -35,10 +35,173 @@
 #                                   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.
+#           Rate                    Drop rate of item, n/100000.
 #           RandomOptionGroup       Random Option Group applied to item on drop. (Default: None)
 ###########################################################################
 
 Header:
   Type: MAP_DROP_DB
-  Version: 1
+  Version: 2
+
+Body:
+  - Map: tur_d03_i
+    SpecificDrops:
+      - Monster: ILL_ASSULTER
+        Drops:
+          - Index: 0
+            Item: IllusionStone
+            Rate: 10
+          - Index: 1
+            Item: Huuma_Bird_Wing_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_PERMETER
+        Drops:
+          - Index: 0
+            Item: Fancy_Flower_IL
+            Rate: 25
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_FREEZER
+        Drops:
+          - Index: 0
+            Item: Immaterial_Sword_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_SOLIDER
+        Drops:
+          - Index: 0
+            Item: Iron_Driver_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: War_Axe_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 3
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_HEATER
+        Drops:
+          - Index: 0
+            Item: Pole_Axe_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+  - Map: tur_d04_i
+    SpecificDrops:
+      - Monster: ILL_ASSULTER
+        Drops:
+          - Index: 0
+            Item: IllusionStone
+            Rate: 10
+          - Index: 1
+            Item: Huuma_Bird_Wing_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_PERMETER
+        Drops:
+          - Index: 0
+            Item: Fancy_Flower_IL
+            Rate: 25
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_FREEZER
+        Drops:
+          - Index: 0
+            Item: Immaterial_Sword_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_SOLIDER
+        Drops:
+          - Index: 0
+            Item: Iron_Driver_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: War_Axe_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 3
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_HEATER
+        Drops:
+          - Index: 0
+            Item: Pole_Axe_IL
+            Rate: 25
+            RandomOptionGroup: ILL_PHYSIC_NORMAL
+          - Index: 1
+            Item: IllusionStone
+            Rate: 10
+          - Index: 2
+            Item: Turtle_Is_Box_IL
+            Rate: 5
+      - Monster: ILL_TURTLE_GENERAL
+        Drops:
+          - Index: 0
+            Item: Fancy_Flower_IL
+            Rate: 5000
+          - Index: 1
+            Item: Immaterial_Sword_IL
+            Rate: 5000
+            RandomOptionGroup: ILL_PHYSIC_BOSS
+          - Index: 2
+            Item: Iron_Driver_IL
+            Rate: 5000
+            RandomOptionGroup: ILL_PHYSIC_BOSS
+          - Index: 3
+            Item: Pole_Axe_IL
+            Rate: 5000
+            RandomOptionGroup: ILL_PHYSIC_BOSS
+          - Index: 4
+            Item: IllusionStone
+            Rate: 15000
+          - Index: 5
+            Item: War_Axe_IL
+            Rate: 5000
+            RandomOptionGroup: ILL_PHYSIC_BOSS
+          - Index: 6
+            Item: Huuma_Bird_Wing_IL
+            Rate: 5000
+            RandomOptionGroup: ILL_PHYSIC_BOSS
+          - Index: 7
+            Item: S_Turtle_Is_Box_IL
+            Rate: 150

db/re/mercenary_db.yml

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

db/re/pet_db.yml

@@ -112,7 +112,7 @@ Body:
             Amount: 1
       - Target: SWEETS_DROPS
         ItemRequirements:
-          - Item: Sweets_Festival_Coin
+          - Item: Sweets_Coin
             Amount: 500
           - Item: Candy
             Amount: 50
@@ -168,7 +168,6 @@ Body:
             Amount: 30
           - Item: Leaf_Lunatic_Card
             Amount: 1
-
   - Mob: PICKY
     TameItem: Earthworm_The_Dude
     EggItem: Picky_Egg
@@ -1361,7 +1360,7 @@ Body:
   - Mob: TEDDY_BEAR
     TameItem: Little_Dall_Needle
     EggItem: Teddy_Bear_Egg
-    FoodItem: Cotton_Tufts
+    FoodItem: Wad_Of_Cotton
     Fullness: 3
     IntimacyFed: 50
     CaptureRate: 2000
@@ -1498,7 +1497,7 @@ Body:
       }
   - Mob: MOONLIGHT
     EggItem: Moonlight_Egg
-    FoodItem: Luxurious_Pet_Food
+    FoodItem: High_Class_Pet_food
     Fullness: 1
     HungryDelay: 120
     IntimacyFed: 15
@@ -1922,7 +1921,7 @@ Body:
         bonus bAspdRate,1;
       }
   - Mob: SWEETS_DROPS
-    EggItem: Sweet_Drops_Egg
+    EggItem: Sweets_Drops_Egg
     FoodItem: Candy
     Fullness: 2
     HungryDelay: 120
@@ -2060,7 +2059,7 @@ Body:
       }
 #  - Mob: BACSOJIN2
 #    EggItem: Bacsojin2_Egg_
-#    FoodItem: Luxurious_Pet_Food
+#    FoodItem: High_Class_Pet_food
 #    Fullness: 7
 #    IntimacyFed: 10
 #    CaptureRate: 0
@@ -2083,7 +2082,7 @@ Body:
 #      }
 #  - Mob: ORK_HERO2
 #    EggItem: Orc_Hero_Egg_
-#    FoodItem: Luxurious_Pet_Food
+#    FoodItem: High_Class_Pet_food
 #    Fullness: 2
 #    HungryDelay: 120
 #    IntimacyFed: 15
@@ -2104,3 +2103,70 @@ Body:
 #      } else {
 #        bonus bAtkRate,1;
 #      }
+#  - Mob: PHREEONI2
+#    EggItem: Phreeoni_Egg
+#    FoodItem: High_Class_Pet_food
+#    Fullness: 2   # unknown
+#    HungryDelay: 120   # unknown
+#    IntimacyFed: 15   # unknown
+#    CaptureRate: 0   # unknown
+#    SpecialPerformance: false   # unknown
+#    AllowAutoFeed: true
+#    Script: >
+#      .@intimate = getpetinfo(PETINFO_INTIMATE);
+#      if (.@intimate == PET_INTIMATE_AWKWARD || .@intimate == PET_INTIMATE_SHY) {
+#         bonus bHit,6;
+#      }
+#      if (.@intimate == PET_INTIMATE_NEUTRAL) {
+#         bonus bHit,10;
+#         bonus bPerfectHitRate,5;
+#      }
+#      if (.@intimate == PET_INTIMATE_CORDIAL) {
+#         bonus bHit,14;
+#         bonus bPerfectHitRate,10;
+#      }
+#      if (.@intimate == PET_INTIMATE_LOYAL) {
+#         bonus bHit,18;
+#         bonus bPerfectHitRate,15;
+#      }
+  - Mob: EP17_2_CHILD_ADMIN1
+    CaptureRate : 1000
+    EggItem: Ep17_2_C_Admin1_Egg
+    EquipItem: Ep_17_2_C_Admin1_Acc
+    FoodItem: Cloud_Cotton
+    Fullness: 2
+    IntimacyFed: 20
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      if (.@i >= PET_INTIMATE_LOYAL) {
+        bonus2 bAddRace2,RC2_EP172BETA,10;
+      } else if (.@i >= PET_INTIMATE_CORDIAL) {
+        bonus2 bAddRace2,RC2_EP172BETA,6;
+      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
+        bonus2 bAddRace2,RC2_EP172BETA,3;
+      }
+    Evolution:
+      - Target: EP17_2_CHILD_ADMIN2
+        ItemRequirements:
+          - Item: Mystery_Piece
+            Amount: 10
+          - Item: Broken_Steel_Piece
+            Amount: 50
+          - Item: BarMealTicket
+            Amount: 500
+  - Mob: EP17_2_CHILD_ADMIN2
+    CaptureRate : 1000
+    EggItem: Ep17_2_C_Admin2_Egg
+    EquipItem: Ep_17_2_C_Admin2_Acc
+    FoodItem: Pet_Food
+    Fullness: 2
+    IntimacyFed: 20
+    Script: >
+      .@i = getpetinfo(PETINFO_INTIMATE);
+      if (.@i >= PET_INTIMATE_LOYAL) {
+        bonus2 bAddRace2,RC2_EP172ALPHA,15;
+      } else if (.@i >= PET_INTIMATE_CORDIAL) {
+        bonus2 bAddRace2,RC2_EP172ALPHA,8;
+      } else if (.@i >= PET_INTIMATE_NEUTRAL) {
+        bonus2 bAddRace2,RC2_EP172ALPHA,4;
+      }