Merge branch 'master' into cleanup/removeonchangemap

* Reverts unit_remove_map() back to a macro as the preprocessors will point to the static function instead of the calling function.
* Adds third argument to unit_remove_map() macro for changing zone identification.

.github/workflows/analysis_codeql.yml

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

@@ -3,10 +3,9 @@ name: Build servers with Clang
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/build_servers_cmake.yml

@@ -3,10 +3,9 @@ name: Build servers with CMake
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/build_servers_gcc.yml

@@ -3,10 +3,9 @@ name: Build servers with GCC
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/build_servers_modes.yml

@@ -3,10 +3,9 @@ name: Build servers in Pre-Renewal and Renewal
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/build_servers_msbuild.yml

@@ -3,10 +3,9 @@ name: Build servers with MSVS
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/build_servers_packetversions.yml

@@ -3,10 +3,9 @@ name: Build servers with different packet versions
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/build_servers_vip.yml

@@ -3,10 +3,9 @@ name: Build servers in VIP mode
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/npc_db_validation.yml

@@ -6,10 +6,9 @@ name: Validate NPC Scripts and DB Changes
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: true
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master

CMakeLists.txt

@@ -35,7 +35,7 @@ project( rAthena )
 if( CYGWIN )
 	unset( WIN32 )
 endif()
-set(CMAKE_CXX_STANDARD 14) # C++14...
+set(CMAKE_CXX_STANDARD 11) # C++11...
 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
-![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)
+[![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)
 > 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 2017 or newer](https://www.visualstudio.com/downloads/)
+Windows | [MS Visual Studio 2013, 2015, 2017](https://www.visualstudio.com/downloads/)
 
 ### Required Applications
 Application | Name

conf/battle/client.conf

@@ -158,14 +158,3 @@ macro_detection_retry: 3
 // 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,11 +33,6 @@ 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
@@ -72,10 +67,6 @@ 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
@@ -146,32 +137,8 @@ feature.dynamicnpc_rangey: 2
 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,
+// Generates <ITEML> string for an item and can be used for npctalk, message,
 // dispbottom, and broadcast commands. The result is clickable-item name just
 // like from SHIFT+Click from player's inventory/cart/equipment window.
-// Requires: 2015-11-04Ragexe or later
+// Requires: 2010-00-00RagexeRE 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: 250
+homunculus_S_max_level: 175
 
 // Growth level for Homunculus S
 // This is the level at which homunculus S can use their growth tables

conf/battle/monster.conf

@@ -297,8 +297,3 @@ 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

@@ -198,9 +198,6 @@ 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/inter_athena.conf

@@ -147,6 +147,8 @@ 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
@@ -156,7 +158,6 @@ 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
@@ -165,7 +166,7 @@ roulette_table: db_roulette
 guild_storage_log: guild_storage_log
 
 // Web Database Tables
-// NOTE: The web server reads the login (login) and char (party,guild) tables and map (party_bookings), so it needs
+// NOTE: The web server reads the login (login) and char (guild) tables, so it needs
 //       the ability to connect to those databases.
 guild_emblems: guild_emblems
 user_configs: user_configs

conf/maps_athena.conf

@@ -1517,9 +1517,6 @@ 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
@@ -1538,11 +1535,6 @@ 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
@@ -1566,31 +1558,5 @@ 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,10 +927,7 @@
 // Enchant UI
 829: Enchanting is not possible for your item's enchant grade.
 
-// @reloadbarterdb
-830: Barter database has been reloaded.
-
-//831-899 free
+//830-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1447,7 +1444,7 @@
 
 // @iteminfo
 1276: Please enter an item name/ID (usage: @ii/@iteminfo <item name/ID>).
-1277: Item: '%s'/'%s' (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
 1278: None
 1279: With script
 1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f
@@ -1457,7 +1454,7 @@
 
 // @whodrops
 1284: Please enter item name/ID (usage: @whodrops <item name/ID>).
-1285: Item: '%s' (ID: %u)
+1285: Item: '%s'[%d] (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' (%u) 類型: %s | 額外效果: %s
+1277: 物品: '%s'/'%s'[%d] (%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' (ID:%d)
+1285: Item: '%s'[%d] (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' (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%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' (ID:%d)
+1285: Objet: '%s'[%d] (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' (%u) Jenis: %s | Efek tambahan: %s
+1277: Item: '%s'/'%s'[%d] (%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' (ID:%d)
+1285: Item: '%s'[%d] (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' (%u) Tipo: %s | Efeito Extra: %s
+1277: Item: '%s'/'%s'[%d] (%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' (ID:%d)
+1285: Item: '%s'[%d] (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' (%u) Тип: %s | Доп. эффект: %s
+1277: Предмет: '%s'/'%s'[%d] (%u) Тип: %s | Доп. эффект: %s
 1278: Пусто
 1279: Скрипт
 1280: НИП покупка:%d зени, продажа:%d зени | Вес: %.1f 
@@ -1215,7 +1215,7 @@
 
 // @whodrops
 1284: Введите ID/название предмета (Использование: @whodrops <ID/название предмета>).
-1285: Предмет: '%s' (ID:%d)
+1285: Предмет: '%s'[%d] (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' (%u) Tipo: %s | Efecto: %s
+1277: Objeto: '%s'/'%s'[%d] (%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' (ID:%d)
+1285: Objeto: '%s'[%d] (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' (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%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' (ID:%d)
+1285: Item: '%s'[%d] (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++14"
-#CXXFLAGS="$CXXFLAGS -std=gnu++14"
-CXXFLAG_CLEARS="-std=c++14"
+CXXFLAGS="$CXXFLAGS -std=c++11"
+#CXXFLAGS="$CXXFLAGS -std=gnu++11"
+CXXFLAG_CLEARS="-std=c++11"
 
  { $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++14 $CPPFLAGS"
+CXXFLAG_CLEARS="-std=c++11 $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++14"
-#CXXFLAGS="$CXXFLAGS -std=gnu++14"
-CXXFLAG_CLEARS="-std=c++14"
+CXXFLAGS="$CXXFLAGS -std=c++11"
+#CXXFLAGS="$CXXFLAGS -std=gnu++11"
+CXXFLAG_CLEARS="-std=c++11"
 
 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++14 $CPPFLAGS"
+CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS"
 CFLAGS="$OPT_LTO $CFLAGS" 
 CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 AC_SUBST([CFLAGS_AR])

db/castle_db.yml

@@ -26,18 +26,174 @@
 #   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: 2
+  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
 
 Footer:
   Imports:

db/enchantgrade.yml

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2023 rAthena Development Team
+#   Copyright(C) 2022 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27,9 +27,8 @@
 #     - Level                           Item level.
 #       Grades:                         Enchantgrade settings per grade level.
 #         - Grade                       Enchantgrade level.
-#           Chances:                    Chance settings per refine level.
-#             - Refine                  Refine level.
-#               Chance                  Base chance of success out of 0~10000.
+#           Refine                      Required refine level.
+#           Chance                      Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
 #           AnnounceSuccess             Announce on upgrade success. (Default: true)
 #           AnnounceFail                Announce on upgrade failure. (Default: false)
@@ -52,7 +51,7 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 3
+  Version: 2
 
 Footer:
   Imports:

db/homun_skill_tree.txt

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

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

@@ -26,15 +26,8 @@
 #   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: 2
+  Version: 1

db/import-tmpl/enchantgrade.yml

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2023 rAthena Development Team
+#   Copyright(C) 2022 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27,9 +27,8 @@
 #     - Level                           Item level.
 #       Grades:                         Enchantgrade settings per grade level.
 #         - Grade                       Enchantgrade level.
-#           Chances:                    Chance settings per refine level.
-#             - Refine                  Refine level.
-#               Chance                  Base chance of success out of 0~10000.
+#           Refine                      Required refine level.
+#           Chance                      Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
 #           AnnounceSuccess             Announce on upgrade success. (Default: true)
 #           AnnounceFail                Announce on upgrade failure. (Default: false)
@@ -52,4 +51,4 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 3
+  Version: 2

db/import-tmpl/homun_skill_tree.txt

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

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

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

@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# 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

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

db/item_cash.yml

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

db/map_index.txt

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

@@ -26,242 +26,8 @@
 #   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: 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
+  Version: 1

db/pre-re/homunculus_db.txt

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

@@ -1,623 +0,0 @@
-# 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/item_cash_db.txt

@@ -0,0 +1,19 @@
+// 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,45 +7433,3 @@ 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/status.yml

@@ -245,7 +245,6 @@ Body:
       BossResist: true
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -274,7 +273,6 @@ Body:
       BossResist: true
       Debuff: true
       NoSaveInfinite: true
-      RemoveOnHermode: true
     EndOnStart:
       Freeze: true
       Stone: true
@@ -298,7 +296,6 @@ Body:
       Quicken: true
     Flags:
       RequireWeapon: true
-      RemoveOnHermode: true
     Fail:
       Decreaseagi: true
   - Status: Concentrate
@@ -309,7 +306,6 @@ Body:
       Dex: true
     Flags:
       FailedMado: true
-      RemoveOnHermode: true
     Fail:
       Quagmire: true
   - Status: Hiding
@@ -328,10 +324,11 @@ Body:
       OnTouch: true
       StopAttacking: true
       RemoveOnDamaged: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       NoBanishingBuster: true
       NoDispell: true
       NoClearance: true
+      NoSave: true
     EndOnStart:
       Closeconfine: true
       Closeconfine2: true
@@ -360,7 +357,6 @@ Body:
       Atk_Ele: true
     Flags:
       RemoveOnUnequipWeapon: true
-      RemoveOnHermode: true
     EndOnStart:
       Aspersio: true
       Fireweapon: true
@@ -373,8 +369,6 @@ Body:
   - Status: Poisonreact
     Icon: EFST_POISONREACT
     DurationLookup: AS_POISONREACT
-    Flags:
-      RemoveOnHermode: true
   - Status: Quagmire
     Icon: EFST_QUAGMIRE
     DurationLookup: WZ_QUAGMIRE
@@ -387,7 +381,6 @@ Body:
       NoSave: true
       NoClearance: true
       Debuff: true
-      RemoveOnHermode: true
     Fail:
       Speedup1: true
     EndOnStart:
@@ -415,7 +408,6 @@ Body:
       Angelus: true
     Flags:
       SendOption: true
-      RemoveOnHermode: true
   - Status: Blessing
     Icon: EFST_BLESSING
     DurationLookup: AL_BLESSING
@@ -426,7 +418,6 @@ Body:
     Flags:
       BossResist: true
       TaekwonAngel: true
-      RemoveOnHermode: true
   - Status: Signumcrucis
     Icon: EFST_CRUCIS
     DurationLookup: AL_CRUCIS
@@ -446,7 +437,6 @@ Body:
     Flags:
       FailedMado: true
       TaekwonAngel: true
-      RemoveOnHermode: true
     Fail:
       Quagmire: true
     EndOnStart:
@@ -462,7 +452,6 @@ Body:
       BossResist: true
       NoSave: true
       Debuff: true
-      RemoveOnHermode: true
     Fail:
       Speedup1: true
     EndOnStart:
@@ -481,7 +470,6 @@ Body:
     DurationLookup: PR_SLOWPOISON
     Flags:
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Impositio
     Icon: EFST_IMPOSITIO
     DurationLookup: PR_IMPOSITIO
@@ -489,7 +477,6 @@ Body:
       Watk: true
     Flags:
       SuperNoviceAngel: true
-      RemoveOnHermode: true
     EndOnStart:
       Impositio: true
   - Status: Suffragium
@@ -497,7 +484,6 @@ Body:
     DurationLookup: PR_SUFFRAGIUM
     Flags:
       SuperNoviceAngel: true
-      RemoveOnHermode: true
   - Status: Aspersio
     Icon: EFST_ASPERSIO
     DurationLookup: PR_ASPERSIO
@@ -505,7 +491,6 @@ Body:
       Atk_Ele: true
     Flags:
       RemoveOnUnequipWeapon: true
-      RemoveOnHermode: true
     EndOnStart:
       Encpoison: true
       Fireweapon: true
@@ -524,13 +509,11 @@ Body:
       NoSave: true
       NoClearance: true
       #RemoveOnUnequipArmor: true
-      RemoveOnHermode: true
   - Status: Kyrie
     Icon: EFST_KYRIE
     DurationLookup: PR_KYRIE
     Flags:
       SuperNoviceAngel: true
-      RemoveOnHermode: true
     EndOnStart:
       Assumptio: true
   - Status: Magnificat
@@ -542,7 +525,6 @@ Body:
       FailedMado: true
       NoSave: true
       SuperNoviceAngel: true
-      RemoveOnHermode: true
   - Status: Gloria
     Icon: EFST_GLORIA
     DurationLookup: PR_GLORIA
@@ -550,13 +532,11 @@ Body:
       Luk: true
     Flags:
       SuperNoviceAngel: true
-      RemoveOnHermode: true
   - Status: Aeterna
     Icon: EFST_LEXAETERNA
     DurationLookup: PR_LEXAETERNA
     Flags:
       NoSave: true
-      RemoveOnHermode: true
     Fail:
       Stone: true
       Freeze: true
@@ -568,7 +548,6 @@ Body:
     Flags:
       MadoCancel: true
       RequireWeapon: true
-      RemoveOnHermode: true
     Fail:
       Quagmire: true
       Decreaseagi: true
@@ -577,7 +556,6 @@ Body:
     DurationLookup: BS_WEAPONPERFECT
     Flags:
       MadoCancel: true
-      RemoveOnHermode: true
   - Status: Overthrust
     Icon: EFST_OVERTHRUST
     DurationLookup: BS_OVERTHRUST
@@ -585,7 +563,6 @@ Body:
       OverThrust: true
     Flags:
       MadoCancel: true
-      RemoveOnHermode: true
     Fail:
       Maxoverthrust: true
   - Status: Maximizepower
@@ -595,7 +572,6 @@ Body:
       Regen: true
     Flags:
       MadoCancel: true
-      RemoveOnHermode: true
   - Status: Trickdead
     Icon: EFST_TRICKDEAD
     DurationLookup: NV_TRICKDEAD
@@ -614,8 +590,7 @@ Body:
       RemoveOnDamaged: true
       NoSave: true
       NoClearance: true
-      RemoveOnChangeMap: true
-      RemoveOnHermode: true
+      RemoveOnMapWarp: true
     EndOnStart:
       Dancing: true
   - Status: Loud
@@ -625,14 +600,11 @@ Body:
       Str: true
     Flags:
       MadoCancel: true
-      RemoveOnHermode: true
   - Status: Energycoat
     Icon: EFST_ENERGYCOAT
     DurationLookup: MG_ENERGYCOAT
     Opt3:
       EnergyCoat: true
-    Flags:
-      RemoveOnHermode: true
   - Status: Brokenarmor
     Icon: EFST_BROKENARMOR
     DurationLookup: NPC_ARMORBRAKE
@@ -684,14 +656,12 @@ Body:
     Flags:
       NoClearance: true
       OverlapIgnoreLevel: true
-      RemoveOnHermode: true
   - Status: Aspdpotion2
     Icon: EFST_ATTHASTE_POTION3
     CalcFlags:
       Aspd: true
     Flags:
       OverlapIgnoreLevel: true
-      RemoveOnHermode: true
   - Status: Aspdpotion3
     Icon: EFST_ATTHASTE_INFINITY
     CalcFlags:
@@ -699,7 +669,6 @@ Body:
     Flags:
       NoClearance: true
       OverlapIgnoreLevel: true
-      RemoveOnHermode: true
   - Status: Speedup0
     Icon: EFST_MOVHASTE_HORSE
     CalcFlags:
@@ -717,7 +686,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Atkpotion
     Icon: EFST_PLUSATTACKPOWER
     CalcFlags:
@@ -726,7 +694,6 @@ Body:
       NoRemoveOnDead: true
       NoClearance: true
       OverlapIgnoreLevel: true
-      RemoveOnHermode: true
   - Status: Matkpotion
     Icon: EFST_PLUSMAGICPOWER
     CalcFlags:
@@ -735,7 +702,6 @@ Body:
       NoRemoveOnDead: true
       NoClearance: true
       OverlapIgnoreLevel: true
-      RemoveOnHermode: true
   - Status: Wedding
     States:
       NoAttack: true
@@ -766,7 +732,8 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
+      NoSave: true
     MinDuration: 5000
   - Status: Keeping
     DurationLookup: NPC_KEEPING
@@ -778,8 +745,6 @@ Body:
     CalcFlags:
       Mdef: true
       Def: true
-    Flags:
-      RemoveOnHermode: true
   - Status: Stripweapon
     Icon: EFST_NOEQUIPWEAPON
     DurationLookup: RG_STRIPWEAPON
@@ -792,7 +757,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnHermode: true
   - Status: Stripshield
     Icon: EFST_NOEQUIPSHIELD
     DurationLookup: RG_STRIPSHIELD
@@ -805,7 +769,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnHermode: true
   - Status: Striparmor
     Icon: EFST_NOEQUIPARMOR
     DurationLookup: RG_STRIPARMOR
@@ -818,7 +781,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnHermode: true
   - Status: Striphelm
     Icon: EFST_NOEQUIPHELM
     DurationLookup: RG_STRIPHELM
@@ -831,7 +793,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnHermode: true
   - Status: Cp_Weapon
     Icon: EFST_PROTECTWEAPON
     DurationLookup: AM_CP_WEAPON
@@ -841,7 +802,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveChemicalProtect: true
-      RemoveOnHermode: true
   - Status: Cp_Shield
     Icon: EFST_PROTECTSHIELD
     DurationLookup: AM_CP_SHIELD
@@ -851,7 +811,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveChemicalProtect: true
-      RemoveOnHermode: true
   - Status: Cp_Armor
     Icon: EFST_PROTECTARMOR
     DurationLookup: AM_CP_ARMOR
@@ -861,7 +820,6 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveChemicalProtect: true
-      RemoveOnHermode: true
   - Status: Cp_Helm
     Icon: EFST_PROTECTHELM
     DurationLookup: AM_CP_HELM
@@ -871,21 +829,18 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveChemicalProtect: true
-      RemoveOnHermode: true
   - Status: Autoguard
     Icon: EFST_AUTOGUARD
     DurationLookup: CR_AUTOGUARD
     Flags:
       NoClearance: true
       RequireShield: true
-      RemoveOnHermode: true
   - Status: Reflectshield
     Icon: EFST_REFLECTSHIELD
     DurationLookup: CR_REFLECTSHIELD
     Flags:
       NoClearance: true
       RequireShield: true
-      RemoveOnHermode: true
     EndOnStart:
       Reflectdamage: true
   - Status: Splasher
@@ -898,7 +853,6 @@ Body:
       All: true
     Flags:
       NoSave: true
-      RemoveOnHermode: true
   - Status: Defender
     Icon: EFST_DEFENDER
     DurationLookup: CR_DEFENDER
@@ -907,13 +861,11 @@ Body:
       Aspd: true
     Flags:
       RequireShield: true
-      RemoveOnHermode: true
   - Status: Magicrod
     Icon: EFST_MAGICROD
     DurationLookup: SA_MAGICROD
     Flags:
       NoSave: true
-      RemoveOnHermode: true
   - Status: Spellbreaker
     Flags:
       NoWarning: true
@@ -947,7 +899,6 @@ Body:
     Flags:
       FailedMado: true
       RequireWeapon: true
-      RemoveOnHermode: true
     Fail:
       Quagmire: true
   - Status: Autocounter
@@ -1002,7 +953,6 @@ Body:
       Debuff: true
       NoClearance: true
       NoSave: true
-      RemoveOnHermode: true
   - Status: Combo
     Flags:
       NoClearbuff: true
@@ -1015,7 +965,8 @@ Body:
     States:
       NoMove: true
     Flags:
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
+      NoSave: true
   - Status: Bladestop
     Icon: EFST_BLADESTOP
     DurationLookup: MO_BLADESTOP
@@ -1032,8 +983,7 @@ Body:
       NoClearbuff: true
       NoSave: true
       NoClearance: true
-      RemoveOnChangeMap: true
-      RemoveOnHermode: true
+      RemoveOnMapWarp: true
   - Status: Fireweapon
     Icon: EFST_PROPERTYFIRE
     DurationLookup: SA_FLAMELAUNCHER
@@ -1102,7 +1052,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Deluge
     Icon: EFST_GROUNDMAGIC
     DurationLookup: SA_DELUGE
@@ -1162,7 +1111,6 @@ Body:
     Flags:
       NoSave: true
       RequireWeapon: true
-      RemoveOnHermode: true
   - Status: Parrying
     Icon: EFST_PARRYING
     DurationLookup: LK_PARRYING
@@ -1170,7 +1118,6 @@ Body:
       NoSave: true
       NoClearance: true
       RequireWeapon: true
-      RemoveOnHermode: true
   - Status: Concentration
     Icon: EFST_LKCONCENTRATION
     DurationLookup: LK_CONCENTRATION
@@ -1184,7 +1131,6 @@ Body:
       Quicken: true
     Flags:
       NoSave: true
-      RemoveOnHermode: true
   - Status: Tensionrelax
     Icon: EFST_TENSIONRELAX
     DurationLookup: LK_TENSIONRELAX
@@ -1193,7 +1139,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Berserk
     Icon: EFST_BERSERK
     DurationLookup: LK_BERSERK
@@ -1234,7 +1179,6 @@ Body:
       Aspd: true
     Flags:
       NoSave: true
-      RemoveOnHermode: true
   - Status: Assumptio
     Icon: EFST_ASSUMPTIO
     DurationLookup: HP_ASSUMPTIO
@@ -1243,8 +1187,6 @@ Body:
     EndOnStart:
       Kyrie: true
       Kaite: true
-    Flags:
-      RemoveOnHermode: true
   - Status: Basilica
     DurationLookup: HP_BASILICA
     States:
@@ -1254,8 +1196,7 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnChangeMap: true
-      RemoveOnHermode: true
+      RemoveOnMapWarp: true
   - Status: Guildaura
     Flags:
       NoDispell: true
@@ -1268,7 +1209,6 @@ Body:
       Matk: true
     Flags:
       NoSave: true
-      RemoveOnHermode: true
     EndOnStart:
       Magicpower: true
   - Status: Edp
@@ -1294,7 +1234,6 @@ Body:
     Flags:
       FailedMado: true
       NoSave: true
-      RemoveOnHermode: true
     Fail:
       Quagmire: true
   - Status: Windwalk
@@ -1306,7 +1245,6 @@ Body:
     Flags:
       FailedMado: true
       NoSave: true
-      RemoveOnHermode: true
     Fail:
       Quagmire: true
   - Status: Meltdown
@@ -1350,10 +1288,11 @@ Body:
       OnTouch: true
       StopAttacking: true
       RemoveOnDamaged: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       NoBanishingBuster: true
       NoDispell: true
       NoClearance: true
+      NoSave: true
   - Status: Rejectsword
     Icon: EFST_SWORDREJECT
     DurationLookup: ST_REJECTSWORD
@@ -1370,7 +1309,8 @@ Body:
     Opt3:
       Marionette: true
     Flags:
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
+      NoSave: true
     Fail:
       Marionette: true
   - Status: Marionette2
@@ -1386,7 +1326,8 @@ Body:
     Opt3:
       Marionette: true
     Flags:
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
+      NoSave: true
     Fail:
       Marionette2: true
   - Status: Changeundead
@@ -1400,7 +1341,6 @@ Body:
       Debuff: true
       NoClearance: true
       NoSave: true
-      RemoveOnHermode: true
     EndOnStart:
       Blessing: true
       Increaseagi: true
@@ -1416,7 +1356,6 @@ Body:
       NoSave: true
       NoClearance: true
       Debuff: true
-      RemoveOnHermode: true
   - Status: Mindbreaker
     Icon: EFST_MINDBREAKER
     DurationLookup: PF_MINDBREAKER
@@ -1426,7 +1365,6 @@ Body:
     Flags:
       NoSave: true
       Debuff: true
-      RemoveOnHermode: true
     EndOnStart:
       Freeze: true
       Stone: true
@@ -1436,7 +1374,6 @@ Body:
     DurationLookup: PF_MEMORIZE
     Flags:
       NoSave: true
-      RemoveOnHermode: true
   - Status: Fogwall
     Icon: EFST_FOGWALL
     DurationLookup: PF_FOGWALL
@@ -1444,7 +1381,6 @@ Body:
       BossResist: true
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Spiderweb
     Icon: EFST_SPIDERWEB
     DurationLookup: PF_SPIDERWEB
@@ -1465,9 +1401,8 @@ Body:
     DurationLookup: CR_DEVOTION
     Flags:
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       OverlapIgnoreLevel: true
-      RemoveOnHermode: true
     EndOnEnd:
       Autoguard: true
       Defender: true
@@ -1475,8 +1410,6 @@ Body:
       Endure: true
   - Status: Sacrifice
     DurationLookup: PA_SACRIFICE
-    Flags:
-      RemoveOnHermode: true
   - Status: Steelbody
     Icon: EFST_STEELBODY
     DurationLookup: MO_STEELBODY
@@ -1489,7 +1422,6 @@ Body:
       Speed: true
     Flags:
       NoSave: true
-      RemoveOnHermode: true
     Opt3:
       SteelBody: true
   - Status: Orcish
@@ -1553,8 +1485,7 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnChangeMap: true
-      RemoveOnHermode: true
+      RemoveOnMapWarp: true
   - Status: Shadowweapon
     Icon: EFST_PROPERTYDARK
     DurationLookup: TK_SEVENWIND
@@ -1563,7 +1494,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
     EndOnStart:
       Encpoison: true
       Aspersio: true
@@ -1581,7 +1511,6 @@ Body:
       MadoCancel: true
       NoSave: true
       RequireWeapon: true
-      RemoveOnHermode: true
     Fail:
       Quagmire: true
       Decreaseagi: true
@@ -1593,7 +1522,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
     EndOnStart:
       Encpoison: true
       Aspersio: true
@@ -1611,7 +1539,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
     EndOnStart:
       Kaahi: true
   - Status: Kaupe
@@ -1620,7 +1547,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Onehand
     Icon: EFST_ONEHANDQUICKEN
     DurationLookup: KN_ONEHAND
@@ -1632,7 +1558,6 @@ Body:
       NoSave: true
       NoClearance: true
       RequireWeapon: true
-      RemoveOnHermode: true
     Fail:
       Decreaseagi: true
     EndOnStart:
@@ -1645,7 +1570,6 @@ Body:
     DurationLookup: ST_PRESERVE
     Flags:
       NoSave: true
-      RemoveOnHermode: true
   - Status: Battleorders
     Icon: EFST_GDSKILL_BATTLEORDER
     DurationLookup: GD_BATTLEORDER
@@ -1669,7 +1593,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Gravitation
     Icon: EFST_GRAVITATION
     DurationLookup: HW_GRAVITATION
@@ -1684,7 +1607,6 @@ Body:
       BossResist: true
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Maxoverthrust
     Icon: EFST_OVERTHRUSTMAX
     DurationLookup: WS_OVERTHRUSTMAX
@@ -1693,7 +1615,6 @@ Body:
     Flags:
       MadoCancel: true
       NoSave: true
-      RemoveOnHermode: true
     EndOnStart:
       Overthrust: true
   - Status: Longing
@@ -1742,7 +1663,7 @@ Body:
       NoClearance: true
       NoSave: true
       NoRemoveOnDead: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Closeconfine2
     Icon: EFST_RG_CCONFINE_S
     DurationLookup: RG_CLOSECONFINE
@@ -1755,7 +1676,7 @@ Body:
       NoClearance: true
       NoSave: true
       NoRemoveOnDead: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
     Fail:
       Closeconfine2: true
   - Status: Dancing
@@ -1772,9 +1693,10 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       RequireWeapon: true
       OverlapIgnoreLevel: true
+      NoSave: true
     EndOnEnd:
       Longing: true
   - Status: Elementalchange
@@ -1938,9 +1860,8 @@ Body:
       StopWalking: true
       NoSave: true
       NoClearance: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       Debuff: true
-      RemoveOnHermode: true
   - Status: Spurt
     Icon: EFST_STRUP
     DurationLookup: TK_RUN
@@ -1949,8 +1870,7 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
-      RequireNoWeapon: true
+      RequireWeapon: true
   - Status: Spirit
     Icon: EFST_SOULLINK
     DurationLookup: SL_HIGH
@@ -1962,7 +1882,6 @@ Body:
       NoClearance: true
       NoSave: true
       NoBanishingBuster: true
-      RemoveOnHermode: true
   - Status: Coma
     DurationLookup: NPC_DARKBLESSING
     Flags:
@@ -2257,8 +2176,8 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      RemoveOnChangeMap: true
       RemoveOnMapWarp: true
+      NoSave: true
   - Status: Sun_Comfort
     Icon: EFST_SUN_COMFORT
     DurationLookup: SG_SUN_COMFORT
@@ -2266,6 +2185,7 @@ Body:
       Def2: true
     Flags:
       RemoveOnMapWarp: true
+      NoSave: true
   - Status: Moon_Comfort
     Icon: EFST_MOON_COMFORT
     DurationLookup: SG_MOON_COMFORT
@@ -2273,6 +2193,7 @@ Body:
       Flee: true
     Flags:
       RemoveOnMapWarp: true
+      NoSave: true
   - Status: Star_Comfort
     Icon: EFST_STAR_COMFORT
     DurationLookup: SG_STAR_COMFORT
@@ -2280,6 +2201,7 @@ Body:
       Aspd: true
     Flags:
       RemoveOnMapWarp: true
+      NoSave: true
   - Status: Fusion
     DurationLookup: SG_FUSION
     CalcFlags:
@@ -2310,7 +2232,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
     EndOnStart:
       Assumptio: true
   - Status: Swoo
@@ -2410,7 +2331,6 @@ Body:
       NoClearance: true
       NoBanishingBuster: true
       NoDispell: true
-      RemoveOnHermode: true
   - Status: Bunsinjyutsu
     Icon: EFST_NJ_BUNSINJYUTSU
     DurationLookup: NJ_BUNSINJYUTSU
@@ -2421,7 +2341,6 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnHermode: true
   - Status: Kaensin
     Flags:
       NoWarning: true
@@ -2478,7 +2397,8 @@ Body:
       Vit: true
       Int: true
     Flags:
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
+      NoSave: true
     Fail:
       Change: true
   - Status: Bloodlust
@@ -2536,7 +2456,6 @@ Body:
       SendVal1: true
       OverlapIgnoreLevel: true
       RemoveOnUnequipWeapon: true
-      RemoveOnHermode: true
     EndOnStart:
       Enchantarms: true
       Aspersio: true
@@ -3290,7 +3209,7 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Bite
     Icon: EFST_WUGBITE
     DurationLookup: RA_WUGBITE
@@ -3322,7 +3241,7 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Acceleration
     Icon: EFST_ACCELERATION
     DurationLookup: NC_ACCELERATION
@@ -3404,7 +3323,7 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Stealthfield
     Icon: EFST_STEALTHFIELD
     DurationLookup: NC_STEALTHFIELD
@@ -3427,7 +3346,7 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Overheat
     Icon: EFST_OVERHEAT
     Flags:
@@ -3836,7 +3755,7 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       Debuff: true
     Fail:
       Hallucinationwalk: true
@@ -4223,7 +4142,7 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       StopAttacking: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Cursedcircle_Target
     Icon: EFST_CURSEDCIRCLE_TARGET
     DurationLookup: SR_CURSEDCIRCLE
@@ -4565,7 +4484,7 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: _Bodypaint
     Icon: EFST_BODYPAINT
     DurationLookup: SC_BODYPAINT
@@ -4699,7 +4618,8 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
+      NoSave: true
   - Status: _Bloodylust
     Icon: EFST_BLOODYLUST
     DurationLookup: SC_BLOODYLUST
@@ -5293,7 +5213,7 @@ Body:
     Flags:
       StopWalking: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Tinder_Breaker2
     Icon: EFST_TINDER_BREAKER
     DurationLookup: MH_TINDER_BREAKER
@@ -5304,7 +5224,7 @@ Body:
     Flags:
       StopWalking: true
       NoSave: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
   - Status: Cbc
     Icon: EFST_CBC
     DurationLookup: MH_CBC
@@ -5838,10 +5758,9 @@ Body:
     Flags:
       NoSave: true
       NoClearance: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       NoBanishingBuster: true
       NoDispell: true
-      RemoveOnHermode: true
   - Status: Mtf_Aspd2
     Icon: EFST_MTF_ASPD2
     CalcFlags:
@@ -6144,7 +6063,6 @@ Body:
     Flags:
       StopAttacking: true
       RemoveOnDamaged: true
-      RemoveOnChangeMap: true
       RemoveOnMapWarp: true
   - Status: Su_Stoop
     Icon: EFST_SU_STOOP
@@ -6446,7 +6364,6 @@ Body:
     Flags:
       NoRemoveOnDead: true
       NoClearbuff: true
-      RemoveOnHermode: true
   - Status: Geffen_Magic2
     Icon: EFST_GEFFEN_MAGIC2
     CalcFlags:
@@ -6711,7 +6628,8 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       NoClearbuff: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
+      NoSave: true
   - Status: Entry_Queue_Apply_Delay
     Icon: EFST_ENTRY_QUEUE_APPLY_DELAY
     Flags:
@@ -6783,7 +6701,7 @@ Body:
     Icon: EFST_FLASHKICK
     DurationLookup: SJ_FLASHKICK
     Flags:
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
       NoBanishingBuster: true
       NoDispell: true
       NoClearance: true
@@ -6800,7 +6718,7 @@ Body:
       NoClearance: true
       StopAttacking: true
       RemoveOnDamaged: true
-      RemoveOnChangeMap: true
+      RemoveOnMapWarp: true
     Fail:
       Bite: true
   - Status: Starstance

db/re/achievement_db.yml

@@ -2035,7 +2035,7 @@ Body:
     Name: I really love it!
     Condition: " BaseLevel == 99 && (Class >= JOB_SWORDMAN && Class <= JOB_THIEF) "
     Rewards:
-      Item: A_Bubble_Gum_Box10
+      Item: E_Bubble_Gum_Box
       Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
     Score: 30
   - Id: 200031

db/re/attr_fix.yml

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

db/re/castle_db.yml

@@ -26,384 +26,51 @@
 #   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: 2
+  Version: 1
 
 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) 2023 rAthena Development Team
+#   Copyright(C) 2022 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27,9 +27,8 @@
 #     - Level                           Item level.
 #       Grades:                         Enchantgrade settings per grade level.
 #         - Grade                       Enchantgrade level.
-#           Chances:                    Chance settings per refine level.
-#             - Refine                  Refine level.
-#               Chance                  Base chance of success out of 0~10000.
+#           Refine                      Required refine level.
+#           Chance                      Base chance of success out of 0~10000.
 #           Bonus                       Enchantgrade bonus. (Default: 0)
 #           AnnounceSuccess             Announce on upgrade success. (Default: true)
 #           AnnounceFail                Announce on upgrade failure. (Default: false)
@@ -52,7 +51,7 @@
 
 Header:
   Type: ENCHANTGRADE_DB
-  Version: 3
+  Version: 2
 
 Body:
   - Type: Armor
@@ -60,31 +59,8 @@ Body:
       - Level: 2
         Grades:
           - Grade: None
-            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
+            Refine: 11
+            Chance: 7000
             Bonus: 10
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -102,29 +78,8 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: D
-            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
+            Refine: 11
+            Chance: 6000
             Bonus: 30
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -142,27 +97,8 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: C
-            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
+            Refine: 11
+            Chance: 5000
             Bonus: 50
             AnnounceFail: true
             Catalyst:
@@ -181,27 +117,8 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: B
-            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
+            Refine: 11
+            Chance: 4000
             Bonus: 100
             AnnounceFail: true
             Catalyst:
@@ -224,31 +141,8 @@ Body:
       - Level: 5
         Grades:
           - Grade: None
-            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
+            Refine: 11
+            Chance: 7000
             Bonus: 10
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -266,29 +160,8 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: D
-            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
+            Refine: 11
+            Chance: 6000
             Bonus: 30
             Catalyst:
                 Item: Blessed_Etel_Dust
@@ -306,27 +179,8 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: C
-            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
+            Refine: 11
+            Chance: 5000
             Bonus: 50
             AnnounceFail: true
             Catalyst:
@@ -345,27 +199,8 @@ Body:
                 Amount: 5
                 Zeny: 875000
           - Grade: B
-            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
+            Refine: 11
+            Chance: 4000
             Bonus: 100
             AnnounceFail: true
             Catalyst:

db/re/exp_homun.yml

@@ -379,154 +379,3 @@ 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/homunculus_db.txt

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

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

@@ -375,204 +375,3 @@ Body:
       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

@@ -0,0 +1,19 @@
+// 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,60 +66,6 @@
 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
 //----------------------------------------------------------------------------
@@ -263,60 +209,6 @@
 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/laphine_synthesis.yml

@@ -726,7 +726,7 @@ Body:
   - Item: Gunslinger_Enchant
     RewardGroup: GUNSLINGER_ENCHANT
     Requirements:
-      - Item: Droop_Gunslinger
+      - Item: Drooping_Rebellion_
   - Item: EnchantStone_Recipe
     RewardGroup: ENCHANTSTONE_RECIPE
     RequiredRequirementsCount: 3
@@ -814,10 +814,10 @@ Body:
       - Item: MaxHP_Stone
       - Item: ShrinkEffect_Bottom
       - Item: ElectricEffect_Top
-      - Item: Upg_SPdrainStone_Top
-      - Item: Upg_HPdrainStone_Top
-      - Item: Upg_SPdrainStone_Robe
-      - Item: Upg_HPdrainStone_Robe
+      - Item: SPAbsorb_Stone_Top
+      - Item: HPAbsorb_Stone_Top
+      - Item: SPAbsorb_Stone_Robe
+      - Item: HPAbsorb_Stone_Robe
       - Item: WaterFieldEffect_Bottom
       - Item: ExplodingEffect_Middle
       - Item: WhiteBodyEffect_Middle
@@ -1345,19 +1345,19 @@ Body:
         Amount: 10
       - Item: Shabby_Crown
         Amount: 10
-      - Item: Stone_Of_Chill
+      - Item: Cold_Core
         Amount: 10
-      - Item: Soften_Skin
+      - Item: Silicone_Shell
         Amount: 10
-      - Item: Porcupine_Big_Spike
+      - Item: Hedgehog_Picks
         Amount: 10
-      - Item: Shabby_Old_Belt
+      - Item: Old_Belt
         Amount: 10
-      - Item: Moving_Black_Things
+      - Item: Moving_Dark_Matter
         Amount: 10
-      - Item: Valkyrie_Fragment
+      - Item: Fragments_Valkyrie_Power
         Amount: 10
-      - Item: Will_Of_Owner
+      - Item: Will_Master
         Amount: 10
       - Item: Piece_Of_Chimera
         Amount: 10
@@ -1385,19 +1385,19 @@ Body:
         Amount: 10
       - Item: BrownRatTail
         Amount: 10
-      - Item: Frozen_PieceOfRock
+      - Item: Frozen_Stone_Fragment
         Amount: 10
-      - Item: SpritJewel
+      - Item: Spirit_Jewel
         Amount: 10
       - Item: Snowball
         Amount: 10
-      - Item: KTULLANUXsEye
+      - Item: Ktullanux_Eye
         Amount: 10
-      - Item: HazyDream
+      - Item: Hazy_Dream_Fragment
         Amount: 10
-      - Item: BrokenArrow
+      - Item: Broken_Arrow
         Amount: 10
-      - Item: SubjugationFlyer
+      - Item: Recruitment_Leaflet
         Amount: 10
       - Item: IllusoryStone
         Amount: 10
@@ -1415,11 +1415,11 @@ Body:
         Amount: 10
       - Item: SuspiciousMagicCircle
         Amount: 10
-      - Item: PieceOfBlackSpirit
+      - Item: Piece_of_Black_Horn
         Amount: 10
-      - Item: OldDoll
+      - Item: Fine_Old_Doll
         Amount: 10
-      - Item: OldShell
+      - Item: Old_Shell
         Amount: 10
       - Item: Ein_SOLIDDUST
         Amount: 10
@@ -1573,7 +1573,7 @@ Body:
       - Item: C_Loose_Wave_Twin_BL
       - Item: C_Cupid_Wing_Pink
       - Item: C_Pecopeco_Cap
-      - Item: C_Woodie_Hat
+      - Item: C_Green_Hat
       - Item: C_Little_Aquarium
       - Item: C_Angel_Fluttering
       - Item: C_Niflheim_Bunny_Hat
@@ -1590,9 +1590,9 @@ Body:
       - Item: C_Morocc_Kid_Servant
       - Item: C_Monochrome_RibbonHat
       - Item: C_Khalitzburg_KN_Helm
-      - Item: C_Laser_Of_Eagle
+      - Item: C_Laser_of_Eagle
       - Item: C_Devil_Wing
-      - Item: C_Tone_Of_Gold
+      - Item: C_Tone_of_Gold
       - Item: C_Dwarf_Beard
       - Item: C_Mad_Hatter
       - Item: C_Cons_Of_Water
@@ -1602,7 +1602,7 @@ Body:
       - Item: C_Charleston_Antenna
       - Item: C_Wings_of_Uriel
       - Item: C_Pig_Nose
-      - Item: C_Cat_Ear_Hat
+      - Item: C_Cat_Ears_Hat
       - Item: C_Valkyrie_Circlet
       - Item: C_Eremes_Scarf_Black
       - Item: C_Eleanor_Wig
@@ -1738,13 +1738,13 @@ Body:
       - Item: C_Big_Foxtail
       - Item: C_T_Bear_Bag
       - Item: C_Poring_On_Shoulder
-      - Item: C_FortunetellinSealed
+      - Item: Costume_Yawata_Seal
       - Item: C_Pretty_Bear_WH
       - Item: C_Bicolor_Cat_Witch_Hat
       - Item: C_Nifl_Bloom
       - Item: C_Floating_Ball_TW
       - Item: C_Dark_Snake_Lord_Stall
-      - Item: C_Twin_Canon
+      - Item: Costume_Twin_Cannon
       - Item: C_Picnic_Basket
       - Item: C_Magic_Helm
       - Item: C_ManyStars_TW
@@ -1753,14 +1753,14 @@ Body:
       - Item: C_Royalguard_Necklace
       - Item: C_Happy_Cat_TW
       - Item: C_Monochrome_Cap
-      - Item: C_Sky_Of_Memory
+      - Item: C_Sky_of_Memory
       - Item: C_Ice_Wing
-      - Item: C_Under_Rim_Glasses_Bu
+      - Item: C_Under_Rim_Glasses_Blue
       - Item: C_Gimmick_One_Feather
-      - Item: C_PocketWatch_Hair_Orna
+      - Item: C_Pocketwatch_Hair_Ornament
       - Item: C_Poring_Traffic_Light
       - Item: C_PGstone_Knit_Hat_PK
-      - Item: C_Drooping_Nine_Tail
+      - Item: C_Lazy_Ninetail
       - Item: C_Sakura_Wing
       - Item: C_Looking
       - Item: C_Wolf_Masquerade
@@ -1773,13 +1773,13 @@ Body:
       - Item: C_Disapear_Time_TW
       - Item: C_Magic_Heir_TW
       - Item: C_Blink_Eyes_Sakura
-      - Item: C_Angola_Intention
-      - Item: C_Stall_Of_Dominions
+      - Item: Costume_Angola_Intention
+      - Item: C_Stole_Of_Dominion
       - Item: C_Flowery_Vision_TH
       - Item: C_Frill_Collar
       - Item: C_Rose_Gothic_Bonnet
       - Item: C_LittleGarden
-      - Item: C_Blinking_Eyes_RD
+      - Item: Costume_Twinkling_Red_Eyes
       - Item: C_P_Ulysses_Feather
       - Item: C_DancingButterfly_TW
       - Item: C_Blue_Pencil_In_Mouth
@@ -1790,7 +1790,7 @@ Body:
       - Item: C_Frog_Hood
       - Item: C_Lude_Hood
       - Item: C_Blessings_Of_Soul
-      - Item: C_Gossip_Raven
+      - Item: C_Crow
       - Item: C_Halloween_Hat
       - Item: C_Blessed_Veil
       - Item: C_Eyes_Of_Ifrit
@@ -1799,7 +1799,7 @@ Body:
       - Item: C_Wildcat_Knit_Cap
       - Item: C_Pink_Fur_Hat
       - Item: C_Gift_Of_Snow
-      - Item: C_L_RibbonMuff_Red
+      - Item: C_Large_Ribbon_Muffler_Red
       - Item: C_Imperial_Glory
       - Item: C_Black_Shiba_Inu_Hat
       - Item: C_Black_Glasses
@@ -1832,7 +1832,7 @@ Body:
       - Item: C_Triple_Ice_Cream
       - Item: C_Wrapping_Ribbon
       - Item: C_Bear_Head
-      - Item: C_Preschool_Hat
+      - Item: C_Kindergarten_Hat
       - Item: C_Poulet_TW
       - Item: C_Avenger
       - Item: C_WitchManteau
@@ -1840,16 +1840,16 @@ Body:
       - Item: C_Gothic_Pumpkin_Head
       - Item: C_Barrel_Helm
       - Item: C_White_Cat_On_Shoulder
-      - Item: C_Rabbit_Hopping_BL
+      - Item: C_Black_Rabbit_Ears
       - Item: C_G_DaeHyon_Sword_TW
       - Item: C_Cat_Ears_Cape_Red
-      - Item: C_Debril_Doll_Hat
-      - Item: C_Sheep_Hat
+      - Item: C_Tare_W_Doll
+      - Item: C_Goat_Hat
       - Item: C_Put_On_Coat
       - Item: C_Pink_Pajamas_Hat
       - Item: C_L_RibbonMuff_Black
       - Item: C_Black_Cat_Ears_Beret
-      - Item: C_Teardrop
+      - Item: C_Watery_Eyes
   - Item: Fan_Upgrade_Kit
     RewardGroup: FAN_UPGRADE_KIT
     Requirements:
@@ -1857,11 +1857,11 @@ Body:
   - Item: Suit_Upgrade_Kit
     RewardGroup: SUIT_UPGRADE_KIT
     Requirements:
-      - Item: Kafra_Suit
+      - Item: Kafra_Uniform
   - Item: FallenAngelWing_Reset
     RewardGroup: SCROLL_OF_FALLEN_ANGEL_WINGS
     Requirements:
-      - Item: K_Fallen_Angel_Wing
+      - Item: Fallen_Angel_Wings_
       - Item: Fallen_Angel_Wing
   - Item: JobShadow_Mix_Weapon
     RewardGroup: CLASS_SHADOW_BOX_WEAPON
@@ -2051,15 +2051,15 @@ Body:
   - Item: Candy_Bag_Scroll_Melee
     RewardGroup: CANDY_BAG_SCROLL_MELEE
     Requirements:
-      - Item: Bag_Of_Antonio_Melee
+      - Item: Bag_Of_Antonio_P
   - Item: Candy_Bag_Scroll_Range
     RewardGroup: CANDY_BAG_SCROLL_RANGE
     Requirements:
-      - Item: Bag_Of_Antonio_Range
+      - Item: Bag_Of_Antonio_S
   - Item: Candy_Bag_Scroll_Magic
     RewardGroup: CANDY_BAG_SCROLL_MAGIC
     Requirements:
-      - Item: Bag_Of_Antonio_Magic
+      - Item: Bag_Of_Antonio_
   - Item: Booster_Amplifier
     RewardGroup: BOOSTER_AMPLIFIER
     Requirements:
@@ -3272,11 +3272,11 @@ Body:
 #    RewardGroup: ENCHANTSTONE_RECIPE_3M
 #    Requirements:
 #      - Item: C_Pretty_Bear_WH
-#      - Item: C_FortunetellinSealed
+#      - Item: Costume_Yawata_Seal
 #      - Item: C_Floating_Ball_TW
 #      - Item: C_Dark_Snake_Lord_Stall
 #      - Item: C_Bicolor_Cat_Witch_Hat
-#      - Item: C_Twin_Canon
+#      - Item: Costume_Twin_Cannon
 #      - Item: C_Picnic_Basket
 #      - Item: C_Magic_Helm
 #      - Item: C_Fawn_Ear
@@ -3291,7 +3291,7 @@ Body:
 #      - Item: C_Frill_Collar
 #      - Item: C_Rose_Gothic_Bonnet
 #      - Item: C_LittleGarden
-#      - Item: C_Blinking_Eyes_RD
+#      - Item: Costume_Twinkling_Red_Eyes
 #  - Item: Egirnion_Box
 #    RewardGroup: EGIRNION_BOX
 #    Requirements:
@@ -3700,11 +3700,11 @@ Body:
 #      - Item: S_AllMighty_Pendant
 #      - Item: S_Tempest_Shield
 #      - Item: S_Tempest_Shoes
-#      - Item: S_M_ExeHoly_Armor
-#      - Item: S_M_ExoCorrupt_Armor
-#      - Item: S_M_DragonVib_Armor
-#      - Item: S_M_SciHunting_Armor
-#      - Item: S_M_FishInsect_Armor
+#      - Item: S_Magic_Executioner_Holy_Water_Armor
+#      - Item: S_Magic_Exorcist_Corrupted_Armor
+#      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+#      - Item: S_Magic_Scissor_Hunting_Armor
+#      - Item: S_Magic_Fishing_Insect_Net_Armor
 #      - Item: S_Plasterer's_Armor_II
 #      - Item: S_Insomniac_Shoes_II
 #      - Item: S_Peerless_Armor_II
@@ -3728,11 +3728,11 @@ Body:
 #      - Item: S_Mortal_Blow_Pendant
 #      - Item: S_Penetration_Shoes
 #      - Item: S_Penetration_Shield
-#      - Item: S_ExeHoly_Armor
-#      - Item: S_ExoCorrupt_Armor
-#      - Item: S_DragonVib_Armor
-#      - Item: S_SciHunting_Armor
-#      - Item: S_FishInsect_Armor
+#      - Item: S_Executioner_Holy_Water_Armor
+#      - Item: S_Exorcist_Corrupted_Armor
+#      - Item: S_Vibration_Dragon_Killer_Armor
+#      - Item: S_Scissor_Hunting_Armor
+#      - Item: S_Fishing_Insect_Net_Armor
 #      - Item: Sentimental_Weapone_S
 #      - Item: Sentimental_Earring_S
 #      - Item: Sentimental_Pendant_S
@@ -4550,265 +4550,3 @@ Body:
 #        Amount: 30
 #      - Item: Zelunium
 #        Amount: 250
-#  - Item: Bs_Item_M_S_60
-#    RewardGroup: BS_ITEM_M_S_60
-#    RequiredRequirementsCount: 2
-#    Requirements:
-#      - Item: EP20_D_Scale
-#        Amount: 30
-#      - Item: Zelunium
-#        Amount: 250
-#  - Item: Bs_Item_M_S_61
-#    RewardGroup: BS_ITEM_M_S_61
-#    RequiredRequirementsCount: 2
-#    Requirements:
-#      - Item: Will_Of_Darkness_
-#        Amount: 30
-#      - Item: Zelunium
-#        Amount: 250
-#  - Item: Bs_Item_M_S_62
-#    RewardGroup: BS_ITEM_M_S_62
-#    RequiredRequirementsCount: 2
-#    Requirements:
-#      - Item: EP19_Luminant
-#        Amount: 30
-#      - Item: Zelunium
-#        Amount: 250
-#  - Item: Bs_Item_M_S_63
-#    RewardGroup: BS_ITEM_M_S_63
-#    RequiredRequirementsCount: 2
-#    Requirements:
-#      - Item: EP19_D_P_Stone
-#        Amount: 30
-#      - Item: Zelunium
-#        Amount: 250
-#  - Item: Mocadas_Slabs1
-#    RewardGroup: MOCADAS_SLABS1
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs2
-#    RewardGroup: MOCADAS_SLABS2
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs3
-#    RewardGroup: MOCADAS_SLABS3
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs4
-#    RewardGroup: MOCADAS_SLABS4
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs5
-#    RewardGroup: MOCADAS_SLABS5
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs6
-#    RewardGroup: MOCADAS_SLABS6
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs7
-#    RewardGroup: MOCADAS_SLABS7
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs8
-#    RewardGroup: MOCADAS_SLABS8
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs9
-#    RewardGroup: MOCADAS_SLABS9
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs10
-#    RewardGroup: MOCADAS_SLABS10
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs11
-#    RewardGroup: MOCADAS_SLABS11
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs12
-#    RewardGroup: MOCADAS_SLABS12
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs13
-#    RewardGroup: MOCADAS_SLABS13
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs14
-#    RewardGroup: MOCADAS_SLABS14
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs15
-#    RewardGroup: MOCADAS_SLABS15
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs16
-#    RewardGroup: MOCADAS_SLABS16
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs17
-#    RewardGroup: MOCADAS_SLABS17
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 50
-#      - Item: Mocadas_Water
-#        Amount: 50
-#      - Item: Crystal_Of_Pollution
-#        Amount: 50
-#  - Item: Mocadas_Slabs18
-#    RewardGroup: MOCADAS_SLABS18
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 50
-#      - Item: Mocadas_Water
-#        Amount: 50
-#      - Item: Crystal_Of_Pollution
-#        Amount: 50
-#  - Item: Mocadas_Slabs19
-#    RewardGroup: MOCADAS_SLABS19
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs20
-#    RewardGroup: MOCADAS_SLABS20
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs21
-#    RewardGroup: MOCADAS_SLABS21
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs22
-#    RewardGroup: MOCADAS_SLABS22
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100
-#  - Item: Mocadas_Slabs23
-#    RewardGroup: MOCADAS_SLABS23
-#    RequiredRequirementsCount: 3
-#    Requirements:
-#      - Item: Mocadas_Gold
-#        Amount: 100
-#      - Item: Mocadas_Water
-#        Amount: 100
-#      - Item: Crystal_Of_Pollution
-#        Amount: 100

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

db/re/pet_db.yml

@@ -112,7 +112,7 @@ Body:
             Amount: 1
       - Target: SWEETS_DROPS
         ItemRequirements:
-          - Item: Sweets_Coin
+          - Item: Sweets_Festival_Coin
             Amount: 500
           - Item: Candy
             Amount: 50
@@ -168,6 +168,7 @@ Body:
             Amount: 30
           - Item: Leaf_Lunatic_Card
             Amount: 1
+
   - Mob: PICKY
     TameItem: Earthworm_The_Dude
     EggItem: Picky_Egg
@@ -1360,7 +1361,7 @@ Body:
   - Mob: TEDDY_BEAR
     TameItem: Little_Dall_Needle
     EggItem: Teddy_Bear_Egg
-    FoodItem: Wad_Of_Cotton
+    FoodItem: Cotton_Tufts
     Fullness: 3
     IntimacyFed: 50
     CaptureRate: 2000
@@ -1497,7 +1498,7 @@ Body:
       }
   - Mob: MOONLIGHT
     EggItem: Moonlight_Egg
-    FoodItem: High_Class_Pet_food
+    FoodItem: Luxurious_Pet_Food
     Fullness: 1
     HungryDelay: 120
     IntimacyFed: 15
@@ -1921,7 +1922,7 @@ Body:
         bonus bAspdRate,1;
       }
   - Mob: SWEETS_DROPS
-    EggItem: Sweets_Drops_Egg
+    EggItem: Sweet_Drops_Egg
     FoodItem: Candy
     Fullness: 2
     HungryDelay: 120
@@ -2059,7 +2060,7 @@ Body:
       }
 #  - Mob: BACSOJIN2
 #    EggItem: Bacsojin2_Egg_
-#    FoodItem: High_Class_Pet_food
+#    FoodItem: Luxurious_Pet_Food
 #    Fullness: 7
 #    IntimacyFed: 10
 #    CaptureRate: 0
@@ -2082,7 +2083,7 @@ Body:
 #      }
 #  - Mob: ORK_HERO2
 #    EggItem: Orc_Hero_Egg_
-#    FoodItem: High_Class_Pet_food
+#    FoodItem: Luxurious_Pet_Food
 #    Fullness: 2
 #    HungryDelay: 120
 #    IntimacyFed: 15
@@ -2103,70 +2104,3 @@ 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;
-      }

db/re/stylist.yml

@@ -304,10 +304,10 @@ Body:
       - Index: 1
         Value: 0
         CostsHuman:
-            RequiredItem: Clothing_Dye_Coupon2
+            RequiredItem: Clothing_Dye_Coupon_II
             RequiredItemBox: CCloth_Dye_Coupon2_Box
         CostsDoram:
-            RequiredItem: Clothing_Dye_Coupon2
+            RequiredItem: Clothing_Dye_Coupon_II
             RequiredItemBox: CCloth_Dye_Coupon2_Box
       - Index: 2
         Value: 2

doc/atcommands.txt

@@ -1419,7 +1419,6 @@ This will also send a packet to clients causing them to close.
 @reloadstatusdb
 @reloadachievementdb
 @reloadattendancedb
-@reloadbarterdb
 
 Reloads a database or configuration file.
 
@@ -1428,11 +1427,10 @@ Databases:
 -- itemdb: Item Database
 -- mobdb: Monster Database
 -- questdb: Quest Database
--- script: NPC Scripts and Barter Database
+-- script: NPC Scripts
 -- skilldb: Skill Database
 -- achievementdb: Achievement Database
 -- attendancedb: Attendance Database
--- barterdb: Barter Database
 
 Configuration files:
 -- atcommand: Atcommand Settings
@@ -1452,12 +1450,11 @@ Affected files:
 -- msgconf: atcommands.yml
 -- pcdb: statpoint.yml, job_exp.yml, skill_tree.yml, attr_fix.yml, job_stats.yml, job_basepoints.yml, level_penalty.yml
 -- questdb: quest_db.yml
--- script: /npc/*.txt, /npc/*.conf, /npc/barters.yml
+-- script: /npc/*.txt, /npc/*.conf
 -- skilldb: skill_db.yml, skill_nocast_db.txt, skill_changematerial_db.txt, skill_damage_db.txt, abra_db.yml, create_arrow_db.yml, produce_db.txt, spellbook_db.yml, magicmushroom_db.yml
 -- statusdb: attr_fix.yml, size_fix.yml, refine.yml
 -- achievementdb: achievement_db.yml
 -- attendancedb: attendance.yml
--- barterdb: /npc/barters.yml
 
 Restriction:
 	- Used from 'atcommand' or 'useatcmd'. For @reload & @reloadscript

doc/item_bonus.txt

@@ -30,7 +30,7 @@ This list contains all available constants referenced in the 'bonus' commands.
 	RC2_Treasure, RC2_BioLab, RC2_Manuk, RC2_Splendide, RC2_Scaraba, RC2_OGH_ATK_DEF, RC2_OGH_Hidden,
 	RC2_Bio5_Swordman_Thief, RC2_Bio5_Acolyte_Merchant, RC2_Bio5_Mage_Archer, RC2_Bio5_MVP,
 	RC2_Clocktower, RC2_Thanatos, RC2_Faceworm, RC2_Hearthunter, RC2_Rockridge, RC2_Werner_Lab,
-	RC2_Temple_Demon, RC2_Illusion_Vampire, RC2_Malangdo, RC2_EP172ALPHA, RC2_EP172BETA, RC2_EP172BATH
+	RC2_Temple_Demon, RC2_Illusion_Vampire, RC2_Malangdo
 
 * Class (c)
 	Class_Normal, Class_Boss, Class_Guardian, Class_All
@@ -322,11 +322,6 @@ bonus bIgnoreMDefEle,e; 		Disregard MDEF against enemies of element e
 bonus2 bIgnoreDefClassRate,c,n;	Disregard n% of the target's DEF if the target belongs to class c
 bonus2 bIgnoreMdefClassRate,c,n;	Disregard n% of the target's MDEF if the target belongs to class c
 
-Ignore Res
-----------
-bonus2 bIgnoreResRaceRate,r,n;		Disregard n% of the target's Res if the target belongs to race r
-bonus2 bIgnoreMResRaceRate,r,n; 	Disregard n% of the target's MRes if the target belongs to race r
-
 Experience
 ----------
 bonus2 bExpAddRace,r,x; 		Increase exp gained by x% against enemies of race r

doc/script_commands.txt

@@ -159,8 +159,7 @@ executed, it is affected by spawn rates in 'battle_athena.conf'.
 Delay1 and delay2 control monster respawn delays - the first one is the fixed
 base respawn time, and the second is random variance on top of the base time.
 Both values are given in milliseconds (1000 = 1 second).
-Note that the server also enforces a minimum respawn delay of 1 second (See
-/conf/battle/monster.conf::mob_respawn_time).
+Note that the server also enforces a minimum respawn delay of 5 seconds.
 
 Event is a script event to be executed when the mob is killed. The event must
 be in the form "NPCName::OnEventName" to execute, and the event name label
@@ -212,8 +211,6 @@ ex: if your NPC is named 'Hunter#hunter1', it will be displayed as 'Hunter'
 
 <from mapname>,<fromX>,<fromY>,<facing>%TAB%warp%TAB%<warp name>%TAB%<spanx>,<spany>,<to mapname>,<toX>,<toY>
 <from mapname>,<fromX>,<fromY>,<facing>%TAB%warp2%TAB%<warp name>%TAB%<spanx>,<spany>,<to mapname>,<toX>,<toY>
-<from mapname>,<fromX>,<fromY>,<facing>%TAB%warp(<state>)%TAB%<warp name>%TAB%<spanx>,<spany>,<to mapname>,<toX>,<toY>
-<from mapname>,<fromX>,<fromY>,<facing>%TAB%warp2(<state>)%TAB%<warp name>%TAB%<spanx>,<spany>,<to mapname>,<toX>,<toY>
 
 This will define a warp NPC that will warp a player between maps, and while most
 arguments of that are obvious, some deserve special mention.
@@ -231,20 +228,10 @@ current scripts have a zero in there.
 
 Unlike 'warp', 'warp2' will also be triggered by hidden player.
 
-The basic state of the warp can be defined in <state>. Only one state can be defined at a time.
-Duplicate warps (including instance warps) inherit the <state> of the original warp.
-
-Valid <state> are:
-CLOAKED		Make the warp specified cloaked.
-HIDDEN		Make the warp specified hidden.
-DISABLED	Make the warp specified disabled.
-
 ** Define an NPC object.
 
 <map name>,<x>,<y>,<facing>%TAB%script%TAB%<NPC Name>%TAB%<sprite id>,{<code>}
 <map name>,<x>,<y>,<facing>%TAB%script%TAB%<NPC Name>%TAB%<sprite id>,<triggerX>,<triggerY>,{<code>}
-<map name>,<x>,<y>,<facing>%TAB%script(<state>)%TAB%<NPC Name>%TAB%<sprite id>,{<code>}
-<map name>,<x>,<y>,<facing>%TAB%script(<state>)%TAB%<NPC Name>%TAB%<sprite id>,<triggerX>,<triggerY>,{<code>}
 
 This will place an NPC object on a specified map at the specified location, and
 is a top-level command you will use the most in your custom scripting. The NPCs
@@ -258,8 +245,6 @@ degrees, where 0 means facing towards the top of the map. (So to turn the sprite
 towards the bottom of the map, you use facing 4, and to make it look southeast
 it's facing 5.)
 
-<state> works like the warp <state> defined above, but for NPCs.
-
 Sprite ID is the sprite number or constant used to display this particular NPC.
 You may also use a monster's ID instead to display a monster sprite for this NPC.
 It is possible to use a job sprite as well, but you must first define it as a
@@ -283,24 +268,6 @@ triggered. It may contain commands and function calls, descriptions of which
 compose most of this document. It has to be in curly brackets, unlike elsewhere
 where we use curly brackets, these do NOT signify an optional parameter.
 
-Example of how <state> works:
-
-// Define a cloaked NPC :
-lighthalzen,306,267,5	script	Skia#ep162_04	4_EP16_SKIA,{
-	//...
-	end;
-
-OnInit:
-	cloakonnpc();
-	end;
-}
-
-// Another way to define a cloaked NPC using <state> :
-lighthalzen,306,267,5	script(CLOAKED)	Skia#ep162_04	4_EP16_SKIA,{
-	//...
-	end;
-}
-
 ** Define a 'floating' NPC object.
 
 -%TAB%script%TAB%<NPC Name>%TAB%-1,{<code>}
@@ -1159,17 +1126,13 @@ In 2015 the tag name was changed to <ITEM> resulting in the following syntax:
 
 	<ITEM>Display Name<INFO>Item ID</INFO></ITEM>
 
-We therefore created script command "mesitemlink" that allows you to create the correct syntax
-depending on your configured packet version. We recommend that you use this script command
-instead of hardcoding the HTML-like tags. For more details see the documentation for "mesitemlink".
-
 The following sample will open a preview window for Red Potion:
 
 	mes "Did you ever consume a <ITEMLINK>Red Potion<INFO>501</INFO></ITEMLINK>?";
 	// Or in 2015:
 	mes "Did you ever consume a <ITEM>Red Potion<INFO>501</INFO></ITEM>?";
 
-NOTE: Be aware that item links are broken in some 2015 clients.
+NOTE: Be aware that item links are rendered incorrectly in 2015+ clients at the moment.
 
 URLs
 ----
@@ -2767,7 +2730,7 @@ See 'getequipid' for a full list of valid equipment slots.
 
 Given the database ID number of an item, this function will return the text
 stored in the 'Name' field in item_db_*.yml for text version
-or 'name_english' field for SQL version. The function returns "null" if the item doesn't exist.
+or 'name_english' field for SQL version.
 
 ---------------------------------------
 
@@ -4446,6 +4409,7 @@ you have maximum. Like 'heal', this will not call up any animations or effects.
 *recovery <type>{,<option>,<revive_flag>{,<map name>}};
 
 This command will revive and fully restore the HP/SP of the selected characters.
+It returns 1 upon successful use.
 
 <type> is the target, and determines the <option> parameter:
  0: Player  -> Character ID number
@@ -6483,7 +6447,8 @@ the invoking character. Example can be found in the wedding script.
 
 This function will "un-marry" the invoking character from whoever they were
 married to. Both will no longer be each other's marriage partner, (at least in
-current SVN, which prevents the cases of multi-spouse problems).
+current SVN, which prevents the cases of multi-spouse problems). It will return
+1 upon success or 0 if the character was not married at all.
 
 This function will also destroy both wedding rings and send a message to both
 players, telling them they are now divorced.
@@ -6614,28 +6579,6 @@ Examples:
 
 ---------------------------------------
 
-macro_detector({<account ID>});
-macro_detector({"<character name>"});
-
-This command will display the captcha UI challenge onto the invoking character or the given <account ID>/<character name>.
-
-Example:
-	// Use 'getareaunits' to gather an area of players to test.
-	// Build an int array of the account IDs.
-	.@num = getareaunits(BL_PC, "prontera", 150, 150, 160, 160, .@array[0]);
-
-	mes "The number of Players in Prontera in between 150x150 and 160x160 is " + .@num + " .";
-	mes "Players to challenge:";
-	freeloop(1); // If the list is too big
-	for(.@i = 0; .@i < getarraysize(.@array); .@i++) {
-		mes (.@i + 1) + " " + convertpcinfo(.@array[.@i], CPC_NAME);
-		macro_detector .@array[.@i];
-	}
-	freeloop(0);
-	end;
-
----------------------------------------
-
 ==================================
 |5.- Mob / NPC -related commands.|
 ==================================
@@ -7068,6 +7011,9 @@ the invoking NPC's actions, such as using an emotion or talking.
 Whichever of the both NPCs is talked to, both will show a random emotion at the
 same time.
 
+As of r16564, command now returns 1 or 0 on success and failure.
+A debug message also shows on the console when no events are triggered.
+
 ---------------------------------------
 
 *cmdothernpc "<npc name>","<command>";
@@ -7075,6 +7021,8 @@ same time.
 This is simply "donpcevent <npc name>::OnCommand<command>".
 It is an approximation of official server script language's 'cmdothernpc'.
 
+Returns true if the command was executed on the other NPC successfully, false if not.
+
 ---------------------------------------
 
 *npctalk "<message>"{,"<NPC name>",<flag>{,<color>}};
@@ -8515,10 +8463,10 @@ flag: Specify target
 
 ---------------------------------------
 
-*unitskilluseid <GID>,<skill id>,<skill lvl>{,<target id>,<casttime>,<cancel>,<Line_ID>,<ignore_range>};
-*unitskilluseid <GID>,"<skill name>",<skill lvl>{,<target id>,<casttime>,<cancel>,<Line_ID>,<ignore_range>};
-*unitskillusepos <GID>,<skill id>,<skill lvl>,<x>,<y>{,<casttime>,<cancel>,<Line_ID>,<ignore_range>};
-*unitskillusepos <GID>,"<skill name>",<skill lvl>,<x>,<y>{,<casttime>,<cancel>,<Line_ID>,<ignore_range>};
+*unitskilluseid <GID>,<skill id>,<skill lvl>{,<target id>,<casttime>,<cancel>,<Line_ID>};
+*unitskilluseid <GID>,"<skill name>",<skill lvl>{,<target id>,<casttime>,<cancel>,<Line_ID>};
+*unitskillusepos <GID>,<skill id>,<skill lvl>,<x>,<y>{,<casttime>,<cancel>,<Line_ID>};
+*unitskillusepos <GID>,"<skill name>",<skill lvl>,<x>,<y>{,<casttime>,<cancel>,<Line_ID>};
 
 This is the replacement of the older commands, these use the same values for
 GID as the other unit* commands (See 'GID').
@@ -8534,9 +8482,6 @@ CastCancel from skill_db.yml is the default value of <cancel>.
 If <Line_ID> is defined (positive number, default 0) the monster will say the message from 'Line_ID'
 in mob_chat_db.yml when casting the skill.
 
-If <ignore_range> is true, the unit will ignore the skill range defined by the database. The default value is false.
-Attention! this setting does not work for all skills.
-
 ---------------------------------------
 
 *unitexists <GID>;
@@ -9702,13 +9647,9 @@ returns an empty string instead.
 
 *instance_id({<instance mode>})
 
-Returns the unique instance ID of the given mode.
-
-By default (no parameter given) the command returns the instance ID from the attached NPC.
-If <instance mode> is provided the instance ID of the currently attached player is returned.
-If that fails, the function will return 0.
-
-Please note that the command always requires the parameter <instance mode> to get the instance ID of an attached player!
+Returns the unique instance ID of the given mode. By default it returns the
+attached script instance. If <instance mode> is provided then the instance
+of the currently attached player is used. If that fails, the function will return 0.
 
 Instance Mode options:
  IM_CHAR:	Attached to character.
@@ -9716,27 +9657,14 @@ Instance Mode options:
  IM_GUILD:	Attached to character's guild.
  IM_CLAN:	Attached to character's clan.
 
-Examples:
-	// Example with an attached player :
-	npctalk "The current instance ID (mode party) from the attached player is : " + instance_id(IM_PARTY);
-
-	// Example with an attached NPC on an instance map :
-	npctalk "The current instance ID from the attached NPC is : " + instance_id();
-
 ---------------------------------------
 
-*instance_warpall "<map name>",<x>,<y>{,<instance id>,{<flag>}};
+*instance_warpall "<map name>",<x>,<y>{,<instance id>};
 
 Warps all players in the <instance id> to <map name> to the given coordinates.
 If no ID is specified, the IM_PARTY instance the invoking player is attached
 to is used. If that fails, the script will come to a halt.
 
-<flag> bitmask allows to add restrictions.
-
-Available values for the <flag> bitmask:
- IWA_NONE			No restriction. (default)
- IWA_NOTDEAD		If dead players are warped or not
-
 ---------------------------------------
 
 *instance_announce <instance id>,"<text>",<flag>{,<fontColor>{,<fontType>{,<fontSize>{,<fontAlign>{,<fontY>}}}}};
@@ -11036,13 +10964,13 @@ If <char id> is specified, the specified player is used rather than the attached
 
 ---------------------------------------
 
-*itemlink(<item_id>{,<refine>{,<card0>{,<card1>{,<card2>{,<card3>,{<enchantgrade>{,<RandomIDArray>,<RandomValueArray>,<RandomParamArray>}}}}}}});
+*itemlink(<item_id>,<refine>,<card0>,<card1>,<card2>,<card3>,<enchantgrade>{,<RandomIDArray>,<RandomValueArray>,<RandomParamArray>});
 
 Generates an item link string for an item that can be used for npctalk, message,
 dispbottom, and broadcast commands. The result is a clickable-item name just
 like SHIFT+Click from a player's inventory/cart/equipment window. This command can be
-used with mes but the item name will not be clickable. You should use script command
-"mesitemlink" for displaying item links in mes dialogues, if the client supports them. 
+used with mes but the item name will not be clickable. You should use the normal client
+tags for displaying item links in mes dialogues, if the client supports them. 
 
 
 Examples:
@@ -11059,24 +10987,6 @@ Examples:
 RandomIDArray, RandomValueArray, and RandomParamArray only works if the
 client (and server) supports the Item Random Options feature (PACKETVER >= 20150225).
 
----------------------------------------
-
-*mesitemlink(<item_id>{,<use_brackets>{,<display_name>});
-
-Generates an itemlink string for an item and can be used with NPC's mes command.
-The NPC message will show the item's name which will be clickable and opens the
-item description client side.
-By default <use_brackets> is true which surrounds the link with brackets. Send false to disable.
-By default the link will be created with the name of the item stored in the item database,
-but in some cases it might be necessary to overwrite the <display_name> with something else.
-
-Examples:
-
-	mes mesitemlink( 1201 ); // Will display "[Knife]" and will be clickable. If clicked it opens the description for Knife [3]
-	mes "Bring me a " + mesitemlink( 1201 ) + "."; // Will display "Bring me a [Knife]." and "[Knife]" will be clickable.
-	mes "Bring me a " + mesitemlink( 1201, false ) + "."; // Will display "Bring me a Knife." and "Knife" will be clickable.
-	mes "Bring me a " + mesitemlink( 1201, true, "Super cutting knife" ) + "."; // Will display "Bring me a [Super cutting knife]." and "[Super cutting knife]" will be clickable.
-
 ========================
 |14.- Channel commands.|
 ========================

doc/status.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20221216
+//= 20221013
 //===== Description: =========================================
 //= Explanation of the status.yml file and structure.
 //============================================================
@@ -226,13 +226,11 @@ Flags: Various status flags for specific status change events.
 	RemoveOnRefresh       - Removed by RK_REFRESH.
 	RemoveOnLuxAnima      - Removed by RK_LUXANIMA.
 	RemoveOnMapWarp       - Removed when warping to another map.
-	RemoveOnChangeMap     - Removed when changing map-server.
 	RemoveChemicalProtect - Removed by AM_CP_ARMOR/AM_CP_HELM/AM_CP_SHIELD/AM_CP_WEAPON.
 	RemoveElementalOption - Removed by elemental changing modes/quitting/EL_TIDAL_WEAPON/EL_WATER_SCREEN on the master and elemental.
 	RemoveOnUnequip       - Removed when unequipping any type of equipment.
 	RemoveOnUnequipWeapon - Removed when unequipping a weapon.
 	RemoveOnUnequipArmor  - Removed when unequipping an armor.
-	RemoveOnHermode       - Removed by CG_HERMODE.
 
 	StopAttacking         - Makes the unit stop attacking.
 	StopCasting           - Makes the unit stop casting skills.
@@ -248,7 +246,6 @@ Flags: Various status flags for specific status change events.
 	NonPlayer             - Sends the NPC_SHOWEFST_UPDATE packet. Used to send effects to NPC/monsters.
 
 	RequireWeapon         - Status requires a weapon to be equipped.
-	RequireNoWeapon       - Status requires that no weapons be equipped.
 	RequireShield         - Status requires a shield to be equipped.
 
 	SuperNoviceAngel      - Status that is given from Super Novice Angel.

doc/yaml/db/enchantgrade.yml

@@ -1,34 +0,0 @@
-###########################################################################
-# Enchantgrade Database
-###########################################################################
-#
-# Enchantgrade Settings
-#
-###########################################################################
-# - Type                                Item type.
-#   Levels:                             Enchantgrade settings per item level.
-#     - Level                           Item level.
-#       Grades:                         Enchantgrade settings per grade level.
-#         - Grade                       Enchantgrade level.
-#           Chances:                    Chance settings per refine level.
-#             - Refine                  Refine level.
-#               Chance                  Base chance of success out of 0~10000.
-#           Bonus                       Enchantgrade bonus. (Default: 0)
-#           AnnounceSuccess             Announce on upgrade success. (Default: true)
-#           AnnounceFail                Announce on upgrade failure. (Default: false)
-#           Announce                    Announce on upgrade success and failure.
-#           Catalyst:                   Catalyst item to increase chance of success.
-#             Item                      The item that can be used.
-#             AmountPerStep             Amount of Item needed.
-#                                       Set to 0 to disable the catalyst.
-#             MaximumSteps              Maximum amount of times Item can be used.
-#             ChanceIncrease            Amount at which the chance increases for each Item used.
-#           Options:                    Success chance based on cost type.
-#             - Option                  Index of the client option.
-#               Item                    Required item.
-#               Amount                  Amount of required item. (Default: 1)
-#                                       Set to 0 to remove an option.
-#               Price                   Amount of zeny required. (Default: 0)
-#               BreakingRate            Chance of item breaking out of 0~10000. (Default: 0)
-#               DowngradeAmount         Number of refine levels reduced on failure. (Default: 0)
-###########################################################################

doc/yaml/db/homunculus_db.yml

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

doc/yaml/db/item_cash.yml

@@ -1,12 +0,0 @@
-###########################################################################
-# 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).
-###########################################################################

doc/yaml/db/license.yml

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

doc/yaml/sql/item_db2_re.sql

@@ -39,7 +39,6 @@ CREATE TABLE `item_db2_re` (
   `job_rogue` tinyint(1) unsigned DEFAULT NULL,
   `job_sage` tinyint(1) unsigned DEFAULT NULL,
   `job_soullinker` tinyint(1) unsigned DEFAULT NULL,
-  `job_spirit_handler` tinyint(1) unsigned DEFAULT NULL,
   `job_stargladiator` tinyint(1) unsigned DEFAULT NULL,
   `job_summoner` tinyint(1) unsigned DEFAULT NULL,
   `job_supernovice` tinyint(1) unsigned DEFAULT NULL,
@@ -54,7 +53,6 @@ CREATE TABLE `item_db2_re` (
   `class_third` tinyint(1) unsigned DEFAULT NULL,
   `class_third_upper` tinyint(1) unsigned DEFAULT NULL,
   `class_third_baby` tinyint(1) unsigned DEFAULT NULL,
-  `class_fourth` tinyint(1) unsigned DEFAULT NULL,
   `gender` varchar(10) DEFAULT NULL,
   `location_head_top` tinyint(1) unsigned DEFAULT NULL,
   `location_head_mid` tinyint(1) unsigned DEFAULT NULL,

doc/yaml/sql/item_db_re.sql

@@ -39,7 +39,6 @@ CREATE TABLE `item_db_re` (
   `job_rogue` tinyint(1) unsigned DEFAULT NULL,
   `job_sage` tinyint(1) unsigned DEFAULT NULL,
   `job_soullinker` tinyint(1) unsigned DEFAULT NULL,
-  `job_spirit_handler` tinyint(1) unsigned DEFAULT NULL,
   `job_stargladiator` tinyint(1) unsigned DEFAULT NULL,
   `job_summoner` tinyint(1) unsigned DEFAULT NULL,
   `job_supernovice` tinyint(1) unsigned DEFAULT NULL,
@@ -54,7 +53,6 @@ CREATE TABLE `item_db_re` (
   `class_third` tinyint(1) unsigned DEFAULT NULL,
   `class_third_upper` tinyint(1) unsigned DEFAULT NULL,
   `class_third_baby` tinyint(1) unsigned DEFAULT NULL,
-  `class_fourth` tinyint(1) unsigned DEFAULT NULL,
   `gender` varchar(10) DEFAULT NULL,
   `location_head_top` tinyint(1) unsigned DEFAULT NULL,
   `location_head_mid` tinyint(1) unsigned DEFAULT NULL,

doc/yaml/sql/mob_db.sql

@@ -57,9 +57,6 @@ CREATE TABLE `mob_db` (
   `racegroup_temple_demon` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_illusion_vampire` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_malangdo` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
   `element` varchar(24) DEFAULT NULL,
   `element_level` tinyint(4) unsigned DEFAULT NULL,
   `walk_speed` smallint(6) unsigned DEFAULT NULL,

doc/yaml/sql/mob_db2.sql

@@ -57,9 +57,6 @@ CREATE TABLE `mob_db2` (
   `racegroup_temple_demon` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_illusion_vampire` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_malangdo` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
   `element` varchar(24) DEFAULT NULL,
   `element_level` tinyint(4) unsigned DEFAULT NULL,
   `walk_speed` smallint(6) unsigned DEFAULT NULL,

doc/yaml/sql/mob_db2_re.sql

@@ -59,9 +59,6 @@ CREATE TABLE `mob_db2_re` (
   `racegroup_temple_demon` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_illusion_vampire` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_malangdo` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
   `element` varchar(24) DEFAULT NULL,
   `element_level` tinyint(4) unsigned DEFAULT NULL,
   `walk_speed` smallint(6) unsigned DEFAULT NULL,

doc/yaml/sql/mob_db_re.sql

@@ -59,9 +59,6 @@ CREATE TABLE `mob_db_re` (
   `racegroup_temple_demon` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_illusion_vampire` tinyint(1) unsigned DEFAULT NULL,
   `racegroup_malangdo` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
   `element` varchar(24) DEFAULT NULL,
   `element_level` tinyint(4) unsigned DEFAULT NULL,
   `walk_speed` smallint(6) unsigned DEFAULT NULL,

npc/custom/official/GeffenMagicTournament.txt

@@ -260,7 +260,7 @@ L_Shield:
 				case 3: goto L_Menu; break;
 			}
 			mes .@n$;
-			mes mesitemlink( .@item, false );
+			mes "<ITEM>"+getitemname(.@item)+"<INFO>"+.@item+"</INFO></ITEM>";
 			mes "Price is "+.@cost+" coins";
 			mes "Do you wish to exchange your coins?";
 			next;
@@ -303,7 +303,7 @@ L_Ring:
 						break;
 				}
 			mes .@n$;
-			mes mesitemlink( .@item, false );
+			mes "<ITEM>"+getitemname(.@item)+"<INFO>"+.@item+"</INFO></ITEM>";
 			mes "Price is "+.@cost+" coins";
 			mes "Do you wish to exchange your coins?";
 			next;
@@ -345,7 +345,7 @@ L_Armor:
 						break;
 				}
 			mes .@n$;
-			mes mesitemlink( .@item, false );
+			mes "<ITEM>"+getitemname(.@item)+"<INFO>"+.@item+"</INFO></ITEM>";
 			mes "Price is "+.@cost+" coins";
 			mes "Do you wish to exchange your coins?";
 			next;

npc/custom/warper.txt

@@ -127,14 +127,13 @@ function Restrict {
 	Towns:
 // --------------------------------------------------
 menu	"Prontera",T1, "Alberta",T2, "Aldebaran",T3, "Amatsu",T4, "Ayothaya",T5,
-    	"Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10,
-		"Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Hugel",T14, "Ice Castle",T15,
-		"Izlude",T16, "Jawaii",T17, "Juno",T18, "Kunlun",T19, "Lasagna",T20,
-		"Lighthalzen",T21, "Luoyang",T22, "Lutie",T23, "Malangdo",T24, "Malaya",T25,
-		"Manuk",T26, "Midgarts Expedition Camp",T27, "Mora",T28, "Morocc",T29, "Moscovia",T30,
-		"Nameless Island (Day)",T31, "Nameless Island (Night)",T32, "Niflheim",T33, "Payon",T34, "Rachel",T35,
-		"Rockridge",T36, "Special Security Area, Cor",T37, "Splendide",T38, "Thor Camp",T39, "Umbala",T40,
-		"Varmundt's Mansion",T41, "Veins",T42, "Verus Findspot",T43, "Wolf Village",T44;
+    	"Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10, 
+    	"Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Kunlun",T14, "Hugel",T15,
+    	"Izlude",T16, "Jawaii",T17, "Lasagna",T18, "Lighthalzen",T19, "Luoyang",T20,
+		"Lutie",T21, "Malangdo",T22, "Malaya",T23, "Manuk",T24,
+		"Midgarts Expedition Camp",T25, "Mora",T26, "Morocc",T27, "Moscovia",T28,
+		"Nameless Island",T29, "Niflheim",T30, "Payon",T31, "Rachel",T32, "Splendide",T33,
+		"Thor Camp",T34, "Umbala",T35, "Veins",T36, "Juno",T37;
 
 T1: Go("prontera",155,183);
 T2: Go("alberta",28,234);
@@ -153,47 +152,34 @@ T11: Go("einbroch",64,200);
 T12: Restrict("RE");
 	 Go("dicastes01",198,187);
 T13: Go("geffen",119,59);
-T14: Go("hugel",96,145);
-T15: Restrict("RE");
-	 Go("icecastle",185,212);
+T14: Go("gonryun",160,120);
+T15: Go("hugel",96,145);
 T16: Go("izlude",128,(checkre(3)?146:114));
 T17: Go("jawaii",251,132);
-T18: Go("yuno",157,51);
-T19: Go("gonryun",160,120);
-T20: Restrict("RE");
+T18: Restrict("RE");
 	 Go("lasagna",193,182);
-T21: Go("lighthalzen",158,92);
-T22: Go("louyang",217,100);
-T23: Go("xmas",147,134);
-T24: Restrict("RE");
+T19: Go("lighthalzen",158,92);
+T20: Go("louyang",217,100);
+T21: Go("xmas",147,134);
+T22: Restrict("RE");
 	 Go("malangdo",140,114);
-T25: Restrict("RE");
+T23: Restrict("RE");
 	 Go("malaya",231,200);
-T26: Go("manuk",282,138);
-T27: Go("mid_camp",210,288);
-T28: Restrict("RE");
+T24: Go("manuk",282,138);
+T25: Go("mid_camp",210,288);
+T26: Restrict("RE");
 	 Go("mora",55,146);
-T29: Go("morocc",156,93);
-T30: Go("moscovia",223,184);
-T31: Go("nameless_i",256,215);
-T32: Go("nameless_n",256,215);
-T33: Go("niflheim",202,174);
-T34: Go("payon",179,100);
-T35: Go("rachel",130,110);
-T36: Restrict("RE");
-	 Go("harboro1",298,206);
-T37: Restrict("RE");
-	 Go("sp_cor",160,166);
-T38: Go("splendide",201,147);
-T39: Go("thor_camp",246,68);
-T40: Go("umbala",97,153);
-T41: Restrict("RE");
-	Go("ba_maison",72,146);
-T42: Go("veins",216,123);
-T43: Restrict("RE");
-	 Go("verus04",123,250);
-T44: Restrict("RE");
-	 Go("wolfvill",144,144);
+T27: Go("morocc",156,93);
+T28: Go("moscovia",223,184);
+T29: Go("nameless_n",256,215);
+T30: Go("niflheim",202,174);
+T31: Go("payon",179,100);
+T32: Go("rachel",130,110);
+T33: Go("splendide",201,147);
+T34: Go("thor_camp",246,68);
+T35: Go("umbala",97,153);
+T36: Go("veins",216,123);
+T37: Go("yuno",157,51);
 
 // --------------------------------------------------
 	Fields:
@@ -202,14 +188,13 @@ T44: Restrict("RE");
 menu	"Amatsu Fields",F1, "Ayothaya Fields",F2, "Bifrost Fields", F3,
     	"Brasilis Fields",F4, "Comodo Fields",F5, "Dewata Fields",F6,
     	"Eclage Fields",F7, "Einbroch Fields",F8, "El Dicastes Fields",F9,
-    	"Frozen Scale Fields",F10, "Geffen Fields",F11, "Grey Wolf Forest",F12,
-		"Hugel Fields",F13, "Juno Fields",F14, "Kiwawa Desert",F15,
-		"Kunlun Fields",F16, "Lasagna Fields",F17, "Lighthalzen Fields",F18,
-		"Luoyang Field",F19, "Lutie Field",F20, "Malaya Fields",F21,
-		"Manuk Fields",F22, "Mjolnir Fields",F23, "Moscovia Fields",F24,
-		"Niflheim Fields",F25, "Payon Forests",F26, "Prontera Fields",F27,
-		"Rachel Fields",F28, "Sograt Deserts",F29, "Splendide Fields",F30,
-		"Umbala Fields",F31, "Veins Fields",F32;
+    	"Geffen Fields",F10, "Kunlun Fields",F11, "Hugel Fields",F12,
+		"Lasagna Fields",F13, "Lighthalzen Fields",F14, "Luoyang Field",F15, 
+		"Lutie Field",F16, "Malaya Fields",F17, "Manuk Fields",F18, 
+		"Mjolnir Fields",F19, "Moscovia Fields",F20, "Niflheim Fields",F21, 
+		"Payon Forests",F22, "Prontera Fields",F23, "Rachel Fields",F24, 
+		"Sograt Deserts",F25, "Splendide Fields",F26, "Umbala Fields",F27, 
+		"Veins Fields",F28, "Juno Fields",F29;
 
 F1: setarray @c[2],190,197;
 	Disp("Amatsu Field",1,1); Pick("ama_fild");
@@ -236,55 +221,43 @@ F8: Restrict("Pre-RE",2,10);
 F9: Restrict("RE");
 	setarray @c[2],143,132,143,217;
 	Disp("El Dicastes Field",1,2); Pick("dic_fild");
-F10: Restrict("RE");
-	 setarray @c[2],378,223,223,18,365,241,140,280;
-	 Disp("Frozen Scale Hill:Frozen Scale Plains:Frozen Scale Glacier:Frozen Tail"); Pick("","jor_back1","jor_back2","jor_back3","jor_tail");
-F11: Restrict("Pre-RE",13,15);
+F10: Restrict("Pre-RE",13,15);
 	 setarray @c[0],46,199,213,204,195,212,257,192,188,171,166,263,248,158,195,191,186,183,221,117,178,218,136,328,240,181,235,235,211,185;
 	 Disp("Geffen Field",0,14); Pick("gef_fild",1);
-F12: Restrict("RE");
-	 setarray @c[2],22,315,122,388;
-	 Disp("Grey Wolf Forest",1,2); Pick("gw_fild");
-F13: Restrict("Pre-RE",3,7);
+F11: setarray @c[2],220,227;
+	 Disp("Kunlun Field",1,1); Pick("gon_fild");
+F12: Restrict("Pre-RE",3,7);
 	 setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197;
 	 Disp("Hugel Field",1,7); Pick("hu_fild");
-F14: Restrict("Pre-RE",5,10);
-	 setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304;
-	 Disp("Juno Field",1,12); Pick("yuno_fild");
-F15: Restrict("RE");
-	 setarray @c[2],38,246,31,207;
-	 Disp("Kiwawa Desert",1,2); Pick("","rockrdg1","rockrdg2");
-F16: setarray @c[2],220,227;
-	 Disp("Kunlun Field",1,1); Pick("gon_fild");
-F17: Restrict("RE");
+F13: Restrict("RE");
 	 setarray @c[2],344,371,20,98;
 	 Disp("Lasagna Field",1,2); Pick("lasa_fild");	 
-F18: setarray @c[2],240,179,185,235,240,226;
+F14: setarray @c[2],240,179,185,235,240,226;
 	 Disp("Lighthalzen Field",1,3); Pick("lhz_fild");
-F19: setarray @c[2],229,187;
+F15: setarray @c[2],229,187;
 	 Disp("Luoyang Field",1,1); Pick("lou_fild");
-F20: setarray @c[2],115,145;
+F16: setarray @c[2],115,145;
 	 Disp("Lutie Field",1,1); Pick("xmas_fild");
-F21: Restrict("RE");
+F17: Restrict("RE");
 	 setarray @c[2],40,272,207,180;
 	 Disp("Malaya Field",1,2); Pick("ma_fild");
-F22: setarray @c[2],35,236,35,262,84,365;
+F18: setarray @c[2],35,236,35,262,84,365;
 	 Disp("Manuk Field",1,3); Pick("man_fild");
-F23: setarray @c[2],204,120,175,193,208,213,179,180,181,240,195,270,235,202,188,215,205,144,245,223,180,206,196,208;
+F19: setarray @c[2],204,120,175,193,208,213,179,180,181,240,195,270,235,202,188,215,205,144,245,223,180,206,196,208;
 	 Disp("Mjolnir Field",1,12); Pick("mjolnir_");
-F24: setarray @c[2],82,104,131,147;
+F20: setarray @c[2],82,104,131,147;
 	 Disp("Moscovia Field",1,2); Pick("mosk_fild");
-F25: setarray @c[2],215,229,167,234;
+F21: setarray @c[2],215,229,167,234;
 	 Disp("Niflheim Field",1,2); Pick("nif_fild");
-F26: Restrict("Pre-RE",5,11);
+F22: Restrict("Pre-RE",5,11);
 	 setarray @c[2],158,206,151,219,205,148,186,247,134,204,193,235,200,177,137,189,201,224,160,205,194,150;
 	 Disp("Payon Forest",1,11); Pick("pay_fild");
-F27: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
+F23: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
 	 Disp("Prontera Field",0,11); Pick("prt_fild",1);
-F28: Restrict("Pre-RE",2,7,9,10,11,13);
+F24: Restrict("Pre-RE",2,7,9,10,11,13);
 	 setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197;
 	 Disp("Rachel Field",1,13); Pick("ra_fild");
-F29: if(.Satan_Morocc){
+F25: if(.Satan_Morocc){
 	 setarray @c[2],219,205,177,206,194,182,224,170,198,216,156,187,185,263,206,228,208,238,209,223,85,97,207,202,31,195,38,195;
 	 Disp("Sograt Desert 1:Sograt Desert 2:Sograt Desert 3:Sograt Desert 7:Sograt Desert 11:Sograt Desert 12:Sograt Desert 13:Sograt Desert 16:Sograt Desert 17:Sograt Desert 18:Sograt Desert 19:Sograt Desert 20:Sograt Desert 21:Sograt Desert 22");
 	 Pick("","moc_fild01","moc_fild02","moc_fild03","moc_fild07","moc_fild11","moc_fild12","moc_fild13","moc_fild16","moc_fild17","moc_fild18","moc_fild19","moc_fild20","moc_fild21","moc_fild22");
@@ -292,195 +265,133 @@ F29: if(.Satan_Morocc){
 	 setarray @c[2],219,205,177,206,194,182,146,297,204,197,275,302,224,170,139,123,101,110,341,39,198,216,156,187,185,263,223,222,170,257,206,228,208,238,209,223,85,97;
 	 Disp("Sograt Desert",1,19); Pick("moc_fild");
 	 }
-F30: setarray @c[2],175,186,236,184,188,204;
+F26: setarray @c[2],175,186,236,184,188,204;
 	 Disp("Splendide Field",1,3); Pick("spl_fild");
-F31: setarray @c[2],217,206,223,221,237,215,202,197;
+F27: setarray @c[2],217,206,223,221,237,215,202,197;
 	 Disp("Umbala Field",1,4); Pick("um_fild");
-F32: Restrict("Pre-RE",5);
+F28: Restrict("Pre-RE",5);
 	 setarray @c[2],186,175,196,370,222,45,51,250,202,324,150,223,149,307;
 	 Disp("Veins Field",1,7); Pick("ve_fild");
+F29: Restrict("Pre-RE",5,10);
+	 setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304;
+	 Disp("Juno Field",1,12); Pick("yuno_fild");
 
 // --------------------------------------------------
 	Dungeons:
 // --------------------------------------------------
 @d = true;
-menu	"Abandoned Lab Amicitia",D1, "Abyss Lakes",D2, "Amatsu Dungeon",D3,
-		"Anthell",D4, "Ayothaya Dungeon",D5, "Beach Dungeon",D6,
-		"Bifrost Tower",D7, "Bio Labs",D8, "Brasilis Dungeon",D9,
-		"Byalan Dungeon",D10, "Clock Tower",D11, "Coal Mines",D12,
-		"Culvert",D13, "Cursed Abbey",D14, "Dewata Dungeon",D15,
-		"Einbroch Dungeon",D16, "Flame Basin",D17, "Gefenia",D18,
-		"Geffen Dungeon",D19, "Glast Heim",D20, "Hidden Dungeon",D21,
-		"Ice Dungeon",D22, "Illusion Dungeon",D23, "Issgard Dungeon",D24,
-		"Juperos",D25, "Kiel Dungeon",D26, "Kunlun Dungeon",D27,
-		"Lasagna Dungeon",D28, "Luoyang Dungeon",D29, "Magma Dungeon",D30,
-		"Malangdo Dungeon",D31, "Moscovia Dungeon",D32, "Nidhogg's Dungeon",D33,
-		"Niflheim Dungeon",D34, "Odin Temple",D35, "Orc Dungeon",D36,
-		"Oz Labyrinth Dungeon",D37, "Payon Dungeon",D38, "Prontera Underground",D39,
-		"Pyramids",D40, "Rachel Sanctuary",D41, "Rock Ridge Dungeon",D42,
-		"Rudus Dungeon",D43, "Scaraba Hole",D44, "Sphinx",D45,
-		"Sunken Ship",D46, "Thanatos Tower",D47, "Thor Volcano",D48,
-		"Toy Factory",D49, "Turtle Dungeon",D50, "Umbala Dungeon",D51,
-		"Varmundt's Dungeon",D52, "Verus Area",D53;
+menu	"Abyss Lakes",D1, "Amatsu Dungeon",D2, "Anthell",D3,
+    	"Ayothaya Dungeon",D4, "Beach Dungeon",D5, "Bifrost Tower",D42,
+    	"Bio Labs",D6, "Brasilis Dungeon",D7, "Byalan Dungeon",D8, "Clock Tower",D9,
+    	"Coal Mines",D10, "Culvert",D11, "Cursed Abbey",D12, "Dewata Dungeon",D13,
+    	"Einbroch Dungeon",D14, "Gefenia",D15, "Geffen Dungeon",D16,
+    	"Glast Heim",D17, "Kunlun Dungeon",D18, "Hidden Dungeon",D19,
+    	"Ice Dungeon",D20, "Juperos",D21, "Kiel Dungeon",D22, "Lasagna Dungeon",D23,
+		"Luoyang Dungeon",D24, "Magma Dungeon",D25, "Malangdo Dungeon",D26,
+		"Moscovia Dungeon",D27, "Nidhogg's Dungeon",D28, "Odin Temple",D29,
+		"Orc Dungeon",D30, "Payon Dungeon",D31, "Pyramids",D32, "Rachel Sanctuary",D33,
+    	"Scaraba Hole",D34, "Sphinx",D35, "Sunken Ship",D36, "Thanatos Tower",D37,
+    	"Thor Volcano",D38, "Toy Factory",D39, "Turtle Dungeon",D40, "Umbala Dungeon",D41;
 
-D1: Restrict("RE");
-	setarray @c[2],253,244,145,278;
-	Disp("1st Floor - Comprehensive Lab:2nd Floor - Intensive Culture Room"); Pick("","amicitia1","amicitia2");
-D2: Restrict("RE",4);
-	setarray @c[2],261,272,275,270,116,27,169,159;
-	Disp("Abyss Lakes",1,4); Pick("abyss_");
-D3: setarray @c[2],228,11,34,41,119,14;
+D1: setarray @c[2],261,272,275,270,116,27;
+	Disp("Abyss Lakes",1,3); Pick("abyss_");
+D2: setarray @c[2],228,11,34,41,119,14;
 	Disp("Amatsu Dungeon",1,3); Pick("ama_dun");
-D4: setarray @c[2],35,262,168,170;
+D3: setarray @c[2],35,262,168,170;
 	Disp("Anthell",1,2); Pick("anthell");
-D5: setarray @c[2],275,19,24,26;
+D4: setarray @c[2],275,19,24,26;
 	Disp("Ancient Shrine Maze:Inside Ancient Shrine"); Pick("ayo_dun");
-D6: setarray @c[2],266,67,255,244,23,260;
+D5: setarray @c[2],266,67,255,244,23,260;
 	Disp("Beach Dungeon",1,3); Pick("","beach_dun","beach_dun2","beach_dun3");
+D6: Restrict("RE",4);
+	setarray @c[2],150,288,150,18,140,134,244,52;
+	Disp("Bio Lab",1,4); Pick("lhz_dun");
 D7: Restrict("RE");
-	setarray @c[2],57,13,64,88,45,14,26,23;
-	Disp("Bifrost Tower",1,4); Pick("ecl_tdun");
-D8: Restrict("RE",4,5);
-	setarray @c[2],150,288,150,18,140,134,244,52,100,202;
-	Disp("Bio Lab 1:Bio Lab 2:Bio Lab 3:Bio Lab 4:Tomb of the Fallen"); Pick("","lhz_dun01","lhz_dun02","lhz_dun03","lhz_dun04","lhz_dun_n");
-D9: Restrict("RE");
 	setarray @c[2],87,47,262,262;
 	Disp("Brasilis Dungeon",1,2); Pick("bra_dun");
-D10: Restrict("RE",6);
-	 setarray @c[0],168,168,253,252,236,204,32,63,26,27,141,187;
-	 Disp("Byalan Dungeon",1,6); Pick("iz_dun",1);
-D11: Restrict("RE",9,10,11);
-	 setarray @c[2],199,159,148,283,65,147,56,155,297,25,127,169,277,178,268,74,266,27,60,142,79,39;
-	 Disp("Clock Tower 1:Clock Tower 2:Clock Tower 3:Clock Tower 4:Basement 1:Basement 2:Basement 3:Basement 4:Nightmare Clock Tower, 2nd Floor:Nightmare Clock Tower, 3rd Floor:Unknown Basement");
-	 Pick("","c_tower1","c_tower2","c_tower3","c_tower4","alde_dun01","alde_dun02","alde_dun03","alde_dun04","c_tower2_","c_tower3_","clock_01");
-D12: setarray @c[2],52,17,381,343,302,262;
+D8: Restrict("RE",6);
+	setarray @c[0],168,168,253,252,236,204,32,63,26,27,141,187;
+	Disp("Byalan Dungeon",1,6); Pick("iz_dun",1);
+D9: setarray @c[2],199,159,148,283,65,147,56,155,297,25,127,169,277,178,268,74;
+	Disp("Clock Tower 1:Clock Tower 2:Clock Tower 3:Clock Tower 4:Basement 1:Basement 2:Basement 3:Basement 4");
+	Pick("","c_tower1","c_tower2","c_tower3","c_tower4","alde_dun01","alde_dun02","alde_dun03","alde_dun04");
+D10: setarray @c[2],52,17,381,343,302,262;
 	 Disp("Coal Mines",1,3); Pick("mjo_dun");
-D13: setarray @c[2],131,247,19,19,180,169,100,92;
+D11: setarray @c[2],131,247,19,19,180,169,100,92;
 	 Disp("Culvert",1,4); Pick("","prt_sewb1","prt_sewb2","prt_sewb3","prt_sewb4");
-D14: setarray @c[2],51,14,150,11,120,10;
+D12: setarray @c[2],51,14,150,11,120,10;
 	 Disp("Cursed Abbey",1,3); Pick("abbey");
-D15: Restrict("RE");
+D13: Restrict("RE");
 	 setarray @c[2],285,160,299,29;
 	 Disp("Dewata Dungeon",1,2); Pick("dew_dun");
-D16: Restrict("RE",3);
-	 setarray @c[2],22,14,292,290,269,279;
-	 Disp("Einbroch Dungeon",1,3); Pick("ein_dun");
-D17: Restrict("RE");
-	 Go("moro_vol",97,107);
-D18: setarray @c[2],40,103,203,34,266,168,130,272;
+D14: setarray @c[2],22,14,292,290;
+	 Disp("Einbroch Dungeon",1,2); Pick("ein_dun");
+D15: setarray @c[2],40,103,203,34,266,168,130,272;
 	 Disp("Gefenia",1,4); Pick("gefenia",0);
-D19: setarray @c[0],104,99,115,236,106,132,203,200;
+D16: setarray @c[0],104,99,115,236,106,132,203,200;
 	 Disp("Geffen Dungeon",1,4); Pick("gef_dun",1);
-D20: Restrict("RE",17,18,19);
-	 setarray @c[2],370,304,199,29,104,25,150,15,157,287,147,15,258,255,108,291,171,283,68,277,156,7,12,7,133,271,224,274,14,70,150,14,104,31,148,144,199,29;
-	 Disp("Entrance:Castle 1:Castle 2:Chivalry 1:Chivalry 2:Churchyard:Culvert 1:Culvert 2:Culvert 3:Culvert 4:St. Abbey:Staircase Dungeon:Underground Cave 1:Underground Cave 2:Underground Prison 1:Underground Prison 2:Castle 2 - Nightmare Mode:Churchyard - Nightmare Mode:Abyss Glastheim Castle F1");
-	 Pick("","glast_01","gl_cas01","gl_cas02","gl_knt01","gl_knt02","gl_chyard","gl_sew01","gl_sew02","gl_sew03","gl_sew04","gl_church","gl_step","gl_dun01","gl_dun02","gl_prison","gl_prison1","gl_cas02_","gl_chyard_","gl_cas01_");
-D21: setarray @c[2],99,31,93,20,182,88;
-	 Disp("Hidden Dungeon",1,3); Pick("prt_maze");
-D22: setarray @c[2],157,14,151,155,149,22,33,158;
-	 Disp("Ice Dungeon",1,4); Pick("ice_dun");
-D23: menu	"Illusion of Abyss",SubD1, "Illusion of Frozen",SubD2, "Illusion of Labyrinth",SubD3,
-			"Illusion of Luanda",SubD4, "Illusion of Moonlight",SubD5, "Illusion of Teddy Bear",SubD6,
-			"Illusion of Twins",SubD7, "Illusion of Underwater",SubD8, "Illusion of Vampire",SubD9;
-	SubD1: Restrict("RE");
-		   setarray @c[2],132,189,99,186;
-		   Disp("Desolate Village:Bleak Turtle Palace"); Pick("","tur_d03_i","tur_d04_i");
-	SubD2: Restrict("RE");
-		   Go("ice_d03_i",149,22);
-	SubD3: Restrict("RE");
-		   Go("prt_mz03_i",100,100);
-	SubD4: Restrict("RE");
-		   Go("com_d02_i",250,245);
-	SubD5: Restrict("RE");
-		   Go("pay_d03_i",140,44);
-	SubD6: Restrict("RE");
-		   Go("ein_d02_i",164,184);
-	SubD7: Restrict("RE");
-		   Go("ant_d02_i",168,170);
-	SubD8: Restrict("RE");
-		   setarray @c[2],130,230,141,188;
-		   Disp("Deep Sea Cave",1,2); Pick("","iz_d04_i","iz_d05_i");
-	SubD9: Restrict("RE");
-		   Go("gef_d01_i",114,216);
-D24: Restrict("RE");
-	 setarray @c[2],112,15,280,87,112,12,274,85;
-	 Disp("Abandoned Pit Floor 1:Abandoned Pit Floor 2:Snake God's Warmth 1st Floor:Snake God's Warmth 2nd Floor"); Pick("","jor_ab01","jor_ab02","jor_dun01","jor_dun02");
-D25: Restrict("RE",5);
-	 setarray @c[2],140,51,53,247,37,63,150,285,146,215;
-	 Disp("Entrance:Juperos 1:Juperos 2:Core:Eastern Ruins of Juperos");
-	 Pick("","jupe_cave","juperos_01","juperos_02","jupe_core","ver_eju");
-D26: setarray @c[2],28,226,41,198;
-	 Disp("Kiel Dungeon",1,2); Pick("kh_dun");
-D27: setarray @c[2],153,53,28,113,68,16;
+D17: setarray @c[2],370,304,199,29,104,25,150,15,157,287,147,15,258,255,108,291,171,283,68,277,156,7,12,7,133,271,224,274,14,70,150,14;
+	 Disp("Entrance:Castle 1:Castle 2:Chivalry 1:Chivalry 2:Churchyard:Culvert 1:Culvert 2:Culvert 3:Culvert 4:St. Abbey:Staircase Dungeon:Underground Cave 1:Underground Cave 2:Underground Prison 1:Underground Prison 2");
+	 Pick("","glast_01","gl_cas01","gl_cas02","gl_knt01","gl_knt02","gl_chyard","gl_sew01","gl_sew02","gl_sew03","gl_sew04","gl_church","gl_step","gl_dun01","gl_dun02","gl_prison","gl_prison1");
+D18: setarray @c[2],153,53,28,113,68,16;
 	 Disp("Kunlun Dungeon",1,3); Pick("gon_dun");
-D28: Restrict("RE");
+D19: setarray @c[2],176,7,93,20,23,8;
+	 Disp("Hidden Dungeon",1,3); Pick("prt_maze");
+D20: setarray @c[2],157,14,151,155,149,22,33,158;
+	 Disp("Ice Dungeon",1,4); Pick("ice_dun");
+D21: setarray @c[2],140,51,53,247,37,63,150,285;
+	 Disp("Entrance:Juperos 1:Juperos 2:Core");
+	 Pick("","jupe_cave","juperos_01","juperos_02","jupe_core");
+D22: setarray @c[2],28,226,41,198;
+	 Disp("Kiel Dungeon",1,2); Pick("kh_dun");
+D23: Restrict("RE");
 	 setarray @c[2],24,143,22,171,190,18;
 	 Disp("Lasagna Dungeon",1,3); Pick("lasa_dun");
-D29: setarray @c[2],218,196,282,20,165,38;
+D24: setarray @c[2],218,196,282,20,165,38;
 	 Disp("The Royal Tomb:Inside the Royal Tomb:Suei Long Gon"); Pick("lou_dun");
-D30: Restrict("RE",3);
-	 setarray @c[2],126,68,47,30,118,113;
-	 Disp("Magma Dungeon",1,3); Pick("mag_dun");
-D31: Restrict("RE");
+D25: setarray @c[2],126,68,47,30;
+	 Disp("Magma Dungeon",1,2); Pick("mag_dun");
+D26: Restrict("RE");
 	 setarray @c[2],33,230;
 	 Disp("Malangdo Dungeon",1,1); Pick("mal_dun");
-D32: setarray @c[2],189,48,165,30,32,135;
+D27: setarray @c[2],189,48,165,30,32,135;
 	 Disp("Moscovia Dungeon",1,3); Pick("mosk_dun");
-D33: setarray @c[2],61,239,60,271;
+D28: setarray @c[2],61,239,60,271;
 	 Disp("Nidhogg's Dungeon",1,2); Pick("nyd_dun");
-D34: Restrict("RE");
-	 setarray @c[2],145,90,150,20;
-	 Disp("Niflheim Dungeon - 1st Floor:Niflheim Dungeon - 2nd Floor"); Pick("nif_dun");
-D35: Restrict("RE",4);
-	 setarray @c[2],298,167,224,149,266,280,276,236;
-	 Disp("Odin Temple 1:Odin Temple 2:Odin Temple 3:Odin Past"); Pick("","odin_tem01","odin_tem02","odin_tem03","odin_past");
-D36: setarray @c[2],32,170,21,185;
+D29: setarray @c[2],298,167,224,149,266,280;
+	 Disp("Odin Temple",1,3); Pick("odin_tem");
+D30: setarray @c[2],32,170,21,185;
 	 Disp("Orc Dungeon",1,2); Pick("orcsdun");
-D37: Restrict("RE");
-	 setarray @c[2],21,191,141,277;
-	 Disp("Oz Labyrinth Floor 1:Oz Labyrinth Floor 2"); Pick("oz_dun");
-D38: setarray @c[0],21,183,19,33,19,63,155,159,201,204;
+D31: setarray @c[0],21,183,19,33,19,63,155,159,201,204;
 	 Disp("Payon Dungeon",1,5); Pick("pay_dun",1);
-D39: Restrict("RE");
-	 setarray @c[2],159,289,155,353;
-	 Disp("Prontera Underground Prison:Prontera Invasion"); Pick("","prt_prison","prt_q");
-D40: Restrict("RE",7,8);
+D32: Restrict("RE",7,8);
 	 setarray @c[2],192,9,10,192,100,92,181,11,94,96,192,8,94,96,192,8;
 	 Disp("Pyramids 1:Pyramids 2:Pyramids 3:Pyramids 4:Basement 1:Basement 2:Basement 1 - Nightmare Mode:Basement 2 - Nightmare Mode");
 	 Pick("","moc_pryd01","moc_pryd02","moc_pryd03","moc_pryd04","moc_pryd05","moc_pryd06","moc_prydn1","moc_prydn2");
-D41: setarray @c[2],140,11,32,21,8,149,204,218,150,9;
+D33: setarray @c[2],140,11,32,21,8,149,204,218,150,9;
 	 Disp("Rachel Sanctuary",1,5); Pick("ra_san");
-D42: Restrict("RE");
-	 setarray @c[2],247,19,281,104;
-	 Disp("Rock Ridge Mine:Underground Waterway Culvert"); Pick("","rockmi1","harboro2");
-D43: Restrict("RE");
-	 setarray @c[2],200,377,185,258,366,207,378,178;
-	 Disp("Rudus Dungeon",1,4); Pick("","sp_rudus","sp_rudus2","sp_rudus3","sp_rudus4");
-D44: Restrict("RE");
-	 setarray @c[2],364,44,101,141,101,141;
-	 Disp("Scaraba Hole",1,3); Pick("dic_dun");
-D45: setarray @c[2],288,9,149,81,210,54,10,222,100,99;
+D34: Restrict("RE");
+	 setarray @c[2],364,44,101,141;
+	 Disp("Scaraba Hole",1,2); Pick("dic_dun");
+D35: setarray @c[2],288,9,149,81,210,54,10,222,100,99;
 	 Disp("Sphinx",1,5); Pick("","in_sphinx1","in_sphinx2","in_sphinx3","in_sphinx4","in_sphinx5");
-D46: setarray @c[2],69,24,102,27;
+D36: setarray @c[2],69,24,102,27;
 	 Disp("Sunken Ship",1,2); Pick("treasure");
-D47: setarray @c[2],150,39,150,136,220,158,59,143,62,11,89,221,35,166,93,148,29,107,159,138,19,20,130,52;
+D37: setarray @c[2],150,39,150,136,220,158,59,143,62,11,89,221,35,166,93,148,29,107,159,138,19,20,130,52;
 	 Disp("Thanatos Tower",1,12); Pick("tha_t");
-D48: setarray @c[2],21,228,75,205,34,272;
+D38: setarray @c[2],21,228,75,205,34,272;
 	 Disp("Thor Volcano",1,3); Pick("thor_v");
-D49: setarray @c[2],205,15,129,133;
+D39: setarray @c[2],205,15,129,133;
 	 Disp("Toy Factory",1,2); Pick("xmas_dun");
-D50: setarray @c[2],154,49,148,261,132,189,100,192;
+D40: setarray @c[2],154,49,148,261,132,189,100,192;
 	 Disp("Entrance:Turtle Dungeon 1:Turtle Dungeon 2:Turtle Dungeon 3"); Pick("tur_dun");
-D51: Restrict("Pre-RE",1,2);
+D41: Restrict("Pre-RE",1,2);
 	 setarray @c[2],42,31,48,30,204,78;
 	 Disp("Carpenter's Shop in the Tree:Passage to a Foreign World:Hvergermil's Fountain");
 	 Pick("","um_dun01","um_dun02","yggdrasil01");
-D52: Restrict("RE");
-	 setarray @c[2],275,21,15,115,15,115,159,27,162,36,159,11,156,33,337,333,314,64,163,18,156,20,39,81;
-	 Disp("Sewage Treatment Plant:1st Power Plant:2nd Power Plant:Large Bath Meditathio:Lost Farm Valley:Library Memory Corridor:Upper Floor of Tartaros Storage:Lower Floor of Tartaros Storage:Death Rune:Fire Rune:Grass Rune:Ice Rune"); Pick("","ba_pw02","ba_pw01","ba_pw03","ba_bath","ba_lost","ba_lib","ba_2whs01","ba_2whs02","bl_death","bl_lava","bl_grass","bl_ice");
-D53: Restrict("RE");
-	 setarray @c[2],244,61,72,20,122,22;
-	 Disp("Lab-OPTATIO:R&D-WISH:Verus Center Square"); Pick("verus");
+D42: Restrict("RE");
+	 setarray @c[2],57,13,64,88,45,14,26,23;
+	 Disp("Bifrost Tower",1,4); Pick("ecl_tdun");
 
 // --------------------------------------------------
 	Castles:

npc/mapflag/nosave.txt

@@ -7,7 +7,6 @@
 //= 1.7 Updated. [Lupus]
 //= 1.8 Updated. [L0ne_W0lf]
 //= 1.9 Renewal split. [Euphy]
-//= 2.0 Moved instances to pre-renewal. [Lemongrass]
 //============================================================
 
 //============================================================
@@ -269,6 +268,23 @@ que_qaru03	mapflag	nosave	SavePoint
 que_qaru04	mapflag	nosave	SavePoint
 que_qaru05	mapflag	nosave	SavePoint
 
+//============================================================
+// Sealed Shrine
+//============================================================
+1@cata	mapflag	nosave	SavePoint
+2@cata	mapflag	nosave	SavePoint
+
+//============================================================
+// Endless Tower
+//============================================================
+e_tower	mapflag	nosave	SavePoint
+1@tower	mapflag	nosave	SavePoint
+2@tower	mapflag	nosave	SavePoint
+3@tower	mapflag	nosave	SavePoint
+4@tower	mapflag	nosave	SavePoint
+5@tower	mapflag	nosave	SavePoint
+6@tower	mapflag	nosave	SavePoint
+
 //============================================================
 // Battlegrounds
 //============================================================
@@ -291,6 +307,18 @@ schg_dun01	mapflag	nosave	SavePoint
 arug_que01	mapflag	nosave	SavePoint
 arug_dun01	mapflag	nosave	SavePoint
 
+//============================================================
+// Orc's Memory
+//============================================================
+1@orcs	mapflag	nosave	SavePoint
+2@orcs	mapflag	nosave	SavePoint
+
+//============================================================
+// Nidhoggr's Instance
+//============================================================
+1@nyd	mapflag	nosave	SavePoint
+2@nyd	mapflag	nosave	SavePoint
+
 //============================================================
 // RWC
 //============================================================

npc/merchants/cash_hair.txt

@@ -0,0 +1,125 @@
+//===== rAthena Script ======================================= 
+//= Cash Hair Stylist
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena Project
+//===== Description: ========================================= 
+//= Exchange cash item, New_Style_Coupon, for new hair styles.
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//============================================================
+
+itemmall,19,74,5	script	Stylist#cash	91,{
+	mes "[Stylist]";
+	mes "Hey, I'm Kaniki.";
+	mes "I'm here to start a new";
+	mes "trend by introducing my";
+	mes "special new hairstyles!";
+	mes "Give me a ^FF0000New Style Coupon^000000,";
+	mes "and I'll change your hair~";
+	next;
+	if (Sex == SEX_MALE) {
+		mes "[Kaniki]";
+		mes "I have two special";
+		mes "hairstyles for men, the";
+		mes "Emergency Heal Perm";
+		mes "and the Aura Blade Cut.";
+		mes "and aura blade cut.";
+		next;
+		cutin "hair_m_24.bmp",4;
+		mes "[Kaniki]";
+		mes "This is the Emergency";
+		mes "Heal Perm. It's a brand";
+		mes "new style I invented recently.";
+		mes "What do you think? Cool, huh?";
+		next;
+		cutin "",255;
+		cutin "hair_m_25.bmp",4;
+		mes "[Kaniki]";
+		mes "Now this is the Aura";
+		mes "Blade Cut. You haven't";
+		mes "seen anything like it";
+		mes "before, haven't you?";
+		next;
+		cutin "",255;
+	}else{
+		mes "[Kaniki]";
+		mes "I have two new hairstyles for";
+		mes "women, the Assumptio Perm";
+		mes "and the Soul Changer Cut.";
+		mes "Do you want to see how";
+		mes "these styles look?";
+		next;
+		cutin "hair_f_24.bmp",4;
+		mes "[Kaniki]";
+		mes "This is the Assumptio";
+		mes "Perm. It'd really good";
+		mes "on you, wouldn't it?";
+		next;
+		cutin "",255;
+		cutin "hair_f_25.bmp",4;
+		mes "[Kaniki]";
+		mes "Next is the Soul";
+		mes "Changer Cut. What do";
+		mes "you think? Isn't it nice?";
+		next;
+		cutin "",255;
+	}
+	mes "[Kaniki]";
+	mes "Have you decided";
+	mes "if you'd like me to";
+	mes "change your hairstyle?";
+	next;
+	if(select("Change Hairstyle:Don't Change") == 1) {
+		if (countitem(7622) > 0) {
+			mes "[Kaniki]";
+			mes "Great, you brought";
+			mes "a New Style Coupon!";
+			mes "Alright, which hairstyle";
+			mes "did you want to have?";
+			next;
+			if (Sex == SEX_MALE) {
+				if(select("Emergency Heal Perm:Aura Blade Cut") == 1) {
+					delitem 7622,1;	// New_Style_Coupon
+					setlook 1,24;
+				}else{
+					delitem 7622,1;	// New_Style_Coupon
+					setlook 1,25;
+				}
+			}else{
+				if(select("Assumptio Perm:Soul Changer Cut") == 1) {
+					delitem 7622,1;	// New_Style_Coupon
+					setlook 1,24;
+				}else{
+					delitem 7622,1;	// New_Style_Coupon
+					setlook 1,25;
+				}
+			}
+			mes "[Kaniki]";
+			mes "There--! It's done!";
+			mes "How do you like your";
+			mes "new hair? Well, I hope";
+			mes "to see you again. Take care!";
+			close;
+		}else{
+			mes "[Kaniki]";
+			mes "I'm sorry, but I can";
+			mes "only provide my hairstyling";
+			mes "service if you bring a New";
+			mes "Style Coupon. Please come";
+			mes "back to me after you manage to";
+			mes "get one of those coupons, okay?";
+			close;
+		}
+	}
+	mes "[Kaniki]";
+	mes "Really? Oh, that's too bad.";
+	mes "Well, if you ever change your";
+	mes "mind about updating your";
+	mes "hairstyle, come back";
+	mes "and let me know, okay?";
+	close;
+}

npc/pre-re/mapflag/nosave.txt

@@ -1,37 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: Disable auto-save.
-//===== Description: ========================================= 
-//= Characters logging out on the specified map will be warped
-//= to the map specified in the last field, or "SavePoint".
-//===== Additional Comments: ================================= 
-//= 1.0 Renewal Split. [Lemongrass]
-//============================================================
-
-//============================================================
-// Endless Tower
-//============================================================
-e_tower	mapflag	nosave	SavePoint
-1@tower	mapflag	nosave	SavePoint
-2@tower	mapflag	nosave	SavePoint
-3@tower	mapflag	nosave	SavePoint
-4@tower	mapflag	nosave	SavePoint
-5@tower	mapflag	nosave	SavePoint
-6@tower	mapflag	nosave	SavePoint
-
-//============================================================
-// Sealed Shrine
-//============================================================
-1@cata	mapflag	nosave	SavePoint
-2@cata	mapflag	nosave	SavePoint
-
-//============================================================
-// Orc's Memory
-//============================================================
-1@orcs	mapflag	nosave	SavePoint
-2@orcs	mapflag	nosave	SavePoint
-
-//============================================================
-// Nidhoggr's Instance
-//============================================================
-1@nyd	mapflag	nosave	SavePoint
-2@nyd	mapflag	nosave	SavePoint

npc/pre-re/mobs/dungeons/nyd_dun.txt

@@ -14,7 +14,7 @@
 // nyd_dun01 - Yggdrasil Root Dungeon
 //==================================================
 nyd_dun01,0,0	monster	Draco	2013,40
-nyd_dun01,0,0	monster	Draco's Egg	2014,10
+nyd_dun01,0,0	monster	Draco's Egg	2014,10,0,0,0
 nyd_dun01,0,0	monster	Aqua Elemental	2016,20
 nyd_dun01,0,0	monster	Dark Pinguicula	2015,10
 nyd_dun01,0,0	monster	Rata	2017,2,900000

npc/pre-re/mobs/dungeons/prt_maze.txt

@@ -84,7 +84,7 @@ prt_maze03,50,150,70,70	monster	Vagabond Wolf	1092,1,1920000,150000
 prt_maze03,170,170,70,70	monster	Mantis	1139,30,60000,30000
 prt_maze03,170,170,70,70	monster	Eclipse	1093,1,1920000,150000
 prt_maze03,23,23,70,70	monster	Mastering	1090,1,1920000,150000
-prt_maze03,100,100,80,80	monster	Baphomet Jr.	1101,25
+prt_maze03,100,100,80,80	monster	Baphomet Jr.	1101,25,0,0,0
 prt_maze03,0,0,0,0	boss_monster	Baphomet	1039,1,7200000,600000,1
 prt_maze03,61,98,10,10	monster	Shining Plant	1083,1,1800000,900000
 prt_maze03,61,98,10,10	monster	Blue Plant	1079,1,1800000,900000

npc/quests/quests_alberta.txt

@@ -608,7 +608,7 @@ alberta,120,53,1	script	Stylish Merchant#new30	51,{
 			mes "[Zic]";
 			mes "Let's see, I'll need...";
 			mes "1 ^0000FFSilk Ribbon^000000";
-			mes "50 ^0000FFHeroic Emblem^000000";
+			mes "50 ^0000FFHeroic Emlbem^000000";
 			mes "...Did you know this already?";
 			close;
 		case 2:
@@ -617,7 +617,7 @@ alberta,120,53,1	script	Stylish Merchant#new30	51,{
 			next;
 			mes "[Zic]";
 			mes "Okay, I'll need...";
-			mes "1 ^0000FFHeart Hairpin^000000";
+			mes "1 ^0000FFHeart hair pin^000000";
 			mes "10 ^0000FFSteel^000000";
 			mes "...Did you know this already?";
 			close;
@@ -627,7 +627,7 @@ alberta,120,53,1	script	Stylish Merchant#new30	51,{
 			next;
 			mes "[Zic]";
 			mes "I need to have...";
-			mes "1 ^0000FFJack be Dandy^000000";
+			mes "1 ^0000FFJack a Dandy^000000";
 			mes "1 ^0000FFScarlet Dyestuffs^000000";
 			mes "...Did you know this already?";
 			close;
@@ -760,7 +760,7 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 					mes "^0000FF1 Wizard Hat^000000";
 					mes "^0000FF400 Dragon Scale^000000";
 					mes "^0000FF50 Mould Powder^000000";
-					mes "^0000FF1 Elder Willow Card^000000";
+					mes "^0000FF1 Elder Wilow Card^000000";
 					next;
 					if ((countitem(2252) > 0) && (countitem(1036) > 399) && (countitem(4052) > 0) && (countitem(7001) > 49)) {
 						mes "[Tempestra]";