Fixes an issue with weapon swapping and statuses

* Resolves statuses ending early when swapping weapons of the same type. * Removes a duplicate check. Thanks to @Aristeus09!
2022-09-27 11:24:12 -04:00
157 changed files with 3587 additions and 85835 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -6,9 +6,7 @@ body:
    id: hash
    attributes:
      label: rAthena Hash
-      description: |
-        Please specify the rAthena [GitHub hash](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) on which you encountered this issue.
-        One way to get your hash is to type `git rev-parse --short HEAD` on your console.
+      description: Please specify the rAthena [GitHub hash](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) on which you encountered this issue.
    validations:
      required: true
  - type: input
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@ Thumbs.db
 /Makefile
 /Makefile.cache
 /map-server
-/map-server-generator
 /mapcache
 /nbproject
 /web-server
@@ -137,7 +136,6 @@ Thumbs.db
 /webserv.bat
 /yaml2sql.bat
 /yamlupgrade.bat
-/navigenerator.bat

 # dlls
 /libmysql.dll
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -48,7 +48,6 @@ endmacro( CONFIGURE_WITH_LOCAL_OR_SYSTEM )


 add_subdirectory( httplib )
-add_subdirectory( json )
 add_subdirectory( libconfig )
 add_subdirectory( mysql )
 add_subdirectory( pcre )
--- a/3rdparty/README.txt
+++ b/3rdparty/README.txt
@@ -6,4 +6,3 @@ libconfig - library for processing structured configuration files (http://www.hy
 mysql - library for MySQL Community Server (http://www.mysql.com)
 pcre - library for Perl Compatible Regular Expressions (http://www.pcre.org)
 zlib - library for DEFLATE lossless compression algorithm (http://www.zlib.net)
-json - library for nlohmann json (https://github.com/nlohmann/json/tree/4b2c8ce6bcfe7f39f2bb9e680c1e7a4d67c2dd48)
--- a/3rdparty/json/CMakeLists.txt
+++ b/3rdparty/json/CMakeLists.txt
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set (JSON_INCLUDE_DIRS
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    CACHE INTERNAL "json include dir" )
-
-mark_as_advanced( JSON_INCLUDE_DIRS )
--- a/3rdparty/json/LICENSE.MIT
+++ b/3rdparty/json/LICENSE.MIT
@@ -1,21 +0,0 @@
-MIT License 
-
-Copyright (c) 2013-2022 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/3rdparty/json/include/nlohmann/json.hpp
+++ b/3rdparty/json/include/nlohmann/json.hpp
--- a/3rdparty/json/include/nlohmann/json_fwd.hpp
+++ b/3rdparty/json/include/nlohmann/json_fwd.hpp
@@ -1,177 +0,0 @@
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-// #include <nlohmann/detail/abi_macros.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// This file contains all macro definitions affecting or depending on the ABI
-
-#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
-    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
-        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2
-            #warning "Already included a different version of the library!"
-        #endif
-    #endif
-#endif
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_PATCH 2   // NOLINT(modernize-macro-to-enum)
-
-#ifndef JSON_DIAGNOSTICS
-    #define JSON_DIAGNOSTICS 0
-#endif
-
-#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
-#endif
-
-#if JSON_DIAGNOSTICS
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
-#else
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
-#endif
-
-#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
-#else
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
-    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
-#endif
-
-// Construct the namespace ABI tags component
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
-
-#define NLOHMANN_JSON_ABI_TAGS                                       \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
-            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
-            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
-
-// Construct the namespace version component
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
-    _v ## major ## _ ## minor ## _ ## patch
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
-
-#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
-#define NLOHMANN_JSON_NAMESPACE_VERSION
-#else
-#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
-                                           NLOHMANN_JSON_VERSION_MINOR, \
-                                           NLOHMANN_JSON_VERSION_PATCH)
-#endif
-
-// Combine namespace components
-#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
-#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
-    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
-
-#ifndef NLOHMANN_JSON_NAMESPACE
-#define NLOHMANN_JSON_NAMESPACE               \
-    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
-            NLOHMANN_JSON_ABI_TAGS,           \
-            NLOHMANN_JSON_NAMESPACE_VERSION)
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
-#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
-    namespace nlohmann                               \
-    {                                                \
-    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
-                NLOHMANN_JSON_ABI_TAGS,              \
-                NLOHMANN_JSON_NAMESPACE_VERSION)     \
-    {
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_END
-#define NLOHMANN_JSON_NAMESPACE_END                                     \
-    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
-    }  // namespace nlohmann
-#endif
-
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-/// a class to store JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
-         class CustomBaseClass = void>
-class basic_json;
-
-/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-/// @sa https://json.nlohmann.me/api/json_pointer/
-template<typename RefStringType>
-class json_pointer;
-
-/*!
-@brief default specialization
-@sa https://json.nlohmann.me/api/json/
-*/
-using json = basic_json<>;
-
-/// @brief a minimal map-like container that preserves insertion order
-/// @sa https://json.nlohmann.me/api/ordered_map/
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/// @brief specialization that maintains the insertion order of object keys
-/// @sa https://json.nlohmann.me/api/ordered_json/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-NLOHMANN_JSON_NAMESPACE_END
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
--- a/35
+++ b/35
@@ -20,7 +20,8 @@ print_start() {
 get_status(){
 	PIDFILE=.$1.pid
 	if [ -e ${PIDFILE} ]; then
-		PSRUN=$(pgrep -F ${PIDFILE})
+		ISRUN=$(ps ax | grep $(cat ${PIDFILE}) | grep $1)
+		PSRUN=$(echo "$ISRUN" | awk '{ print $1 }')
 	fi
 	#return ${PSRUN} #seems to cause an issue for some os
 }
@@ -35,11 +36,11 @@ start_serv(){
 		echo "stat_serv, log is enabled"
 		echo "My logfile=${LOGFILE}"
 		if [ -z ${PSRUN} ]; then
-			if [ -e ./${FIFO} ]; then rm "$FIFO"; fi
+		if [ -e ./${FIFO} ]; then rm "$FIFO"; fi
 			mkfifo "$FIFO"; tee "$LOGRUN" < "$FIFO" & "./$1" > "$FIFO" 2>&1 & PID=$!
 			#"./$1" > >(tee "$LOGRUN") 2>&1 & PID=$! #bash only
 			echo "$PID" > .$1.pid
-			echo "Server '$1' started at $(date +"%m-%d-%H:%M-%S")" | tee ${LOGFILE}
+			echo "Server '$1' started at `date +"%m-%d-%H:%M-%S"`" | tee ${LOGFILE}
 		else
 			echo "Cannot start '$1', because it is already running p${PSRUN}" | tee ${LOGFILE}
 		fi
@@ -47,7 +48,7 @@ start_serv(){
 		if [ -z ${PSRUN} ]; then
 			./$1&
 			echo "$!" > .$1.pid
-			echo "Server '$1' started at $(date +"%m-%d-%H:%M-%S")"
+			echo "Server '$1' started at `date +"%m-%d-%H:%M-%S"`"
 		else
 			echo "Cannot start '$1', because it is already running p${PSRUN}"
 		fi
@@ -65,20 +66,20 @@ watch_serv(){
 			LOGFILE="$LOG_DIR/$i.launch.log"
 			LOGRUN="$LOG_DIR/$i.log"
 			FIFO=$i"_fifo"
-
-			get_status ${i}
+	
+			get_status $i
 			#echo "Echo id of $i is ${PSRUN}"
 			if [ -z ${PSRUN} ]; then
 				count=$((count+1))
 				#echo "fifo=$FIFO"
 				echo "server '$i' is down"
 				echo "server '$i' is down" >> ${LOGFILE}
-				echo "restarting server at time at $(date +"%m-%d-%H:%M-%S")"
-				echo "restarting server at time at $(date +"%m-%d-%H:%M-%S")" >> ${LOGFILE}
+				echo "restarting server at time at `date +"%m-%d-%H:%M-%S"`" 
+				echo "restarting server at time at `date +"%m-%d-%H:%M-%S"`" >> ${LOGFILE}
 				if [ -e $FIFO ]; then rm $FIFO; fi
 				mkfifo "$FIFO"; tee "$LOGRUN" < "$FIFO" & "./$i" > "$FIFO" 2>&1 & PID=$!
 				echo "$PID" > .$i.pid
-				if [ $2 ] && [ $2 -lt $count ]; then break; fi
+				if [ $2 ] && [ $2 -lt $count ]; then break; fi   
 			fi
 		done
 		sleep $1
@@ -100,11 +101,11 @@ restart(){
 			fi
 		done
 	done
-	$0 start
+  $0 start
 }

 case $1 in
-	'start')
+    'start')
 		print_start
 		check_files
 		echo "Check complete."
@@ -122,7 +123,7 @@ case $1 in
 		done
 		echo "rAthena was started."
 	;;
-	'watch')
+    'watch')
 		if [ ! -d "$LOG_DIR" ]; then mkdir -p $LOG_DIR; fi
 		if [ -z $2 ]; then Restart_count=10; else Restart_count=$2; fi
 		if [ -z $3 ]; then Restart_sleep=3; else Restart_sleep=$3; fi
@@ -133,7 +134,7 @@ case $1 in
 		done
 		watch_serv $Restart_count $Restart_sleep
 		echo "Watching rAthena now."
-	;;
+	;;	
 	'stop')
 		for i in ${W_SRV} ${M_SRV} ${C_SRV} ${L_SRV}
 		do
@@ -154,7 +155,7 @@ case $1 in
 		done
 	;;
 	'restart')
-		 restart "$@"
+		 restart
 	;;
 	'status')
 		for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
@@ -180,7 +181,7 @@ case $1 in
 			'start')
 				echo "syntax: 'start {--enlog}'"
 				echo "This option will start the servers"
-				echo "--enlog will write all terminal output into a log/\$servname.log file"
+				echo "--enlog will write all terminal output into a log/$servname.log file"
 			;;
 			'stop')
 				echo "This option will shut the servers down"
@@ -204,11 +205,11 @@ case $1 in
 			;;
 			'val_runonce')
 				echo "syntax: 'val_runonce'"
-				echo "This option will run valgrind with run-once to check the servers"
+				echo "This option will run valgrin with run-once to check the servers"
 			;;
 			'valchk')
 				echo "syntax: 'valchk'"
-				echo "This option will run valgrind with the servers"
+				echo "This option will run valgrin with the servers"
 			;;
 			*)
 				echo "Please specify a command you would like more info on { start | stop | restart | status | watch }"
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
@@ -1016,9 +1016,6 @@ Body:
  - Command: enchantgradeui
    Help: |
      Opens the enchantgrade UI.
-  - Command: roulette
-    Help: |
-      Opens the roulette UI.

 Footer:
  Imports:
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -148,13 +148,3 @@ show_skill_scale: yes
 // Note: Enabling this is known to cause problems on clients that make use of REST API calls.
 // Official: no
 drop_connection_on_quit: no
-
-// Macro Detector retries
-// Number of times someone can fail the macro detection before being banned.
-// Official: 3 (minimum: 1)
-macro_detection_retry: 3
-
-// Macro Detector timeout
-// Amount of time in milliseconds before the macro detection will fail and the user will be banned.
-// Official: 60000
-macro_detection_timeout: 60000
--- a/conf/battle/feature.conf
+++ b/conf/battle/feature.conf
@@ -56,7 +56,7 @@ feature.autotrade_head_direction: 0
 //  1 = Sitting
 feature.autotrade_sit: 1

-// Delay in milliseconds to open vending/buyingsotre after player logged in.
+// Delay in miliseconds to open vending/buyingsotre after player logged in.
 feature.autotrade_open_delay: 5000

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

 // Hide n last characters of player's name with asterisk (*) when the player
-// obtained an item with special broadcast flag or refined an item at a level with broadcast flag.
+// obtained an item with special broadcast flag.
 // Note: Players with short names can be fully converted to asterisks if this
 // config value is set high.
 broadcast_hide_name: 2
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -121,8 +121,7 @@ start_point_doram: lasa_fild01,48,297
 // Format: <id>,<amount>,<position>{:<id>,<amount>,<position>...}
 // To auto-equip an item, include the position where it will be equipped; otherwise, use zero.
 // NOTE: For Doram, this requires client 20151001 or newer.
-start_items: 1201,1,2:2301,1,16:23484,1,0
-start_items_pre: 1201,1,2:2301,1,16
+start_items: 1201,1,2:2301,1,16
 start_items_doram: 1681,1,2:2301,1,16

 // Starting zeny for new characters
--- a/conf/groups.yml
+++ b/conf/groups.yml
@@ -216,7 +216,6 @@ Body:
      hack_info: true
      any_warp: true
      view_hpmeter: true
-      macro_detect: true
  - Id: 99
    Name: Admin
    Level: 99
@@ -239,7 +238,6 @@ Body:
      item_unconditional: false
      bypass_stat_onclone: true
      bypass_max_stat: true
-      macro_register: true
      #all_permission: true

 Footer:
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1541,22 +1541,6 @@ map: 1@pdb
 map: airplane2
 map: vr_bob

-// Heroria
-map: hero_dun1
-map: hero_ent1
-map: hero_ent2
-map: hero_ent3
-map: hero_in1
-map: hero_in2
-map: hero_in3
-map: hero_in4
-map: hero_lb
-map: hero_out1
-map: hero_out2
-map: hero_out3
-map: hero_out4
-map: hero_tra
-map: herosria

 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
--- a/db/captcha_db.yml
+++ b/db/captcha_db.yml
@@ -1,37 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Captcha Database Table
-###########################################################################
-#
-# Captcha Database Settings
-#
-###########################################################################
-# - Id                Index value.
-#   Filename          Name of the BMP image file (with location).
-#   Answer            Correct answer for the captcha (case-sensitive).
-#   Bonus             Bonus Script ran on success. (Default: Level 10 Blessing and Increase Agility)
-###########################################################################
-
-Header:
-  Type: CAPTCHA_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/import/captcha_db.yml
--- a/db/import-tmpl/captcha_db.yml
+++ b/db/import-tmpl/captcha_db.yml
@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Captcha Database Table
-###########################################################################
-#
-# Captcha Database Settings
-#
-###########################################################################
-# - Id                Index value.
-#   Filename          Name of the BMP image file (with location).
-#   Answer            Correct answer for the captcha (case-sensitive).
-#   Bonus             Bonus Script ran on success. (Default: Level 10 Blessing and Increase Agility)
-###########################################################################
-
-Header:
-  Type: CAPTCHA_DB
-  Version: 1
--- a/db/import-tmpl/item_group_db.yml
+++ b/db/import-tmpl/item_group_db.yml
@@ -23,7 +23,6 @@
 #
 ###########################################################################
 # - Group                      Group name of the item.
-#   AnnounceBoxItemId          Item to be shown in special item obtaining broadcast packet in the box name field. Uses the last item the player used if not defined. (Default: 0)
 #   SubGroups:
 #     - SubGroup:              SubGroup number associated with the list of item. See doc/item_group.txt for more information.
 #       List:                  List of item(s) for the SubGroup.
@@ -45,4 +44,4 @@

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

 Header:
  Type: REFINE_DB
-  Version: 2
+  Version: 1

 ###########################################################################
 # Event Refine Rates
--- a/db/import-tmpl/reputation_group.yml
+++ b/db/import-tmpl/reputation_group.yml
@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Group Database
-###########################################################################
-#
-# Reputation Group Settings
-#
-###########################################################################
-# - Id                                  Client side group index.
-#   ScriptName                          Unused? Used for "ID" in client
-#   Name                                Visible name in window
-#   ReputeList                          List of Reputations
-###########################################################################
-
-Header:
-  Type: REPUTATION_GROUP_DB
-  Version: 1
--- a/db/import-tmpl/status.yml
+++ b/db/import-tmpl/status.yml
@@ -35,11 +35,10 @@
 #   MinRate                   Minimum rate after status change reduction (10000 = 100%). (Default: 0)
 #   MinDuration               Minimum duration in milliseconds after status change reduction. (Default: 1)
 #   Fail:                     List of Status Changes that causes the status to fail to activate. (Optional)
-#   EndOnStart:               List of Status Changes that will end when the status activates. (Optional)
+#   End:                      List of Status Changes that will end when the status activates. (Optional)
 #   EndReturn:                List of Status Changes that will end when the status activates and won't give its effect. (Optional)
-#   EndOnEnd:                 List of Status Changes that will end when the status becomes inactive. (Optional)
 ###########################################################################

 Header:
  Type: STATUS_DB
-  Version: 3
+  Version: 2
--- a/db/item_group_db.yml
+++ b/db/item_group_db.yml
@@ -23,7 +23,6 @@
 #
 ###########################################################################
 # - Group                      Group name of the item.
-#   AnnounceBoxItemId          Item to be shown in special item obtaining broadcast packet in the box name field. Uses the last item the player used if not defined. (Default: 0)
 #   SubGroups:
 #     - SubGroup:              SubGroup number associated with the list of item. See doc/item_group.txt for more information.
 #       List:                  List of item(s) for the SubGroup.
@@ -45,7 +44,7 @@

 Header:
  Type: ITEM_GROUP_DB
-  Version: 3
+  Version: 2

 Footer:
  Imports:
--- a/db/map_cache.dat
+++ b/db/map_cache.dat
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1185,21 +1185,6 @@ prt_elib
 1@pdb
 airplane2
 vr_bob
-hero_dun1
-hero_ent1
-hero_ent2
-hero_ent3
-hero_in1
-hero_in2
-hero_in3
-hero_in4
-hero_lb
-hero_out1
-hero_out2
-hero_out3
-hero_out4
-hero_tra
-herosria

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

 Footer:
  Imports:
--- a/db/pre-re/instance_db.yml
+++ b/db/pre-re/instance_db.yml
@@ -67,7 +67,7 @@ Body:
  - Id: 3
    Name: Orc's Memory
    Enter:
-      Map: 1@orcs
+      Map: 1@orcs 
      X: 179
      Y: 15
    AdditionalMaps:
--- a/db/pre-re/item_group_db.yml
+++ b/db/pre-re/item_group_db.yml
@@ -23,7 +23,6 @@
 #
 ###########################################################################
 # - Group                      Group name of the item.
-#   AnnounceBoxItemId          Item to be shown in special item obtaining broadcast packet in the box name field. Uses the last item the player used if not defined. (Default: 0)
 #   SubGroups:
 #     - SubGroup:              SubGroup number associated with the list of item. See doc/item_group.txt for more information.
 #       List:                  List of item(s) for the SubGroup.
@@ -45,7 +44,7 @@

 Header:
  Type: ITEM_GROUP_DB
-  Version: 3
+  Version: 2

 Body:
  - Group: ACCESORY
--- a/db/pre-re/mob_skill_db.txt
+++ b/db/pre-re/mob_skill_db.txt
@@ -717,8 +717,8 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,master,alchemist,,,,,,,,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,afterskill,331,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
 1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
--- a/db/pre-re/refine.yml
+++ b/db/pre-re/refine.yml
@@ -30,8 +30,6 @@
 #           Bonus                       Refinement bonus. (Default: 0)
 #           RandomBonus                 Extra refinement bonus of 0~RandomBonus stacked on Bonus. (Default: 0)
 #           BlacksmithBlessingAmount    Amount of Blacksmith Blessing required. (Default: 0)
-#           BroadcastSuccess            Broadcast to the whole server when a refine attempt at this level succeeds. (Default: false)
-#           BroadcastFailure            Broadcast to the whole server when a refine attempt at this level fails. (Default: false)
 #           Chances:                    Success chance based on cost type. (Default: null)
 #             - Type                    Refinement cost type based on ore used.
 #               Rate                    Chance of success out of 0~10000. (Default: 0)
@@ -43,7 +41,7 @@

 Header:
  Type: REFINE_DB
-  Version: 2
+  Version: 1

 Body:
  - Group: Armor
--- a/db/pre-re/skill_db.yml
+++ b/db/pre-re/skill_db.yml
@@ -9325,13 +9325,15 @@ Body:
    Name: NPC_WEAPONBRAKER
    Description: Break weapon
    MaxLevel: 10
-    TargetType: Self
+    Type: Weapon
+    TargetType: Attack
    Flags:
      IsNpc: true
+    Range: 9
    Hit: Single
    HitCount: 1
-    Duration: 30000
-    Status: WeaponBreaker
+    Element: Weapon
+    Status: BrokenWeapon
  - Id: 344
    Name: NPC_ARMORBRAKE
    Description: Break armor
--- a/db/pre-re/status.yml
+++ b/db/pre-re/status.yml
@@ -35,14 +35,13 @@
 #   MinRate                   Minimum rate after status change reduction (10000 = 100%). (Default: 0)
 #   MinDuration               Minimum duration in milliseconds after status change reduction. (Default: 1)
 #   Fail:                     List of Status Changes that causes the status to fail to activate. (Optional)
-#   EndOnStart:               List of Status Changes that will end when the status activates. (Optional)
+#   End:                      List of Status Changes that will end when the status activates. (Optional)
 #   EndReturn:                List of Status Changes that will end when the status activates and won't give its effect. (Optional)
-#   EndOnEnd:                 List of Status Changes that will end when the status becomes inactive. (Optional)
 ###########################################################################

 Header:
  Type: STATUS_DB
-  Version: 3
+  Version: 2

 Body:
  - Status: Stone
@@ -71,7 +70,7 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
-    EndOnStart:
+    End:
      Aeterna: true
    EndReturn:
      StoneWait: true
@@ -122,7 +121,7 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
-    EndOnStart:
+    End:
      Aeterna: true
  - Status: Stun
    DurationLookup: NPC_STUNATTACK
@@ -273,7 +272,7 @@ Body:
      BossResist: true
      Debuff: true
      NoSaveInfinite: true
-    EndOnStart:
+    End:
      Freeze: true
      Stone: true
      Sleep: true
@@ -328,7 +327,7 @@ Body:
      NoBanishingBuster: true
      NoDispell: true
      NoClearance: true
-    EndOnStart:
+    End:
      Closeconfine: true
      Closeconfine2: true
  - Status: Cloaking
@@ -356,7 +355,7 @@ Body:
      Atk_Ele: true
    Flags:
      RemoveOnUnequipWeapon: true
-    EndOnStart:
+    End:
      Aspersio: true
      Fireweapon: true
      Waterweapon: true
@@ -382,7 +381,7 @@ Body:
      Debuff: true
    Fail:
      Speedup1: true
-    EndOnStart:
+    End:
      Loud: true
      Concentrate: true
      Truesight: true
@@ -438,7 +437,7 @@ Body:
      TaekwonAngel: true
    Fail:
      Quagmire: true
-    EndOnStart:
+    End:
      Decreaseagi: true
      Adoramus: true
  - Status: Decreaseagi
@@ -453,7 +452,7 @@ Body:
      Debuff: true
    Fail:
      Speedup1: true
-    EndOnStart:
+    End:
      Cartboost: true
      Gn_Cartboost: true
      Increaseagi: true
@@ -476,7 +475,7 @@ Body:
      Watk: true
    Flags:
      SuperNoviceAngel: true
-    EndOnStart:
+    End:
      Impositio: true
  - Status: Suffragium
    Icon: EFST_SUFFRAGIUM
@@ -490,7 +489,7 @@ Body:
      Atk_Ele: true
    Flags:
      RemoveOnUnequipWeapon: true
-    EndOnStart:
+    End:
      Encpoison: true
      Fireweapon: true
      Waterweapon: true
@@ -513,7 +512,7 @@ Body:
    DurationLookup: PR_KYRIE
    Flags:
      SuperNoviceAngel: true
-    EndOnStart:
+    End:
      Assumptio: true
  - Status: Magnificat
    Icon: EFST_MAGNIFICAT
@@ -590,7 +589,7 @@ Body:
      NoSave: true
      NoClearance: true
      RemoveOnChangeMap: true
-    EndOnStart:
+    End:
      Dancing: true
  - Status: Loud
    Icon: EFST_SHOUT
@@ -839,7 +838,7 @@ Body:
    Flags:
      NoClearance: true
      RequireShield: true
-    EndOnStart:
+    End:
      Reflectdamage: true
  - Status: Splasher
    Icon: EFST_SPLASHER
@@ -988,7 +987,7 @@ Body:
      Atk_Ele: true
    Flags:
      RemoveOnUnequipWeapon: true
-    EndOnStart:
+    End:
      Encpoison: true
      Aspersio: true
      Waterweapon: true
@@ -1003,7 +1002,7 @@ Body:
      Atk_Ele: true
    Flags:
      RemoveOnUnequipWeapon: true
-    EndOnStart:
+    End:
      Encpoison: true
      Aspersio: true
      Fireweapon: true
@@ -1018,7 +1017,7 @@ Body:
      Atk_Ele: true
    Flags:
      RemoveOnUnequipWeapon: true
-    EndOnStart:
+    End:
      Encpoison: true
      Aspersio: true
      Fireweapon: true
@@ -1033,7 +1032,7 @@ Body:
      Atk_Ele: true
    Flags:
      RemoveOnUnequipWeapon: true
-    EndOnStart:
+    End:
      Encpoison: true
      Aspersio: true
      Fireweapon: true
@@ -1181,7 +1180,7 @@ Body:
    DurationLookup: HP_ASSUMPTIO
    Opt3:
      Assumptio: true
-    EndOnStart:
+    End:
      Kyrie: true
      Kaite: true
  - Status: Basilica
@@ -1206,7 +1205,7 @@ Body:
      Matk: true
    Flags:
      NoSave: true
-    EndOnStart:
+    End:
      Magicpower: true
  - Status: Edp
    Icon: EFST_EDP
@@ -1335,7 +1334,7 @@ Body:
      Debuff: true
      NoClearance: true
      NoSave: true
-    EndOnStart:
+    End:
      Blessing: true
      Increaseagi: true
  - Status: Jointbeat
@@ -1359,7 +1358,7 @@ Body:
    Flags:
      NoSave: true
      Debuff: true
-    EndOnStart:
+    End:
      Freeze: true
      Stone: true
      Sleep: true
@@ -1397,11 +1396,6 @@ Body:
      NoSave: true
      RemoveOnChangeMap: true
      OverlapIgnoreLevel: true
-    EndOnEnd:
-      Autoguard: true
-      Defender: true
-      ReflectShield: true
-      Endure: true
  - Status: Sacrifice
    DurationLookup: PA_SACRIFICE
  - Status: Steelbody
@@ -1488,7 +1482,7 @@ Body:
    Flags:
      NoSave: true
      NoClearance: true
-    EndOnStart:
+    End:
      Encpoison: true
      Aspersio: true
      Fireweapon: true
@@ -1516,7 +1510,7 @@ Body:
    Flags:
      NoSave: true
      NoClearance: true
-    EndOnStart:
+    End:
      Encpoison: true
      Aspersio: true
      Fireweapon: true
@@ -1533,7 +1527,7 @@ Body:
    Flags:
      NoSave: true
      NoClearance: true
-    EndOnStart:
+    End:
      Kaahi: true
  - Status: Kaupe
    Icon: EFST_KAUPE
@@ -1554,7 +1548,7 @@ Body:
      RequireWeapon: true
    Fail:
      Decreaseagi: true
-    EndOnStart:
+    End:
      Aspdpotion0: true
      Aspdpotion1: true
      Aspdpotion2: true
@@ -1609,7 +1603,7 @@ Body:
    Flags:
      MadoCancel: true
      NoSave: true
-    EndOnStart:
+    End:
      Overthrust: true
  - Status: Longing
    Icon: EFST_LONGING
@@ -1690,8 +1684,6 @@ Body:
      RemoveOnChangeMap: true
      RequireWeapon: true
      OverlapIgnoreLevel: true
-    EndOnEnd:
-      Longing: true
  - Status: Elementalchange
    Icon: EFST_ARMOR_PROPERTY
    DurationLookup: NPC_ATTRICHANGE
@@ -1819,7 +1811,7 @@ Body:
      NoClearance: true
    Fail:
      Speedup1: true
-    EndOnStart:
+    End:
      Increaseagi: true
      Adrenaline: true
      Adrenaline2: true
@@ -2048,7 +2040,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Food_Str_Cash: true
  - Status: Agifood
    Icon: EFST_FOOD_AGI
@@ -2059,7 +2051,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Food_Agi_Cash: true
  - Status: Vitfood
    Icon: EFST_FOOD_VIT
@@ -2070,7 +2062,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Food_Vit_Cash: true
  - Status: Intfood
    Icon: EFST_FOOD_INT
@@ -2081,7 +2073,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Food_Int_Cash: true
  - Status: Dexfood
    Icon: EFST_FOOD_DEX
@@ -2092,7 +2084,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Food_Dex_Cash: true
  - Status: Lukfood
    Icon: EFST_FOOD_LUK
@@ -2103,7 +2095,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Food_Luk_Cash: true
  - Status: Hitfood
    Icon: EFST_FOOD_BASICHIT
@@ -2202,7 +2194,7 @@ Body:
    Flags:
      SendOption: true
      NoRemoveOnDead: true
-    EndOnStart:
+    End:
      Spirit: true
  - Status: Skillrate_Up
    DurationLookup: SG_FRIEND
@@ -2223,7 +2215,7 @@ Body:
    Flags:
      NoSave: true
      NoClearance: true
-    EndOnStart:
+    End:
      Assumptio: true
  - Status: Swoo
    Icon: EFST_SWOO
@@ -2276,7 +2268,7 @@ Body:
    Fail:
      P_Alter: true
      Heat_Barrel: true
-    EndOnStart:
+    End:
      Adjustment: true
  - Status: Adjustment
    Icon: EFST_GS_ADJUSTMENT
@@ -2287,8 +2279,8 @@ Body:
    Flags:
      NoDispell: true
      NoBanishingBuster: true
-    EndOnStart:
-      MadnessCancel: true
+    End:
+      Madnesscancel: true
  - Status: Increasing
    Icon: EFST_GS_ACCURACY
    DurationLookup: GS_INCREASING
@@ -2446,7 +2438,7 @@ Body:
      SendVal1: true
      OverlapIgnoreLevel: true
      RemoveOnUnequipWeapon: true
-    EndOnStart:
+    End:
      Enchantarms: true
      Aspersio: true
  - Status: Magicalattack
@@ -2726,7 +2718,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Invincibleoff: true
  - Status: Invincibleoff
    DurationLookup: NPC_INVINCIBLEOFF
@@ -2736,7 +2728,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Invincible: true
  - Status: Manu_Atk
    Icon: EFST_MANU_ATK
@@ -2790,7 +2782,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Strfood: true
  - Status: Food_Agi_Cash
    Icon: EFST_FOOD_AGI_CASH
@@ -2802,7 +2794,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Agifood: true
  - Status: Food_Vit_Cash
    Icon: EFST_FOOD_VIT_CASH
@@ -2814,7 +2806,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Vitfood: true
  - Status: Food_Dex_Cash
    Icon: EFST_FOOD_DEX_CASH
@@ -2826,7 +2818,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Intfood: true
  - Status: Food_Int_Cash
    Icon: EFST_FOOD_INT_CASH
@@ -2838,7 +2830,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Dexfood: true
  - Status: Food_Luk_Cash
    Icon: EFST_FOOD_LUK_CASH
@@ -2850,7 +2842,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Lukfood: true
  - Status: Fear
    DurationLookup: RK_WINDCUTTER
@@ -2866,7 +2858,7 @@ Body:
      Debuff: true
    Fail:
      Inspiration: true
-    EndOnStart:
+    End:
      Blind: true
  - Status: Burning
    Icon: EFST_BURNT
@@ -2905,7 +2897,7 @@ Body:
      Refresh: true
      Inspiration: true
      Warmer: true
-    EndOnStart:
+    End:
      Burning: true
  - Status: Enchantblade
    Icon: EFST_ENCHANTBLADE
@@ -3000,7 +2992,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Fightingspirit: true
  - Status: Abundance
    Icon: EFST_ABUNDANCE
@@ -3019,7 +3011,7 @@ Body:
    Flags:
      BossResist: true
      Debuff: true
-    EndOnStart:
+    End:
      Decreaseagi: true
  - Status: Epiclesis
    Icon: EFST_EPICLESIS
@@ -3094,7 +3086,7 @@ Body:
      SetStand: true
      StopWalking: true
      StopAttacking: true
-    EndOnStart:
+    End:
      Freezing: true
  - Status: Marshofabyss
    Icon: EFST_MARSHOFABYSS
@@ -3113,7 +3105,7 @@ Body:
    MinDuration: 5000
    Fail:
      Refresh: true
-    EndOnStart:
+    End:
      Increaseagi: true
      Windwalk: true
      Aspdpotion0: true
@@ -3460,7 +3452,7 @@ Body:
      Deathhurt: true
      Pyrexia: true
      Oblivioncurse: true
-      LeechesEnd: true
+      Leechesend: true
  - Status: Venombleed
    Icon: EFST_VENOMBLEED
    CalcFlags:
@@ -3482,7 +3474,7 @@ Body:
      Deathhurt: true
      Pyrexia: true
      Oblivioncurse: true
-      LeechesEnd: true
+      Leechesend: true
  - Status: Magicmushroom
    Icon: EFST_MAGICMUSHROOM
    CalcFlags:
@@ -3504,7 +3496,7 @@ Body:
      Deathhurt: true
      Pyrexia: true
      Oblivioncurse: true
-      LeechesEnd: true
+      Leechesend: true
  - Status: Deathhurt
    Icon: EFST_DEATHHURT
    CalcFlags:
@@ -3526,7 +3518,7 @@ Body:
      Deathhurt: true
      Pyrexia: true
      Oblivioncurse: true
-      LeechesEnd: true
+      Leechesend: true
  - Status: Pyrexia
    Icon: EFST_PYREXIA
    CalcFlags:
@@ -3548,7 +3540,7 @@ Body:
      Deathhurt: true
      Pyrexia: true
      Oblivioncurse: true
-      LeechesEnd: true
+      Leechesend: true
  - Status: Oblivioncurse
    Icon: EFST_OBLIVIONCURSE
    States:
@@ -3573,7 +3565,7 @@ Body:
      Deathhurt: true
      Pyrexia: true
      Oblivioncurse: true
-      LeechesEnd: true
+      Leechesend: true
  - Status: Leechesend
    Icon: EFST_LEECHESEND
    Flags:
@@ -3593,7 +3585,7 @@ Body:
      Deathhurt: true
      Pyrexia: true
      Oblivioncurse: true
-      LeechesEnd: true
+      Leechesend: true
  - Status: Reflectdamage
    Icon: EFST_LG_REFLECTDAMAGE
    DurationLookup: LG_REFLECTDAMAGE
@@ -3601,7 +3593,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      RequireShield: true
-    EndOnStart:
+    End:
      Reflectshield: true
  - Status: Forceofvanguard
    Icon: EFST_FORCEOFVANGUARD
@@ -3615,13 +3607,13 @@ Body:
  - Status: Shieldspell_Hp
    Icon: EFST_SHIELDSPELL_DEF
    DurationLookup: LG_SHIELDSPELL
-    EndOnStart:
+    End:
      Shieldspell_Sp: true
      Shieldspell_Atk: true
  - Status: Shieldspell_Sp
    Icon: EFST_SHIELDSPELL_MDEF
    DurationLookup: LG_SHIELDSPELL
-    EndOnStart:
+    End:
      Shieldspell_Hp: true
      Shieldspell_Atk: true
  - Status: Shieldspell_Atk
@@ -3630,7 +3622,7 @@ Body:
    CalcFlags:
      Watk: true
      Matk: true
-    EndOnStart:
+    End:
      Shieldspell_Hp: true
      Shieldspell_Sp: true
  - Status: Exeedbreak
@@ -3657,7 +3649,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Prestige: true
  - Status: Banding_Defence
    Icon: EFST_BANDING_DEFENCE
@@ -3731,7 +3723,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Crystalize: true
      Freezing: true
      Freeze: true
@@ -3768,7 +3760,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Symphonyoflover: true
      Moonlitserenade: true
      Rushwindmill: true
@@ -3783,7 +3775,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Swingdance: true
      Moonlitserenade: true
      Rushwindmill: true
@@ -3798,7 +3790,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Swingdance: true
      Symphonyoflover: true
      Rushwindmill: true
@@ -3814,7 +3806,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Swingdance: true
      Symphonyoflover: true
      Moonlitserenade: true
@@ -3829,7 +3821,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Swingdance: true
      Symphonyoflover: true
      Moonlitserenade: true
@@ -3845,7 +3837,7 @@ Body:
      Int: true
      Dex: true
      Luk: true
-    EndOnStart:
+    End:
      Swingdance: true
      Symphonyoflover: true
      Moonlitserenade: true
@@ -3859,7 +3851,7 @@ Body:
      DisplayPc: true
      StopAttacking: true
    MinDuration: 10000
-    EndOnStart:
+    End:
      Deepsleep: true
      Gloomyday: true
      Gloomyday_Sk: true
@@ -3897,7 +3889,7 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
-    EndOnStart:
+    End:
      Dancing: true
      Voiceofsiren: true
      Gloomyday: true
@@ -3913,7 +3905,7 @@ Body:
  - Status: Sircleofnature
    Icon: EFST_SIRCLEOFNATURE
    DurationLookup: WM_SIRCLEOFNATURE
-    EndOnStart:
+    End:
      Deepsleep: true
      Gloomyday: true
      Gloomyday_Sk: true
@@ -3934,7 +3926,7 @@ Body:
      Flee: true
      Speed: true
      Aspd: true
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Songofmana: true
@@ -3949,7 +3941,7 @@ Body:
  - Status: Songofmana
    Icon: EFST_SONG_OF_MANA
    DurationLookup: WM_SONG_OF_MANA
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Gloomyday: true
@@ -3968,7 +3960,7 @@ Body:
    DurationLookup: WM_DANCE_WITH_WUG
    CalcFlags:
      Aspd: true
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Gloomyday: true
@@ -3998,7 +3990,7 @@ Body:
    Fail:
      Berserk: true
      Inspiration: true
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Gloomyday: true
@@ -4019,7 +4011,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Gloomyday: true
@@ -4041,7 +4033,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Gloomyday: true
@@ -4063,7 +4055,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Gloomyday: true
@@ -4082,7 +4074,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Voiceofsiren: true
      Deepsleep: true
      Gloomyday: true
@@ -4186,7 +4178,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Gt_Revitalize: true
  - Status: Gt_Revitalize
    Icon: EFST_GENTLETOUCH_REVITALIZE
@@ -4198,7 +4190,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Gt_Change: true
  - Status: Gn_Cartboost
    Icon: EFST_GN_CARTBOOST
@@ -5229,7 +5221,7 @@ Body:
      MaxHp: true
    Flags:
      NoSave: true
-    EndOnStart:
+    End:
      Tinder_Breaker2: true
  - Status: Goldene_Ferse
    Icon: EFST_GOLDENE_FERSE
@@ -5268,7 +5260,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Overed_Boost: true
  - Status: Light_Of_Regene
    Icon: EFST_LIGHT_OF_REGENE
@@ -5396,7 +5388,7 @@ Body:
      NoConsumeItem: true
    Flags:
      StopAttacking: true
-    EndOnStart:
+    End:
      Poison: true
      Blind: true
      Freeze: true
@@ -5431,7 +5423,7 @@ Body:
      DisplayPc: true
    Fail:
      Magnificat: true
-    EndOnStart:
+    End:
      Magnificat: true
      Blind: true
      Curse: true
@@ -5445,7 +5437,7 @@ Body:
      Paralyse: true
      Pyrexia: true
      Deathhurt: true
-      LeechesEnd: true
+      Leechesend: true
      Venombleed: true
      Toxin: true
      Magicmushroom: true
@@ -5518,7 +5510,7 @@ Body:
      NoClearance: true
    Fail:
      P_Alter: true
-      MadnessCancel: true
+      Madnesscancel: true
  - Status: P_Alter
    Icon: EFST_P_ALTER
    DurationLookup: RL_P_ALTER
@@ -5529,7 +5521,7 @@ Body:
      NoClearance: true
    Fail:
      Heat_Barrel: true
-      MadnessCancel: true
+      Madnesscancel: true
  - Status: E_Chain
    Icon: EFST_E_CHAIN
    DurationLookup: RL_E_CHAIN
@@ -5801,7 +5793,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Food_Str_Cash: true
      Food_Agi_Cash: true
      Food_Vit_Cash: true
@@ -6231,31 +6223,31 @@ Body:
    Icon: EFST_GVG_GOLEM
  - Status: Gvg_Stun
    Icon: EFST_GVG_STUN
-    EndOnStart:
+    End:
      Gvg_Stun: true
  - Status: Gvg_Stone
    Icon: EFST_GVG_STONE
-    EndOnStart:
+    End:
      Stone: true
  - Status: Gvg_Freez
    Icon: EFST_GVG_FREEZ
-    EndOnStart:
+    End:
      Freeze: true
  - Status: Gvg_Sleep
    Icon: EFST_GVG_SLEEP
-    EndOnStart:
+    End:
      Sleep: true
  - Status: Gvg_Curse
    Icon: EFST_GVG_CURSE
-    EndOnStart:
+    End:
      Curse: true
  - Status: Gvg_Silence
    Icon: EFST_GVG_SILENCE
-    EndOnStart:
+    End:
      Silence: true
  - Status: Gvg_Blind
    Icon: EFST_GVG_BLIND
-    EndOnStart:
+    End:
      Blind: true
  - Status: Clan_Info
    Icon: EFST_CLAN_INFO
@@ -6280,8 +6272,6 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnEnd:
-      Clan_Info: true
  - Status: Arcwandclan
    Icon: EFST_ARCWANDCLAN
    CalcFlags:
@@ -6295,8 +6285,6 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnEnd:
-      Clan_Info: true
  - Status: Goldenmaceclan
    Icon: EFST_GOLDENMACECLAN
    CalcFlags:
@@ -6310,8 +6298,6 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnEnd:
-      Clan_Info: true
  - Status: Crossbowclan
    Icon: EFST_CROSSBOWCLAN
    CalcFlags:
@@ -6325,8 +6311,6 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnEnd:
-      Clan_Info: true
  - Status: Jumpingclan
    Icon: EFST_JUMPINGCLAN
    CalcFlags:
@@ -6342,8 +6326,6 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnEnd:
-      Clan_Info: true
  - Status: Tarotcard
    Icon: EFST_TAROTCARD
    DurationLookup: CG_TAROTCARD
@@ -6444,7 +6426,7 @@ Body:
      Flee: true
    Flags:
      NoRemoveOnDead: true
-    EndOnStart:
+    End:
      Stun: true
      Freeze: true
      Stone: true
@@ -6638,19 +6620,19 @@ Body:
  - Status: Lightofmoon
    Icon: EFST_LIGHTOFMOON
    DurationLookup: SJ_LIGHTOFMOON
-    EndOnStart:
+    End:
      Lunarstance: true
      Universestance: true
  - Status: Lightofsun
    Icon: EFST_LIGHTOFSUN
    DurationLookup: SJ_LIGHTOFSUN
-    EndOnStart:
+    End:
      Lightofsun: true
      Universestance: true
  - Status: Lightofstar
    Icon: EFST_LIGHTOFSTAR
    DurationLookup: SJ_LIGHTOFSTAR
-    EndOnStart:
+    End:
      Starstance: true
      Universestance: true
  - Status: Lunarstance
@@ -6658,7 +6640,7 @@ Body:
    DurationLookup: SJ_LUNARSTANCE
    CalcFlags:
      MaxHp: true
-    EndOnStart:
+    End:
      Sunstance: true
      Starstance: true
      Universestance: true
@@ -6672,7 +6654,7 @@ Body:
      Int: true
      Dex: true
      Luk: true
-    EndOnStart:
+    End:
      Sunstance: true
      Lunarstance: true
      Starstance: true
@@ -6682,7 +6664,7 @@ Body:
    CalcFlags:
      Batk: true
      Watk: true
-    EndOnStart:
+    End:
      Lunarstance: true
      Starstance: true
      Universestance: true
@@ -6715,7 +6697,7 @@ Body:
    DurationLookup: SJ_STARSTANCE
    CalcFlags:
      Aspd: true
-    EndOnStart:
+    End:
      Sunstance: true
      Lunarstance: true
      Universestance: true
@@ -6784,7 +6766,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Spirit: true
      Soulgolem: true
      Soulfalcon: true
@@ -6799,7 +6781,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Spirit: true
      Soulgolem: true
      Soulshadow: true
@@ -6815,7 +6797,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Spirit: true
      Soulgolem: true
      Soulshadow: true
@@ -6831,7 +6813,7 @@ Body:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-    EndOnStart:
+    End:
      Spirit: true
      Soulshadow: true
      Soulfalcon: true
@@ -6951,5 +6933,3 @@ Body:
      NoDispell: true
      NoClearance: true
      NoClearbuff: true
-  - Status: WeaponBreaker
-    DurationLookup: NPC_WEAPONBRAKER
--- a/db/re/achievement_db.yml
+++ b/db/re/achievement_db.yml
@@ -1784,12 +1784,6 @@ Body:
    Rewards:
      TitleId: 1034
    Score: 10
-  - Id: 130005 # TODO (Terra Gloria: give achievement when player visit the coronation ceremony)
-    Group: Chatting
-    Name: Who made the king
-    Rewards:
-      TitleID: 1046
-    Score: 10
  - Id: 170000
    Group: Chatting
    Name: Song chamber is not an accident
@@ -1908,7 +1902,7 @@ Body:
    Name: Elite Adventurer! (1)
    Condition: " Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS "
    Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
      Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
    Score: 50
  - Id: 200012
@@ -1916,7 +1910,7 @@ Body:
    Name: Transcendentaler! (1)
    Condition: " Class >= JOB_RUNE_KNIGHT_T && Class <= JOB_GUILLOTINE_CROSS_T "
    Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
      Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
    Score: 60
  - Id: 200013
@@ -1924,7 +1918,7 @@ Body:
    Name: Elite Adventurer! (2)
    Condition: " Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER "
    Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
      Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
    Score: 50
  - Id: 200014
@@ -1932,7 +1926,7 @@ Body:
    Name: Transcendentaler! (2)
    Condition: " Class >= JOB_ROYAL_GUARD_T && Class <= JOB_SHADOW_CHASER_T "
    Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
      Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
    Score: 60
  - Id: 200015
@@ -1947,7 +1941,7 @@ Body:
    Name: This is My way!
    Condition: " Class == JOB_STAR_GLADIATOR || Class == JOB_SOUL_LINKER || Class == JOB_KAGEROU || Class == JOB_OBORO || Class == JOB_REBELLION "
    Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
      Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
    Score: 20
  - Id: 200017
@@ -2027,7 +2021,7 @@ Body:
    Name: Incarnation of Love and Hate
    Condition: " BaseLevel == 99 && Class == JOB_NOVICE "
    Rewards:
-      Item: E_Abrasive_Box10
+      Item: Abrasive_Box_10
      Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
    Score: 30
  - Id: 200030
@@ -2035,7 +2029,7 @@ Body:
    Name: I really love it!
    Condition: " BaseLevel == 99 && (Class >= JOB_SWORDMAN && Class <= JOB_THIEF) "
    Rewards:
-      Item: E_Bubble_Gum_Box
+      Item: Bubble_Gum_Box_10
      Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
    Score: 30
  - Id: 200031
@@ -2043,38 +2037,30 @@ Body:
    Name: Reborn in Valhalla!
    Condition: " Class == JOB_NOVICE_HIGH "
    Rewards:
-      Item: Adventurer_Box_1
+    #  Item: Adventurer_Box_1
      Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
    Score: 10
  - Id: 200032
    Group: Goal_Level
    Name: The start of another adventure!
    Condition: " BaseLevel == 100 "
-    Rewards:
-      Item: Rebeginer_Box_100
+    #Rewards:
+    #  Item: Rebeginer_Box_100
    Score: 10
  - Id: 200033
    Group: Goal_Level
    Name: With a new mind!(1)
    Condition: " BaseLevel == 170 && (Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS_T) "
-    Rewards:
-      Item: Costume_Ticket
+    #Rewards:
+    #  Item: Costume_Ticket
    Score: 50
  - Id: 200034
    Group: Goal_Level
    Name: With a new mind!(2)
    Condition: " BaseLevel == 170 && (Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER_T) "
-    Rewards:
-      Item: Costume_Ticket
+    #Rewards:
+    #  Item: Costume_Ticket
    Score: 50
-  - Id: 200035
-    Group: Goal_Level
-    Name: Level 200 achieved!
-    Condition: " BaseLevel == 200 "
-    Rewards:
-      Item: C_Magestic_Goat2
-      Script: " specialeffect2 EF_BLESSING; sc_start SC_BLESSING,30000,10; "
-    Score: 100
  - Id: 220000
    Group: Chatting_Create
    Name: Community begin
--- a/db/re/generator/reputation.yml
+++ b/db/re/generator/reputation.yml
@@ -1,43 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Database
-###########################################################################
-#
-# Reputation Settings
-#
-###########################################################################
-# - Id                                  Client side index.
-#   Visibility                          Always = Always show
-#                                       Never = Never show
-#                                       Exist = Only show if greater than 0
-###########################################################################
-
-Header:
-  Type: REPUTATION_DB
-  Version: 1
-
-Body:
-  - Id: 1
-    Visibility: Always
-  - Id: 2
-    Visibility: Always
-  - Id: 3
-    Visibility: Exist
-  - Id: 4
-    Visibility: Exist
--- a/db/re/generator/reputation_group.yml
+++ b/db/re/generator/reputation_group.yml
@@ -1,51 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Group Database
-###########################################################################
-#
-# Reputation Group Settings
-#
-###########################################################################
-# - Id                                  Client side group index.
-#   ScriptName                          Unused? Used for "ID" in client
-#   Name                                Visible name in window
-#   ReputeList                          List of Reputations
-###########################################################################
-
-Header:
-  Type: REPUTATION_GROUP_DB
-  Version: 1
-
-Body:
-  - Id: 1
-    ScriptName: MonsterGroup1
-    Name: Monster Friends
-    ReputeList:
-      - 1
-      - 2
-  - Id: 2
-    ScriptName: Arunafelts
-    Name: Arunafeltz
-    ReputeList:
-      - 3
-  - Id: 3
-    ScriptName: Isgard
-    Name: Isgard
-    ReputeList:
-      - 4
--- a/db/re/instance_db.yml
+++ b/db/re/instance_db.yml
@@ -67,7 +67,7 @@ Body:
  - Id: 3
    Name: Orc's Memory
    Enter:
-      Map: 1@orcs
+      Map: 1@orcs 
      X: 179
      Y: 15
    AdditionalMaps:
@@ -345,33 +345,3 @@ Body:
      Map: 1@cor
      X: 176
      Y: 169
-  - Id: 44
-    Name: Half Moon In The Daylight
-    TimeLimit: 7200
-    Enter:
-      Map: 1@pop1
-      X: 47
-      Y: 133
-    AdditionalMaps:
-      1@pop2: true
-      1@pop3: true
-  - Id: 45
-    Name: Weekend Dungeon
-    TimeLimit: 3600
-    Enter:
-      Map: 1@md_pay
-      X: 240
-      Y: 29
-  - Id: 46
-    Name: Friday Dungeon
-    TimeLimit: 7200
-    Enter:
-      Map: 1@md_gef
-      X: 106
-      Y: 129
-  - Id: 47
-    Name: Poring Village
-    Enter:
-      Map: 1@begi
-      X: 100
-      Y: 22
--- a/db/re/item_combos.yml
+++ b/db/re/item_combos.yml
--- a/db/re/item_db_equip.yml
+++ b/db/re/item_db_equip.yml
--- a/db/re/item_db_etc.yml
+++ b/db/re/item_db_etc.yml
--- a/db/re/item_db_usable.yml
+++ b/db/re/item_db_usable.yml
--- a/db/re/item_enchant.yml
+++ b/db/re/item_enchant.yml
@@ -7366,13 +7366,13 @@ Body:
      Poring_Balloon: true
      Marin_Balloon: true
      Drops_Balloon: true
-      SantaPoring_Balloon: true
+      Santa_Poring_Balloon: true
      Poporing_Balloon: true
-      Metaling_Balloon: true
-      Deviling_Balloon: true
-      Angeling_Balloon: true
+      Metalring_Balloon: true
+      Devilring_Balloon: true
+      Angelring_Balloon: true
      Ghostring_Balloon: true
-      Archangeling_Balloon: true
+      Arch_Angelring_Balloon: true
    Reset:
      Chance: 100000
      Price: 500000
--- a/db/re/item_group_db.yml
+++ b/db/re/item_group_db.yml
--- a/db/re/item_packages.yml
+++ b/db/re/item_packages.yml
@@ -180,34 +180,34 @@ Body:
    Groups:
      - Group: 0
        Items:
-          - Item: Atker_Plate
-          - Item: Atker_Manteau
-          - Item: Atker_Greave
-          - Item: Atker_Ring
+          - Item: Attacker_Booster_Plate_
+          - Item: Attacker_Booster_Manteau_
+          - Item: Attacker_Booster_Greaves_
+          - Item: Attacker_Booster_Ring
          - Item: Boost_Up_1
            Amount: 3
      - Group: 1
        Items:
-          - Item: Ran_Suits
-          - Item: Ran_Manteau
-          - Item: Ran_Boots
-          - Item: Ran_Brooch
+          - Item: Ranger_Booster_Suits_
+          - Item: Ranger_Booster_Manteau_
+          - Item: Ranger_Booster_Boots_
+          - Item: Range_Booster_Brooch
          - Item: Boost_Up_1
            Amount: 3
      - Group: 2
        Items:
-          - Item: Ele_Robe
-          - Item: Ele_Muffler
-          - Item: Ele_Shoes
-          - Item: Ele_Earing
+          - Item: Elemental_Booster_Robe_
+          - Item: Elemental_Booster_Muffler_
+          - Item: Elemental_Booster_Shoes_
+          - Item: Elemental_Booster_Earring
          - Item: Boost_Up_1
            Amount: 3
      - Group: 3
        Items:
-          - Item: Defn_Robe
-          - Item: Defn_Muffler
-          - Item: Defn_Shoes
-          - Item: Defn_Earing
+          - Item: Defender_Booster_Robe_
+          - Item: Defender_Booster_Muffler_
+          - Item: Defender_Booster_Shoes_
+          - Item: Defender_Booster_Earring
          - Item: Boost_Up_1
            Amount: 3
  - Item: Special_Coin_Pack
@@ -529,19 +529,3 @@ Body:
      - Group: 1
        Items:
          - Item: aegis_101726
-  - Item: aegis_101919
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101920
-      - Group: 1
-        Items:
-          - Item: aegis_101921
-  - Item: aegis_101922
-    Groups:
-      - Group: 0
-        Items:
-          - Item: aegis_101923
-      - Group: 1
-        Items:
-          - Item: aegis_101924
--- a/db/re/item_reform.yml
+++ b/db/re/item_reform.yml
@@ -1931,280 +1931,280 @@ Body:
 #          Amount: 150
 #       ResultItem: Blessed_Knife_LT
 #       ChangeRefine: -1
-  - Item: Helm_Of_Faith_Hammer
-    BaseItems:
-      - BaseItem: Viva_Adul_Hat_WL1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_WL1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_WL2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_WL2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SR1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SR1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SR2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SR2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_AB1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_AB1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_AB2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_AB2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SC1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SC1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SC2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SC2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_RA1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_RA1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_RA2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_RA2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_LG1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_LG1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_LG2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_LG2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_GC1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_GC1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_GC2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_GC2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SO1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SO1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SO2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SO2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_RK1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_RK1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_RK2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_RK2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_WM1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_WM1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_WM2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_WM2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_NC1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_NC1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_NC2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_NC2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_GN1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_GN1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_GN2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_GN2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_KO1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_KO1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_KO2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_KO2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_RL1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_RL1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_RL2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_RL2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SP1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SP1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SP2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SP2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SJ1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SJ1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SJ2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SJ2
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SU1
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SU1
-        ChangeRefine: 1
-      - BaseItem: Viva_Adul_Hat_SU2
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Viva_Adul_Hat_SU2
-        ChangeRefine: 1
+# - Item: Helm_Of_Faith_Hammer
+#   BaseItems:
+#     - BaseItem: Viva_Adul_Hat_WL1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_WL1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_WL2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_WL2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SR1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SR1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SR2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SR2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_AB1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_AB1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_AB2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_AB2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SC1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SC1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SC2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SC2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_RA1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_RA1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_RA2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_RA2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_LG1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_LG1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_LG2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_LG2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_GC1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_GC1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_GC2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_GC2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SO1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SO1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SO2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SO2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_RK1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_RK1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_RK2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_RK2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_WM1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_WM1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_WM2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_WM2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_NC1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_NC1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_NC2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_NC2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_GN1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_GN1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_GN2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_GN2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_KO1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_KO1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_KO2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_KO2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_RL1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_RL1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_RL2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_RL2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SP1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SP1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SP2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SP2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SJ1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SJ1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SJ2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SJ2
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SU1
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SU1
+#       ChangeRefine: 1
+#     - BaseItem: Viva_Adul_Hat_SU2
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Viva_Adul_Hat_SU2
+#       ChangeRefine: 1
  - Item: Hero_Weapon_Up_Box_6
    BaseItems:
      - BaseItem: Up_Humma_Clear
@@ -3649,216 +3649,216 @@ Body:
 #          Amount: 20
 #       ResultItem: Clock_Casket_RD_LT
 #       ChangeRefine: -5
-  - Item: Clock_Tower_W_Hammer
-    BaseItems:
-      - BaseItem: Precision_Bow
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Bow
-        ChangeRefine: 1
-      - BaseItem: Precision_Fist
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Fist
-        ChangeRefine: 1
-      - BaseItem: Precision_Fuuma
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Fuuma
-        ChangeRefine: 1
-      - BaseItem: Precision_Gatling
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Gatling
-        ChangeRefine: 1
-      - BaseItem: Precision_Grenade
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Grenade
-        ChangeRefine: 1
-      - BaseItem: Precision_Lute
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Lute
-        ChangeRefine: 1
-      - BaseItem: Precision_Pistol
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Pistol
-        ChangeRefine: 1
-      - BaseItem: Precision_Rifle
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Rifle
-        ChangeRefine: 1
-      - BaseItem: Precision_Shotgun
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Shotgun
-        ChangeRefine: 1
-      - BaseItem: Precision_Whip
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Precision_Whip
-        ChangeRefine: 1
-      - BaseItem: Solid_Claymore
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Claymore
-        ChangeRefine: 1
-      - BaseItem: Solid_Dagger
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Dagger
-        ChangeRefine: 1
-      - BaseItem: Solid_Edge
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Edge
-        ChangeRefine: 1
-      - BaseItem: Solid_Manual
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Manual
-        ChangeRefine: 1
-      - BaseItem: Solid_Rod
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Rod
-        ChangeRefine: 1
-      - BaseItem: Solid_Spear
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Spear
-        ChangeRefine: 1
-      - BaseItem: Solid_Staff
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Staff
-        ChangeRefine: 1
-      - BaseItem: Solid_Wand
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Solid_Wand
-        ChangeRefine: 1
-      - BaseItem: Wicked_Axe
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Axe
-        ChangeRefine: 1
-      - BaseItem: Wicked_Blade
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Blade
-        ChangeRefine: 1
-      - BaseItem: Wicked_Book
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Book
-        ChangeRefine: 1
-      - BaseItem: Wicked_Cross
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Cross
-        ChangeRefine: 1
-      - BaseItem: Wicked_Dagger
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Dagger
-        ChangeRefine: 1
-      - BaseItem: Wicked_Edge
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Edge
-        ChangeRefine: 1
-      - BaseItem: Wicked_Katar
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Katar
-        ChangeRefine: 1
-      - BaseItem: Wicked_Plant
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-         - Material: Blacksmith_Blessing
-           Amount: 14
-        ResultItem: Wicked_Plant
-        ChangeRefine: 1
+# - Item: Clock_Tower_W_Hammer
+#   BaseItems:
+#     - BaseItem: Precision_Bow
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Bow
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Fist
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Fist
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Fuuma
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Fuuma
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Gatling
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Gatling
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Grenade
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Grenade
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Lute
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Lute
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Pistol
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Pistol
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Rifle
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Rifle
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Shotgun
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Shotgun
+#       ChangeRefine: 1
+#     - BaseItem: Precision_Whip
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Precision_Whip
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Claymore
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Claymore
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Dagger
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Dagger
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Edge
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Edge
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Manual
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Manual
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Rod
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Rod
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Spear
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Spear
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Staff
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Staff
+#       ChangeRefine: 1
+#     - BaseItem: Solid_Wand
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Solid_Wand
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Axe
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Axe
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Blade
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Blade
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Book
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Book
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Cross
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Cross
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Dagger
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Dagger
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Edge
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Edge
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Katar
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Katar
+#       ChangeRefine: 1
+#     - BaseItem: Wicked_Plant
+#       MinimumRefine: 9
+#       MaximumRefine: 11
+#       Materials:
+#        - Material: Blacksmith_Blessing
+#          Amount: 14
+#       ResultItem: Wicked_Plant
+#       ChangeRefine: 1
  - Item: Thanos_Upgrade_Box
    BaseItems:
      - BaseItem: Thanos_Sword
--- a/db/re/laphine_synthesis.yml
+++ b/db/re/laphine_synthesis.yml
@@ -37,7 +37,7 @@ Header:
  Version: 1

 Body:
-  - Item: Shadow_Mix_Recipe
+  - Item: Shadow_Exchange_Box
    RewardGroup: SHADOW_EXCHANGE_BOX
    RequiredRequirementsCount: 3
    Requirements:
@@ -345,42 +345,42 @@ Body:
      - Item: S_Gunslinger_Shield
      - Item: S_Thief_earring
      - Item: S_Archer_earring
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
      - Item: S_Sigrun_Armor
      - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
      - Item: S_Critical_Shield
      - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
      - Item: S_AllMighty_Earring
      - 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: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
      - Item: S_Tension_Weapon
      - Item: S_Tension_Earring
      - Item: S_Tension_Pendent
@@ -390,17 +390,17 @@ Body:
      - Item: S_Healing_Shield
      - Item: S_Healing_Shoes
      - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
      - Item: S_Penetration_Shoes
      - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
      - Item: Sentimental_Weapone_S
      - Item: Sentimental_Earring_S
      - Item: Sentimental_Pendant_S
@@ -414,8 +414,8 @@ Body:
      - Item: S_Magical_Shoes
      - Item: S_Magical_Shield
      - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
      - Item: S_KingbirdAncient_Armor
      - Item: S_CriticalHit_Armor
      - Item: S_Rebellion_Armor
@@ -657,8 +657,8 @@ Body:
      - Item: S_FullPene_Armor
      - Item: S_FullPene_Pendant
      - Item: S_FullPene_Earring
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
      - Item: S_Blitz_Weapon
      - Item: S_Blitz_Armor
      - Item: S_FullTemp_Earring
@@ -857,9 +857,9 @@ Body:
      - Item: MechanicStone_Bottom
      - Item: MechanicStone_Robe
      - Item: WanderMinstrelStone_Top
-      - Item: WanderMinstStone_Middle
-      - Item: WanderMinstStone_Bottom
-      - Item: WanderMinstreStone_Robe
+      - Item: WanderMinstrelStone_Middle
+      - Item: WanderMinstrelStone_Bottom
+      - Item: WanderMinstrelStone_Robe
      - Item: HPStone_Bottom
      - Item: DoubleAttack_Stone
      - Item: Critical_Stone_Robe
@@ -890,14 +890,14 @@ Body:
      - Item: ShadowchasStone_Bottom2
      - Item: ShadowchasStone_Middle2
      - Item: ShadowchaserStone_Top2
-      - Item: SoulreaperStone_Robe
-      - Item: SoullinkerStone_Top
-      - Item: SoullinkerStone_Middle
-      - Item: SoullinkerStone_Bottom
-      - Item: GladiatorStone_Top
-      - Item: GladiatorStone_Middle
-      - Item: GladiatorStone_Bottom
-      - Item: StaremperorStone_Robe
+      - Item: SoulReaperStone_Robe
+      - Item: SoulLinkerStone_Top
+      - Item: SoulLinkerStone_Middle
+      - Item: SoulLinkerStone_Bottom
+      - Item: StarGladiatorStone_Top
+      - Item: StarGladiatorStone_Middle
+      - Item: StarGladiatorStone_Bottom
+      - Item: StarEmperorStone_Garment
      - Item: NinjaStone_Top
      - Item: NinjaStone_Middle
      - Item: NinjaStone_Bottom
@@ -906,35 +906,35 @@ Body:
      - Item: GunslingerStone_Top
      - Item: GunslingerStone_Middle
      - Item: GunslingerStone_Bottom
-      - Item: RebellionStone_Robe
+      - Item: GunslingerStone_Robe
      - Item: DoramStone_Top
      - Item: DoramStone_Middle
      - Item: DoramStone_Bottom
      - Item: DoramStone_Robe
-      - Item: RangerStone_Top2
-      - Item: RangerStone_Middle2
-      - Item: RangerStone_Bottom2
-      - Item: RangerStone_Robe2
-      - Item: MechanicStone_Top2
-      - Item: MechanicStone_Middle2
-      - Item: MechanicStone_Bottom2
-      - Item: MechanicStone_Robe2
-      - Item: HighpriestStone_Top2
-      - Item: HighpriestStone_Middle2
-      - Item: HighpriestStone_Bottom2
-      - Item: ArchbishopStone_Robe2
+      - Item: RangerStone_II_Top
+      - Item: RangerStone_II_Middle
+      - Item: RangerStone_II_Bottom
+      - Item: RangerStone_II_Garment
+      - Item: MechanicStone_II_Top
+      - Item: MechanicStone_II_Middle
+      - Item: MechanicStone_II_Bottom
+      - Item: MechanicStone_II_Garment
+      - Item: HighpriestStone_II_Top
+      - Item: HighpriestStone_II_Middle
+      - Item: HighpriestStone_II_Bottom
+      - Item: ArchbishopStone_II_Garment
      - Item: WarlockStone_Robe2
      - Item: WarlockStone_Top2
      - Item: WarlockStone_Middle2
      - Item: WarlockStone_Bottom2
-      - Item: RoyalguardStone_Robe2
-      - Item: PaladinStone_Top2
-      - Item: PaladinStone_Middle2
-      - Item: PaladinStone_Bottom2
-      - Item: GuillcrossStone_Robe2
-      - Item: AssacrossStone_Top2
-      - Item: AssacrossStone_Middle2
-      - Item: AssacrossStone_Bottom2
+      - Item: RoyalGuardStone_Robe2
+      - Item: RoyalGuardStone_Top2
+      - Item: RoyalGuardStone_Middle2
+      - Item: RoyalGuardStone_Bottom2
+      - Item: GuillotineCrossStone_Robe2
+      - Item: GuillotineCrossStone_Top2
+      - Item: GuillotineCrossStone_Middle2
+      - Item: GuillotineCrossStone_Bottom2
      - Item: RuneknightStone_Robe2
      - Item: RuneknightStone_Top2
      - Item: RuneknightStone_Middle2
@@ -994,7 +994,7 @@ Body:
      - Item: ShadowchasStone_Top3
      - Item: ShadowchasStone_Middle3
      - Item: ShadowchasStone_Bottom3
-  - Item: EventItem_Recipe
+  - Item: Collectibles_Box
    # TODO: Add official rewards
    RewardGroup: VIOLETBOX
    RequiredRequirementsCount: 10
@@ -1427,7 +1427,7 @@ Body:
        Amount: 10
      - Item: Ein_EYEROCK
        Amount: 10
-  - Item: PetEgg_Recipe
+  - Item: Pet_Egg_Box
    RewardGroup: PET_EGG_BOX
    RequiredRequirementsCount: 2
    Requirements:
@@ -1502,7 +1502,7 @@ Body:
      - Item: Miyabi_Ningyo_Egg
      - Item: Leaf_Cat_Egg
      - Item: Dark_Priest_Egg
-  - Item: Nyang_Costume_Recipe
+  - Item: Costume_Exchange_Box
    RewardGroup: COSTUME_EXCHANGE_BOX
    Requirements:
      - Item: C_Rabbit_Ear_Hat
@@ -1554,7 +1554,7 @@ Body:
      - Item: C_Cowlick_OM
      - Item: C_Cowlick_BU
      - Item: C_Cowlick_WH
-      - Item: C_Cowlick_BL
+      - Item: C_Bouncing_Hair_Black
      - Item: C_Straight_Pony_YL
      - Item: C_Straight_Pony_GN
      - Item: C_Straight_Pony_PP
@@ -1562,7 +1562,7 @@ Body:
      - Item: C_Straight_Pony_OM
      - Item: C_Straight_Pony_BU
      - Item: C_Straight_Pony_WH
-      - Item: C_Straight_Pony_BL
+      - Item: C_Straight_Pony_Black
      - Item: C_Loose_Wave_Twin_YL
      - Item: C_Loose_Wave_Twin_GN
      - Item: C_Loose_Wave_Twin_PP
@@ -1570,7 +1570,7 @@ Body:
      - Item: C_Loose_Wave_Twin_OM
      - Item: C_Loose_Wave_Twin_BU
      - Item: C_Loose_Wave_Twin_WH
-      - Item: C_Loose_Wave_Twin_BL
+      - Item: C_Loose_Wave_Twin
      - Item: C_Cupid_Wing_Pink
      - Item: C_Pecopeco_Cap
      - Item: C_Green_Hat
@@ -1639,7 +1639,7 @@ Body:
      - Item: C_Long_Pony_OM
      - Item: C_Long_Pony_PP
      - Item: C_Piggyback
-      - Item: C_Rune_Helm
+      - Item: C_RuneHelm
      - Item: C_Shaving_Foam
      - Item: C_Blue_Fairy_Wing
      - Item: C_Black_Cat
@@ -1649,7 +1649,7 @@ Body:
      - Item: C_Thanatos_Sword
      - Item: C_Warm_Cat_Muffler
      - Item: C_Clock_Casket
-      - Item: C_Chatty_Parrot
+      - Item: C_Happy_Parrot_J
      - Item: C_Flame_Muffler
      - Item: C_Teddy_Bear_Hood
      - Item: C_Mouton_Life_BL
@@ -1659,7 +1659,7 @@ Body:
      - Item: C_BelieversCap
      - Item: C_Pope_Ribbon
      - Item: C_Alice_Wig
-      - Item: C_Khalitzburg_Helm_BL
+      - Item: Khalitzburg_KN_Helm_BL
      - Item: C_Wanderer_Sakkat
      - Item: C_Wings_of_Michael
      - Item: C_Shura_King_Pledge
@@ -1809,18 +1809,18 @@ Body:
      - Item: C_Fairy_Feathers
      - Item: C_Giant_White_Rabbit
      - Item: C_Katashiro_Flying
-      - Item: C_Love_Daddy
+      - Item: C_Yellow_Hunting_Cap
      - Item: C_Sakura_Coronet
      - Item: C_Full_Bloom_Hairpin
      - Item: Cons_Of_Earth
-      - Item: C_Cons_Of_Wind
+      - Item: Costume_Master_Of_Wind
      - Item: C_Cons_Of_Darkness
      - Item: C_Boitata_Hat_J
      - Item: C_Jioia_TW
      - Item: C_Baldr_Wing_TW
      - Item: C_Brabery_Hat
      - Item: C_Carefree_Face
-      - Item: C_Sting_Silk_Ribbon
+      - Item: C_Stings_Silk_Ribbon
      - Item: C_Adventure_Cat_Bag
      - Item: C_Flower_Summer_Hat
      - Item: C_Cherry_Ribbon
@@ -1858,12 +1858,12 @@ Body:
    RewardGroup: SUIT_UPGRADE_KIT
    Requirements:
      - Item: Kafra_Uniform
-  - Item: FallenAngelWing_Reset
+  - Item: Scroll_of_Fallen_Angel_Wings
    RewardGroup: SCROLL_OF_FALLEN_ANGEL_WINGS
    Requirements:
      - Item: Fallen_Angel_Wings_
      - Item: Fallen_Angel_Wing
-  - Item: JobShadow_Mix_Weapon
+  - Item: Class_Shadow_Box_Weapon
    RewardGroup: CLASS_SHADOW_BOX_WEAPON
    MinimumRefine: 7
    Requirements:
@@ -1886,7 +1886,7 @@ Body:
      - Item: S_Ranger_Weapon
      - Item: S_Minstrel_Weapon
      - Item: S_Wanderer_Weapon
-  - Item: JobShadow_Mix_Armor
+  - Item: Class_Shadow_Box_Armor
    RewardGroup: CLASS_SHADOW_BOX_ARMOR
    MinimumRefine: 7
    Requirements:
@@ -1910,7 +1910,7 @@ Body:
      - Item: S_DoramMagical_Armor
      - Item: S_Star_Emperor_Armor
      - Item: S_Soul_Reaper_Armor
-  - Item: JobShadow_Mix_Shoes
+  - Item: Class_Shadow_Box_Shoes
    RewardGroup: CLASS_SHADOW_BOX_SHOES
    MinimumRefine: 7
    Requirements:
@@ -1934,7 +1934,7 @@ Body:
      - Item: S_DoramMagical_Shoes
      - Item: S_Star_Emperor_Shoes
      - Item: S_Soul_Reaper_Shoes
-  - Item: JobShadow_Mix_Shield
+  - Item: Class_Shadow_Box_Shield
    RewardGroup: CLASS_SHADOW_BOX_SHIELD
    MinimumRefine: 7
    Requirements:
@@ -1957,7 +1957,7 @@ Body:
      - Item: S_DoramMagical_Shield
      - Item: S_SuperNovice_Shield
      - Item: S_Gunslinger_Shield
-  - Item: JobShadow_Mix_Pendant
+  - Item: Class_Shadow_Box_Pendant
    RewardGroup: CLASS_SHADOW_BOX_PENDANT
    MinimumRefine: 7
    Requirements:
@@ -1967,7 +1967,7 @@ Body:
      - Item: S_Thief_Pendant
      - Item: S_Magician_Pendant
      - Item: S_Archer_Pendant
-  - Item: JobShadow_Mix_Earing
+  - Item: Class_Shadow_Box_Earring
    RewardGroup: CLASS_SHADOW_BOX_EARRING
    MinimumRefine: 7
    Requirements:
@@ -2067,7 +2067,7 @@ Body:
  - Item: Magical_Cat_Hand
    RewardGroup: MAGICAL_CAT_HAND
    Requirements:
-      - Item: Cat_Lace_Hairband_K
+      - Item: Neko_Headress
  - Item: StabilityShadow_Mix
    RewardGroup: STABILITYSHADOW_MIX
    RequiredRequirementsCount: 3
@@ -2829,7 +2829,7 @@ Body:
    RequiredRequirementsCount: 2
    MinimumRefine: 7
    Requirements:
-      - Item: S2_Hasty_Shoes
+      - Item: S_Hasty_Shoes_II
      - Item: S_Hasty_Armor
      - Item: S_Hasty_Shoes
  - Item: EnchantStone_Recipe_4m
@@ -2911,7 +2911,7 @@ Body:
    RewardGroup: SHIVER_KATAR_K_CUBE
    MinimumRefine: 9
    Requirements:
-      - Item: Shiver_Katar_K
+      - Item: Katar_of_Shiver
  - Item: Blade_Katar_Cube
    RewardGroup: BLADE_KATAR_CUBE
    MinimumRefine: 9
@@ -3212,7 +3212,7 @@ Body:
    RewardGroup: DEMON_HUNT_BIBLE_CUBE
    MinimumRefine: 9
    Requirements:
-      - Item: Demon_Hunting_Bible_K
+      - Item: Exoricists_Bible_
  - Item: Saint_Hall_Cube
    RewardGroup: SAINT_HALL_CUBE
    MinimumRefine: 9
@@ -3233,12 +3233,12 @@ Body:
    MinimumRefine: 9
    Requirements:
      - Item: Humma_Clear
-  - Item: OneSkyOneSun_Cube
+  - Item: Thousand_Sun_Cube
    RewardGroup: THOUSAND_SUN_CUBE
    MinimumRefine: 9
    Requirements:
      - Item: OneSkyOneSun
-  - Item: SoulWeight_Cube
+  - Item: Spirit_Pendulum_Cube
    RewardGroup: SPIRIT_PENDULUM_CUBE
    MinimumRefine: 9
    Requirements:
@@ -3253,17 +3253,17 @@ Body:
    MinimumRefine: 9
    Requirements:
      - Item: Master_Soul_Rifle
-  - Item: Golden_L_Launcher_Cube
+  - Item: Golden_Lord_Launcher_Cube
    RewardGroup: GOLDEN_LORD_LAUNCHER_CUBE
    MinimumRefine: 9
    Requirements:
      - Item: Golden_L_Launcher
-  - Item: The_Black_Gatling_Cube
+  - Item: The_Black_Cube
    RewardGroup: THE_BLACK_CUBE
    MinimumRefine: 9
    Requirements:
      - Item: The_Black_Gatling
-  - Item: Demon_S_Shot_Cube
+  - Item: Demon_Slayer_Shot_Cube
    RewardGroup: DEMON_SLAYER_SHOT_CUBE
    MinimumRefine: 9
    Requirements:
@@ -3307,11 +3307,11 @@ Body:
    Requirements:
      - Item: S_Penetration_Shoes
      - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
      - Item: S_Penetration_Earring
      - Item: S_Penetration_Pendent
      - Item: S_Executioner_Weapon
@@ -3324,7 +3324,7 @@ Body:
      - Item: S_Vibration_Weapon
      - Item: S_Holy_Water_Weapon
      - Item: S_Scissors_Weapon
-      - Item: S2_Force_Ex_Weapon
+      - Item: S_Force_Executioner_Weapon
      - Item: S_Penetration_Weapon
      - Item: S_Penetration_Armor
      - Item: S_Exe_Ho_Weapon
@@ -3344,11 +3344,11 @@ Body:
    Requirements:
      - Item: S_Tempest_Shoes
      - Item: S_Tempest_Shield
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
      - Item: S_Tempest_Earring
      - Item: S_Tempest_Pendent
      - Item: S_M_Executioner_Weapon
@@ -3361,7 +3361,7 @@ Body:
      - Item: S_M_Vibration_Weapon
      - Item: S_M_Holy_Water_Weapon
      - Item: S_M_Scissors_Weapon
-      - Item: S2_Spirit_M_E_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
      - Item: S_Tempest_Weapon
      - Item: S_Tempest_Armor
      - Item: S_M_Exe_Ho_Weapon
@@ -4209,9 +4209,9 @@ Body:
      - Item: S_Gemstone_Earring
      - Item: S_Gemstone_Pendent
      - Item: S_Gemstone_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Gemstone_Earring
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Gemstone_Earring_II
  - Item: Mammoth_Mix
    RewardGroup: MAMMOTH_MIX
    RequiredRequirementsCount: 6
@@ -4247,11 +4247,11 @@ Body:
      - Item: S_Spiritual_Weapon
      - Item: S_Spiritual_Earring
      - Item: S_Spiritual_Pendent
-      - Item: S2_Spiritual_Weapon
+      - Item: S_Spiritual_Weapon_II
      - Item: S_Malicious_Armor
      - Item: S_Malicious_Shoes
      - Item: S_Malicious_Shield
-      - Item: S2_Malicious_Armor
+      - Item: S_Malicious_Armor_II
  - Item: MajorAutoSpell_Mix
    RewardGroup: MAJORAUTOSPELL_MIX
    RequiredRequirementsCount: 6
@@ -4341,18 +4341,18 @@ Body:
      - Item: S_Reload_Armor
      - Item: S_Reload_Shoes
      - Item: S_Reload_Shield
-      - Item: S2_Reload_Armor
+      - Item: S_Reload_Armor_II
  - Item: SpellCasterShadow_Mix
    RewardGroup: SPELLCASTERSHADOW_MIX
    RequiredRequirementsCount: 6
    MinimumRefine: 7
    MaximumRefine: 10
    Requirements:
-      - Item: S2_Spell_Flow_Shield
+      - Item: S_Spellflow_Shield_II
      - Item: S_Spell_Flow_Shield
      - Item: S_Spell_Flow_Armor
      - Item: S_Spell_Flow_Shoes
-      - Item: S2_Caster_Armor
+      - Item: S_Caster_Armor_II
      - Item: S_Caster_Armor
      - Item: S_Caster_Shield
      - Item: S_Caster_Shoes
@@ -4469,9 +4469,9 @@ Body:
    MinimumRefine: 7
    MaximumRefine: 10
    Requirements:
-      - Item: S2_Bearers_Shoes
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Pendent
+      - Item: S_Bearer's_Shoes_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Pendant_II
      - Item: S_Bearers_Earring
      - Item: S_Bearers_Pendent
      - Item: S_Bearers_Armor
--- a/db/re/laphine_upgrade.yml
+++ b/db/re/laphine_upgrade.yml
@@ -475,46 +475,46 @@ Body:
      - Item: S_DoramMagical_Shield
      - Item: S_SuperNovice_Shield
      - Item: S_Gunslinger_Shield
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
      - Item: S_Sigrun_Armor
      - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
      - Item: S_Critical_Shield
      - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
      - Item: S_AllMighty_Earring
      - Item: S_AllMighty_Pendant
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
      - Item: S_Blitz_Weapon
      - Item: S_Blitz_Armor
      - Item: S_Tempest_Shield
      - Item: S_Tempest_Shoes
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
-      - Item: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
      - Item: S_Tension_Weapon
      - Item: S_Tension_Earring
      - Item: S_Tension_Pendent
@@ -524,17 +524,17 @@ Body:
      - Item: S_Healing_Shield
      - Item: S_Healing_Shoes
      - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
      - Item: S_Penetration_Shoes
      - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
      - Item: Sentimental_Weapone_S
      - Item: Sentimental_Earring_S
      - Item: Sentimental_Pendant_S
@@ -548,8 +548,8 @@ Body:
      - Item: S_Magical_Shoes
      - Item: S_Magical_Shield
      - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
      - Item: S_KingbirdAncient_Armor
      - Item: S_CriticalHit_Armor
      - Item: S_Thief_earring
@@ -1207,46 +1207,46 @@ Body:
      - Item: S_Reload_Shoes
      - Item: S_Reload_Shield
      - Item: S_Reload_Armor
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
      - Item: S_Sigrun_Armor
      - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
      - Item: S_Critical_Shield
      - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
      - Item: S_AllMighty_Earring
      - Item: S_AllMighty_Pendant
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
      - Item: S_Blitz_Weapon
      - Item: S_Blitz_Armor
      - Item: S_Tempest_Shield
      - Item: S_Tempest_Shoes
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
-      - Item: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
      - Item: S_Tension_Weapon
      - Item: S_Tension_Earring
      - Item: S_Tension_Pendent
@@ -1256,17 +1256,17 @@ Body:
      - Item: S_Healing_Shield
      - Item: S_Healing_Shoes
      - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
      - Item: S_Penetration_Shoes
      - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
      - Item: Sentimental_Weapone_S
      - Item: Sentimental_Earring_S
      - Item: Sentimental_Pendant_S
@@ -1280,8 +1280,8 @@ Body:
      - Item: S_Magical_Shoes
      - Item: S_Magical_Shield
      - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
      - Item: S_KingbirdAncient_Armor
      - Item: S_CriticalHit_Armor
      - Item: S_Tempest_Weapon
@@ -2017,46 +2017,46 @@ Body:
      - Item: S_DoramMagical_Shield
      - Item: S_SuperNovice_Shield
      - Item: S_Gunslinger_Shield
-      - Item: S2_Hasty_Shoes
-      - Item: S2_Bearers_Pendent
-      - Item: S2_Gemstone_Earring
-      - Item: S2_Spell_Flow_Shield
-      - Item: S2_Spiritual_Weapon
-      - Item: S2_Malicious_Armor
+      - Item: S_Hasty_Shoes_II
+      - Item: S_Bearer's_Pendant_II
+      - Item: S_Gemstone_Earring_II
+      - Item: S_Spellflow_Shield_II
+      - Item: S_Spiritual_Weapon_II
+      - Item: S_Malicious_Armor_II
      - Item: S_Sigrun_Armor
      - Item: S_Sigrun_Shield
-      - Item: S2_Force_Ex_Weapon
-      - Item: S2_Spirit_M_E_Weapon
-      - Item: S2_Caster_Armor
-      - Item: S2_Reload_Armor
+      - Item: S_Force_Executioner_Weapon
+      - Item: S_Spirit_Magic_Executioner_Weapon
+      - Item: S_Caster_Armor_II
+      - Item: S_Reload_Armor_II
      - Item: S_Critical_Shield
      - Item: S_Critical_Shoes
-      - Item: S_MagicCompose_Armor
-      - Item: S2_Gemstone_Weapon
-      - Item: S2_Gemstone_Shield
-      - Item: S2_Bearers_Armor
-      - Item: S2_Bearers_Shoes
+      - Item: S_Magic_Compose_Armor
+      - Item: S_Gemstone_Weapon_II
+      - Item: S_Gemstone_Shield_II
+      - Item: S_Bearer's_Armor_II
+      - Item: S_Bearer's_Shoes_II
      - Item: S_AllMighty_Earring
      - Item: S_AllMighty_Pendant
-      - Item: S_AllRace_Shoes
-      - Item: S_AllRace_Shield
+      - Item: S_All_Race_Shoes
+      - Item: S_All_Race_Shield
      - Item: S_Blitz_Weapon
      - Item: S_Blitz_Armor
      - Item: S_Tempest_Shield
      - Item: S_Tempest_Shoes
-      - Item: S_M_ExeHoly_Armor
-      - Item: S_M_ExoCorrupt_Armor
-      - Item: S_M_DragonVib_Armor
-      - Item: S_M_SciHunting_Armor
-      - Item: S_M_FishInsect_Armor
-      - Item: S2_Plasterer's_Armor
-      - Item: S2_Insomniac_Shoes
-      - Item: S2_Peerless_Armor
-      - Item: S2_Adurate_Shoes
-      - Item: Unfreez_Weapon_S2
-      - Item: Vitality_Earing_S2
-      - Item: S2_Neutral_Weapon
-      - Item: S2_Curse_Lift_Pendent
+      - Item: S_Magic_Executioner_Holy_Water_Armor
+      - Item: S_Magic_Exorcist_Corrupted_Armor
+      - Item: S_Magic_Vibration_Dragon_Killer_Armor
+      - Item: S_Magic_Scissor_Hunting_Armor
+      - Item: S_Magic_Fishing_Insect_Net_Armor
+      - Item: S_Plasterer's_Armor_II
+      - Item: S_Insomniac_Shoes_II
+      - Item: S_Peerless_Armor_II
+      - Item: S_Adulate_Shoes_II
+      - Item: S_Unfreezing_Weapon_II
+      - Item: S_Vitality_Earring_II
+      - Item: S_Neutral_Weapon_II
+      - Item: S_Uncursed_Pendant_II
      - Item: S_Tension_Weapon
      - Item: S_Tension_Earring
      - Item: S_Tension_Pendent
@@ -2066,17 +2066,17 @@ Body:
      - Item: S_Healing_Shield
      - Item: S_Healing_Shoes
      - Item: S_Restore_Earring
-      - Item: S_Restore_Pendent
-      - Item: S_MortalBlow_Weapon
-      - Item: S_MortalBlow_Earring
-      - Item: S_MortalBlow_Pendent
+      - Item: S_Restore_Pendant
+      - Item: S_Mortal_Blow_Weapon
+      - Item: S_Mortal_Blow_Earring
+      - Item: S_Mortal_Blow_Pendant
      - Item: S_Penetration_Shoes
      - Item: S_Penetration_Shield
-      - Item: S_ExeHoly_Armor
-      - Item: S_ExoCorrupt_Armor
-      - Item: S_DragonVib_Armor
-      - Item: S_SciHunting_Armor
-      - Item: S_FishInsect_Armor
+      - Item: S_Executioner_Holy_Water_Armor
+      - Item: S_Exorcist_Corrupted_Armor
+      - Item: S_Vibration_Dragon_Killer_Armor
+      - Item: S_Scissor_Hunting_Armor
+      - Item: S_Fishing_Insect_Net_Armor
      - Item: Sentimental_Weapone_S
      - Item: Sentimental_Earring_S
      - Item: Sentimental_Pendant_S
@@ -2090,8 +2090,8 @@ Body:
      - Item: S_Magical_Shoes
      - Item: S_Magical_Shield
      - Item: S_Magical_Armor
-      - Item: S_ImmunedAthena_Shield
-      - Item: S_HardChamption_Shoes
+      - Item: S_Immune_Athena_Shield
+      - Item: S_Hard_Champion_Shoes
      - Item: S_KingbirdAncient_Armor
      - Item: S_CriticalHit_Armor
      - Item: S_Thief_earring
@@ -2499,8 +2499,8 @@ Body:
      - Item: Iron_Staff
      - Item: Oriental_Sword
      - Item: Undine_Spear_K
-      - Item: Demon_Hunting_Bible_K
-      - Item: Shiver_Katar_K
+      - Item: Exoricists_Bible_
+      - Item: Katar_of_Shiver
      - Item: OneSkyOneSun
      - Item: SoulWeight
      - Item: MeawFoxtail
@@ -2573,8 +2573,8 @@ Body:
      - Item: Iron_Staff
      - Item: Oriental_Sword
      - Item: Undine_Spear_K
-      - Item: Demon_Hunting_Bible_K
-      - Item: Shiver_Katar_K
+      - Item: Exoricists_Bible_
+      - Item: Katar_of_Shiver
      - Item: OneSkyOneSun
      - Item: SoulWeight
      - Item: MeawFoxtail
@@ -2639,18 +2639,18 @@ Body:
    MaximumRefine: 9
    CardsAllowed: true
    TargetItems:
-      - Item: Atker_Plate
-      - Item: Atker_Manteau
-      - Item: Atker_Greave
-      - Item: Ran_Suits
-      - Item: Ran_Manteau
-      - Item: Ran_Boots
-      - Item: Ele_Robe
-      - Item: Ele_Muffler
-      - Item: Ele_Shoes
-      - Item: Defn_Robe
-      - Item: Defn_Muffler
-      - Item: Defn_Shoes
+      - Item: Attacker_Booster_Plate_
+      - Item: Attacker_Booster_Manteau_
+      - Item: Attacker_Booster_Greaves_
+      - Item: Ranger_Booster_Suits_
+      - Item: Ranger_Booster_Manteau_
+      - Item: Ranger_Booster_Boots_
+      - Item: Elemental_Booster_Robe_
+      - Item: Elemental_Booster_Muffler_
+      - Item: Elemental_Booster_Shoes_
+      - Item: Defender_Booster_Robe_
+      - Item: Defender_Booster_Muffler_
+      - Item: Defender_Booster_Shoes_
  - Item: Boost_Up_2
    ResultRefine: 10
    CardsAllowed: true
@@ -3884,8 +3884,8 @@ Body:
      - Item: Iron_Staff
      - Item: Oriental_Sword
      - Item: Undine_Spear_K
-      - Item: Demon_Hunting_Bible_K
-      - Item: Shiver_Katar_K
+      - Item: Exoricists_Bible_
+      - Item: Katar_of_Shiver
      - Item: OneSkyOneSun
      - Item: SoulWeight
      - Item: MeawFoxtail
@@ -4091,41 +4091,41 @@ Body:
    MaximumRefine: 11
    CardsAllowed: true
    TargetItems:
-      - Item: Staff_Of_Miracle
+      - Item: Staff_of_Miracle
      - Item: Gravitation_Staff
      - Item: Adorare_Staff
      - Item: Volar
      - Item: Vernan
-      - Item: Reaper_Cross
+      - Item: Ripper_Cross
      - Item: Agudo_Filo
      - Item: Maxi_Spanner
-      - Item: Rapid_Fire_C_Bow
+      - Item: Rapid_Fire
      - Item: Sharp_Star_Bow
      - Item: Aiming_Bow
      - Item: Falken_Shooter
      - Item: Wind_Gale
      - Item: Golden_Wrench
-      - Item: Combo_Fist
-      - Item: Asura_Bandage
+      - Item: Raging_Dragon_Fist
+      - Item: Dedicated_Bandage
      - Item: Engine_Pilebuncker
      - Item: Coolant_Injection
      - Item: Gene_Rod
      - Item: Lucis_Flail
-      - Item: Bright_Mace
+      - Item: Bright_Pendulum
      - Item: Crimson_Rose_Stick
      - Item: Psychic_Spear_Rod
      - Item: Dust_Grave
-      - Item: Ponitendtia
+      - Item: Penitentia
      - Item: Heart_Whip
      - Item: Scarlet_Ribbon
-      - Item: Boltigin
+      - Item: Boltijin
      - Item: Judgement_Slasher
      - Item: Repent_Slasher
      - Item: Jack_The_Knife
      - Item: Platinum_Dagger
      - Item: Argen_Blanco
      - Item: Harve
-      - Item: Fortrage
+      - Item: Fortridge
      - Item: Black_Circle
      - Item: Antique_Cello
      - Item: Farthezan
@@ -5148,11 +5148,3 @@ Body:
 #      - Item: S_M_Mammoth_Shoes
 #      - Item: S_M_Mammoth_Earring
 #      - Item: S_M_Mammoth_Pendant
-  - Item: SubjectCape_Refine_Cube
-    ResultRefine: 12
-    MaximumRefine: 11
-    CardsAllowed: true
-    TargetItems:
-      - Item: Subject_CapeRange_TH
-      - Item: Subject_CapeMagic_TH
-      - Item: Subject_CapeMelee_TH
--- a/db/re/mercenary_db.yml
+++ b/db/re/mercenary_db.yml
@@ -611,69 +611,3 @@ Body:
    Skills:
      - Name: MER_INVINCIBLEOFF2
        MaxLevel: 1
-  - Id: 3569
-    AegisName: POPE_MD_H_MERC_NORMAL
-    Name: Official Pope
-    Level: 120
-    Hp: 120000
-    Sp: 200
-    Attack: 123
-    Defense: 999
-    MagicDefense: 105
-    Str: 2
-    Vit: 400
-    Int: 10
-    Dex: 110
-    AttackRange: 1
-    SkillRange: 10
-    ChaseRange: 12
-    Size: Medium
-    Race: Demihuman
-    Element: Neutral
-    ElementLevel: 3
-    WalkSpeed: 100
-    AttackDelay: 576
-    AttackMotion: 750
-    DamageMotion: 384
-    Skills:
-      - Name: MER_MAGNIFICAT
-        MaxLevel: 1
-      - Name: MER_DECAGI
-        MaxLevel: 1
-      - Name: MER_TENDER
-        MaxLevel: 1
-      - Name: MER_BLESSING
-        MaxLevel: 3
-  - Id: 3570
-    AegisName: POPE_MD_H_MERC_CASUAL
-    Name: Casual Pope
-    Level: 120
-    Hp: 120000
-    Sp: 200
-    Attack: 123
-    Defense: 999
-    MagicDefense: 105
-    Str: 2
-    Vit: 400
-    Int: 10
-    Dex: 110
-    AttackRange: 1
-    SkillRange: 10
-    ChaseRange: 12
-    Size: Medium
-    Race: Demihuman
-    Element: Neutral
-    ElementLevel: 3
-    WalkSpeed: 100
-    AttackDelay: 576
-    AttackMotion: 750
-    DamageMotion: 384
-    Skills:
-      - Name: MER_MAGNIFICAT
-        MaxLevel: 1
-      - Name: MER_DECAGI
-        MaxLevel: 1
-      - Name: MER_TENDER
-        MaxLevel: 1
-      - Name: MER_BLESSING
-        MaxLevel: 3
--- a/db/re/mob_db.yml
+++ b/db/re/mob_db.yml
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -719,8 +719,8 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,master,alchemist,,,,,,,,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,afterskill,331,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,no,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,no,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
 1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
@@ -12403,274 +12403,6 @@
 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,attack,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,
 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,idle,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,

-// Episode 16.1 - EDDA Half Moon In The Daylight
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,,,,,,,,
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,angry,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3510,POPE_MD_H_GUARD@NPC_COMBOATTACK,angry,171,1,500,700,5000,no,target,always,0,,,,,,9,
-3510,POPE_MD_H_GUARD@SM_BASH,attack,5,3,500,0,5000,no,target,always,0,,,,,,27,
-3510,POPE_MD_H_GUARD@SM_BASH,angry,5,3,500,0,5000,no,target,always,0,,,,,,27,
-3511,POPE_MD_H_BELIEVER_1@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3511,POPE_MD_H_BELIEVER_1@SM_BASH,angry,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3511,POPE_MD_H_BELIEVER_1@SM_MAGNUM,attack,7,3,500,500,5000,no,self,always,0,,,,,,,
-3511,POPE_MD_H_BELIEVER_1@CR_AUTOGUARD,chase,249,2,500,0,300000,yes,self,longrangeattacked,,,,,,,,
-3512,POPE_MD_H_BELIEVER_2@NPC_CURSEATTACK,chase,181,1,1000,800,5000,yes,target,always,0,,,,,,9,
-3512,POPE_MD_H_BELIEVER_2@NPC_WIDECURSE,attack,677,1,500,0,5000,no,self,always,0,,,,,,,
-3512,POPE_MD_H_BELIEVER_2@NPC_CRITICALWOUND,attack,673,2,500,0,5000,yes,target,always,0,,,,,,,
-3513,POPE_MD_H_DOG@NPC_LICK,attack,206,3,500,0,5000,yes,target,always,0,,,,,,6,
-3513,POPE_MD_H_DOG@NPC_AGIUP,attack,350,1,10000,0,100000,yes,self,always,0,,,,,,,
-3513,POPE_MD_H_DOG@NPC_AGIUP,loot,350,1,10000,0,10000,yes,self,always,0,,,,,,,
-3513,POPE_MD_H_DOG@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,0,,,,,,32,
-3513,POPE_MD_H_DOG@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3513,POPE_MD_H_DOG@SM_BASH,chase,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3514,POPE_MD_H_BISHOP@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,no,target,always,0,,,,,,,
-3514,POPE_MD_H_BISHOP@NPC_POWERUP,attack,349,2,10000,0,30000,yes,self,myhpltmaxrate,50,,,,,,,
-3514,POPE_MD_H_BISHOP@NPC_AGIUP,attack,350,2,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3514,POPE_MD_H_BISHOP@KN_TWOHANDQUICKEN,attack,60,2,10000,0,120000,yes,self,myhpltmaxrate,30,,,,,,,
-3514,POPE_MD_H_BISHOP@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,,,,,,,29,
-3514,POPE_MD_H_BISHOP@NPC_CRITICALWOUND,attack,673,2,500,0,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@WZ_ICEWALL,chase,87,3,10000,500,25000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@WZ_ICEWALL,attack,87,3,10000,500,25000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_DRAGONFEAR,attack,659,1,10000,0,30000,yes,self,myhpltmaxrate,70,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_WATERATTACK,attack,184,2,2000,0,5000,no,target,always,0,,,,,,6,
-3516,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,2,2000,0,5000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,2,2000,0,5000,no,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,3,3000,1000,5000,yes,target,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_PULSESTRIKE,attack,661,1,2000,0,30000,yes,self,always,0,,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,chase,196,1,10000,700,60000,no,self,slavele,3,3517,,,,,,
-3516,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,1,10000,700,60000,no,self,onspawn,0,3517,,,,,,
-3517,POPE_MD_H_GUARD@NPC_COMBOATTACK,idle,171,3,500,700,5000,no,target,always,,,,,,,,
-3517,POPE_MD_H_GUARD@NPC_COMBOATTACK,attack,171,3,500,500,5000,no,target,always,0,,,,,,,
-3517,POPE_MD_H_GUARD@NPC_CRITICALSLASH,idle,170,3,1000,700,5000,no,target,always,0,,,,,,,
-3517,POPE_MD_H_GUARD@NPC_CRITICALSLASH,attack,170,3,1000,500,5000,no,target,always,0,,,,,,,
-3517,POPE_MD_H_GUARD@SM_BASH,attack,5,5,500,0,5000,no,target,always,0,,,,,,27,
-3517,POPE_MD_H_GUARD@SM_BASH,angry,5,5,500,0,5000,no,target,always,0,,,,,,27,
-3518,POPE_MD_H_BELIEVER_1@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3518,POPE_MD_H_BELIEVER_1@SM_BASH,angry,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3518,POPE_MD_H_BELIEVER_1@SM_MAGNUM,attack,7,3,500,500,5000,no,self,always,0,,,,,,,
-3518,POPE_MD_H_BELIEVER_1@CR_AUTOGUARD,chase,249,2,500,0,300000,yes,self,longrangeattacked,,,,,,,,
-3519,POPE_MD_H_BELIEVER_2@NPC_CURSEATTACK,chase,181,3,1000,800,5000,yes,target,always,0,,,,,,9,
-3519,POPE_MD_H_BELIEVER_2@NPC_WIDECURSE,attack,677,3,500,0,5000,no,self,always,0,,,,,,,
-3519,POPE_MD_H_BELIEVER_2@NPC_CRITICALWOUND,attack,673,5,500,0,5000,yes,target,always,0,,,,,,,
-3520,POPE_MD_H_DOG@NPC_LICK,attack,206,3,500,0,5000,yes,target,always,0,,,,,,6,
-3520,POPE_MD_H_DOG@NPC_AGIUP,attack,350,1,10000,0,100000,yes,self,always,0,,,,,,,
-3520,POPE_MD_H_DOG@NPC_AGIUP,loot,350,1,10000,0,10000,yes,self,always,0,,,,,,,
-3520,POPE_MD_H_DOG@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,0,,,,,,32,
-3520,POPE_MD_H_DOG@SM_BASH,attack,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3520,POPE_MD_H_DOG@SM_BASH,chase,5,4,500,1000,5000,no,target,always,0,,,,,,27,
-3522,POPE_MD_H_BISHOP@NPC_CRITICALSLASH,attack,170,3,1000,0,5000,no,target,always,0,,,,,,,
-3522,POPE_MD_H_BISHOP@NPC_POWERUP,attack,349,4,10000,0,30000,yes,self,myhpltmaxrate,50,,,,,,,
-3522,POPE_MD_H_BISHOP@NPC_AGIUP,attack,350,4,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3522,POPE_MD_H_BISHOP@KN_TWOHANDQUICKEN,attack,60,3,10000,0,120000,yes,self,myhpltmaxrate,30,,,,,,,
-3522,POPE_MD_H_BISHOP@NPC_HALLUCINATION,attack,207,2,500,500,5000,yes,target,always,,,,,,,29,
-3522,POPE_MD_H_BISHOP@NPC_CRITICALWOUND,attack,673,4,500,0,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@WZ_ICEWALL,chase,87,5,10000,500,25000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@WZ_ICEWALL,attack,87,5,10000,500,25000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_DRAGONFEAR,attack,659,3,10000,0,30000,yes,self,myhpltmaxrate,70,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_WATERATTACK,attack,184,4,2000,0,5000,no,target,always,0,,,,,,6,
-3524,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,4,2000,0,5000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_WATERATTACK,chase,184,4,2000,0,5000,no,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@MG_FROSTDIVER,chase,15,5,3000,1000,5000,yes,target,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_PULSESTRIKE,attack,661,3,2000,0,30000,yes,self,always,0,,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,chase,196,3,10000,700,60000,no,self,slavele,3,3517,,,,,,
-3524,POPE_MD_H_LUWMIN@NPC_SUMMONSLAVE,idle,196,3,10000,700,60000,no,self,onspawn,0,3517,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_WATERATTACK,attack,184,3,1000,500,5000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_RANDOMATTACK,attack,183,2,1000,500,5000,no,target,always,0,,,,,,6,
-3526,POPE_MD_H_KTULLANUX@NPC_WIDEFREEZE,chase,664,1,10000,0,20000,yes,self,myhpltmaxrate,80,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@NPC_WIDEFREEZE,attack,664,1,10000,0,20000,yes,self,myhpltmaxrate,80,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@NPC_ARMORBRAKE,attack,344,3,2000,0,5000,yes,target,always,0,,,,,,29,
-3526,POPE_MD_H_KTULLANUX@MG_FROSTDIVER,idle,15,3,5000,1000,7000,no,randomtarget,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@MG_FROSTDIVER,chase,15,3,5000,1000,7000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@WZ_STORMGUST,chase,89,3,5000,1000,20000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@WZ_STORMGUST,attack,89,3,5000,1000,20000,no,target,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_ICEBREATH,chase,655,2,500,3000,5000,no,target,always,0,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@NPC_ICEBREATH,attack,655,2,500,3000,5000,no,target,always,0,,,,,,32,
-3526,POPE_MD_H_KTULLANUX@WZ_FROSTNOVA,chase,88,3,5000,0,20000,yes,self,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@WZ_FROSTNOVA,attack,88,3,5000,0,20000,yes,self,always,0,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_POWERUP,attack,349,1,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_AGIUP,attack,350,1,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-3526,POPE_MD_H_KTULLANUX@AL_HEAL,idle,28,5,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-3526,POPE_MD_H_KTULLANUX@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,3517,,,,,,
-
-// Weekend Memorial Dungeon
-3637,MD_SKELETON_60@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3637,MD_SKELETON_60@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3637,MD_SKELETON_60@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3637,MD_SKELETON_60@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3637,MD_SKELETON_60@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3637,MD_SKELETON_60@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3638,MD_SKELETON_80@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3638,MD_SKELETON_80@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3638,MD_SKELETON_80@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3638,MD_SKELETON_80@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3638,MD_SKELETON_80@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3638,MD_SKELETON_80@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3639,MD_SKELETON_100@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3639,MD_SKELETON_100@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3639,MD_SKELETON_100@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3639,MD_SKELETON_100@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3639,MD_SKELETON_100@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3639,MD_SKELETON_100@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3640,MD_SKELETON_120@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3640,MD_SKELETON_120@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3640,MD_SKELETON_120@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3640,MD_SKELETON_120@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3640,MD_SKELETON_120@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3640,MD_SKELETON_120@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3641,MD_SKELETON_140@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3641,MD_SKELETON_140@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3641,MD_SKELETON_140@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3641,MD_SKELETON_140@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3641,MD_SKELETON_140@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3641,MD_SKELETON_140@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3642,MD_SKELETON_160@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,1,,,,,,
-3642,MD_SKELETON_160@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,,,,,,,,
-3642,MD_SKELETON_160@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,,,,,,,,
-3642,MD_SKELETON_160@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,,,,,,,,
-3642,MD_SKELETON_160@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-3642,MD_SKELETON_160@NPC_UNDEADATTACK,attack,347,5,2000,0,5000,yes,target,always,,,,,,,,
-3643,MD_FARMILIAR_60@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3643,MD_FARMILIAR_60@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3643,MD_FARMILIAR_60@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3643,MD_FARMILIAR_60@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3644,MD_FARMILIAR_80@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3644,MD_FARMILIAR_80@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3644,MD_FARMILIAR_80@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3644,MD_FARMILIAR_80@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3645,MD_FARMILIAR_100@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3645,MD_FARMILIAR_100@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3645,MD_FARMILIAR_100@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3645,MD_FARMILIAR_100@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3646,MD_FARMILIAR_120@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3646,MD_FARMILIAR_120@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3646,MD_FARMILIAR_120@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3646,MD_FARMILIAR_120@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3647,MD_FARMILIAR_140@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3647,MD_FARMILIAR_140@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3647,MD_FARMILIAR_140@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3647,MD_FARMILIAR_140@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3648,MD_FARMILIAR_160@NPC_BLINDATTACK,angry,177,1,500,0,5000,yes,target,always,0,,,,,,,
-3648,MD_FARMILIAR_160@NPC_DARKNESSATTACK,angry,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3648,MD_FARMILIAR_160@NPC_DARKSTRIKE,attack,340,1,100,0,5000,yes,target,always,,,,,,,29,
-3648,MD_FARMILIAR_160@MO_BODYRELOCATION,chase,264,1,100,500,5000,no,target,always,,,,,,,,
-3649,MD_ZOMBIE_60@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3649,MD_ZOMBIE_60@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3649,MD_ZOMBIE_60@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3649,MD_ZOMBIE_60@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3649,MD_ZOMBIE_60@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3649,MD_ZOMBIE_60@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3649,MD_ZOMBIE_60@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3650,MD_ZOMBIE_80@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3650,MD_ZOMBIE_80@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3650,MD_ZOMBIE_80@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3650,MD_ZOMBIE_80@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3650,MD_ZOMBIE_80@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3650,MD_ZOMBIE_80@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3650,MD_ZOMBIE_80@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3651,MD_ZOMBIE_100@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3651,MD_ZOMBIE_100@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3651,MD_ZOMBIE_100@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3651,MD_ZOMBIE_100@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3651,MD_ZOMBIE_100@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3651,MD_ZOMBIE_100@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3651,MD_ZOMBIE_100@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3652,MD_ZOMBIE_120@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3652,MD_ZOMBIE_120@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3652,MD_ZOMBIE_120@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3652,MD_ZOMBIE_120@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3652,MD_ZOMBIE_120@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3652,MD_ZOMBIE_120@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3652,MD_ZOMBIE_120@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3653,MD_ZOMBIE_140@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3653,MD_ZOMBIE_140@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3653,MD_ZOMBIE_140@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3653,MD_ZOMBIE_140@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3653,MD_ZOMBIE_140@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3653,MD_ZOMBIE_140@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3653,MD_ZOMBIE_140@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-3654,MD_ZOMBIE_160@NPC_BLINDATTACK,attack,177,5,500,0,5000,yes,target,always,0,,,,,,,
-3654,MD_ZOMBIE_160@NPC_COMBOATTACK,attack,171,1,500,700,5000,no,target,always,0,,,,,,6,
-3654,MD_ZOMBIE_160@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-3654,MD_ZOMBIE_160@KN_BRANDISHSPEAR,attack,57,5,500,1000,5000,no,target,always,0,,,,,,,
-3654,MD_ZOMBIE_160@NPC_POISON,attack,176,3,500,800,5000,no,target,always,,,,,,,,
-3654,MD_ZOMBIE_160@NPC_UNDEADATTACK,angry,347,3,2000,0,5000,yes,target,always,,,,,,,,
-3654,MD_ZOMBIE_160@NPC_POISONATTACK,attack,188,3,500,800,5000,no,target,always,,,,,,,,
-
-// Friday Memorial Dungeon
-3658,MD_LICH_LORD_100@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-3658,MD_LICH_LORD_100@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-3658,MD_LICH_LORD_100@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
-3658,MD_LICH_LORD_100@MG_FIREWALL,chase,18,10,2000,500,5000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_HELLJUDGEMENT,chase,662,5,10000,800,10000,no,self,always,0,,,,,,36,
-3658,MD_LICH_LORD_100@NPC_HELLJUDGEMENT,attack,662,5,10000,800,10000,no,self,always,0,,,,,,36,
-3658,MD_LICH_LORD_100@NPC_DARKBLESSING,attack,203,1,500,800,5000,no,target,always,0,,,,,,9,
-3658,MD_LICH_LORD_100@NPC_HELMBRAKE,attack,345,10,2000,500,5000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_SUMMONSLAVE,attack,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3658,MD_LICH_LORD_100@NPC_SUMMONSLAVE,idle,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3658,MD_LICH_LORD_100@WZ_METEOR,attack,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@WZ_METEOR,chase,83,11,5000,500,2000,no,target,skillused,18,,,,,,,
-3658,MD_LICH_LORD_100@WZ_METEOR,chase,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3658,MD_LICH_LORD_100@NPC_CRITICALWOUND,attack,673,3,500,0,5000,yes,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-3659,MD_LICH_LORD_160@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-3659,MD_LICH_LORD_160@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
-3659,MD_LICH_LORD_160@MG_FIREWALL,chase,18,10,2000,500,5000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_HELLJUDGEMENT,chase,662,10,10000,800,10000,no,self,always,0,,,,,,36,
-3659,MD_LICH_LORD_160@NPC_HELLJUDGEMENT,attack,662,10,10000,800,10000,no,self,always,0,,,,,,36,
-3659,MD_LICH_LORD_160@NPC_DARKBLESSING,attack,203,1,500,800,5000,no,target,always,0,,,,,,9,
-3659,MD_LICH_LORD_160@NPC_HELMBRAKE,attack,345,10,2000,500,5000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_SUMMONSLAVE,attack,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3659,MD_LICH_LORD_160@NPC_SUMMONSLAVE,idle,196,3,10000,700,10000,no,self,slavele,3,1605,,,,,,
-3659,MD_LICH_LORD_160@WZ_METEOR,attack,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@WZ_METEOR,chase,83,11,5000,500,2000,no,target,skillused,18,,,,,,,
-3659,MD_LICH_LORD_160@WZ_METEOR,chase,83,11,5000,500,2000,no,target,always,0,,,,,,,
-3659,MD_LICH_LORD_160@NPC_CRITICALWOUND,attack,673,3,500,0,5000,yes,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_MENTALBREAKER,attack,159,1,500,800,5000,no,target,always,0,,,,,,,
-3660,MD_NIGHTMARE_100@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_MENTALBREAKER,attack,159,1,500,800,5000,no,target,always,0,,,,,,,
-3661,MD_NIGHTMARE_160@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,,
-3662,MD_JAKK_100@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3662,MD_JAKK_100@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3662,MD_JAKK_100@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3662,MD_JAKK_100@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
-3662,MD_JAKK_100@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-3662,MD_JAKK_100@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,0x3695,,,,,
-3663,MD_JAKK_160@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3663,MD_JAKK_160@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3663,MD_JAKK_160@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,0,,,,,,29,
-3663,MD_JAKK_160@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
-3663,MD_JAKK_160@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-3663,MD_JAKK_160@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,0x3695,,,,,
-3664,MD_GHOUL_100@NPC_POISON,angry,176,3,500,800,5000,no,target,always,0,,,,,,,
-3664,MD_GHOUL_100@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
-3665,MD_GHOUL_160@NPC_POISON,angry,176,3,500,800,5000,no,target,always,0,,,,,,,
-3665,MD_GHOUL_160@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
-3666,MD_DRAINLIAR_100@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3666,MD_DRAINLIAR_100@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
-3666,MD_DRAINLIAR_100@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-3667,MD_DRAINLIAR_160@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3667,MD_DRAINLIAR_160@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
-3667,MD_DRAINLIAR_160@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-
 // ep16.2
 3621,EP16_2_MM_CUTIE@NPC_AGIUP,attack,350,1,10000,0,20000,yes,self,always,0,,,,,,,
 3621,EP16_2_MM_CUTIE@NPC_MENTALBREAKER,attack,159,2,10000,1000,30000,no,target,always,0,,,,,,,
@@ -12863,30 +12595,6 @@
 3765,Deranged Adventurer@NPC_TALK,idle,682,10,2500,0,35000,yes,self,always,0,,,,,,,53
 3765,Deranged Adventurer@NPC_TALK,idle,682,10,2500,0,30000,yes,self,always,0,,,,,,,54

-// Poring Village instance
-3810,MD_KING_PORING@SM_BASH,attack,5,3,1000,1000,9000,yes,target,always,0,,,,,,,60
-3810,MD_KING_PORING@MG_FIREBALL,attack,17,3,1000,1000,9000,yes,target,always,0,,,,,,,61
-3810,MD_KING_PORING@MC_MAMMONITE,attack,42,3,1000,1000,9000,yes,target,always,0,,,,,,,62
-3810,MD_KING_PORING@AC_DOUBLE,attack,46,3,1000,1000,9000,yes,target,always,0,,,,,,,63
-3810,MD_KING_PORING@TF_POISON,attack,52,3,1000,1000,9000,yes,target,always,0,,,,,,,64
-3810,MD_KING_PORING@AL_DECAGI,attack,30,3,1000,1000,9000,yes,target,always,0,,,,,,,65
-3811,MD_GOLDRING@NPC_STUNATTACK,attack,179,5,3500,1000,10000,no,target,always,0,,,,,,,
-// todo NPC_WIDECONFUSE2
-//3812,MD_AMERING@NPC_WIDECONFUSE2,attack,762,1,3000,2000,20000,yes,target,always,0,,,,,,,
-3812,MD_AMERING@NPC_WIDECONFUSE,attack,667,1,3000,2000,20000,yes,target,always,0,,,,,,,
-3813,MD_DROPS@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,,
-3813,MD_DROPS@NPC_FIREATTACK,attack,186,1,2000,100,5000,yes,target,always,0,,,,,,,
-3813,MD_DROPS@NPC_BLINDATTACK,attack,177,3,2000,1000,15000,yes,target,always,0,,,,,,,67
-3814,MD_POPORING@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,2,
-3814,MD_POPORING@NPC_POISON,attack,176,1,500,1000,15000,no,target,always,0,,,,,,,
-3814,MD_POPORING@NPC_POISONATTACK,attack,188,1,2000,900,15000,yes,target,always,0,,,,,,,68
-3815,MD_PORING@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,2,
-3815,MD_PORING@NPC_SILENCEATTACK,attack,178,2,1500,1000,15000,no,target,always,0,,,,,,,70
-3816,MD_MARIN@NPC_EMOTION,loot,197,1,2000,0,5000,yes,self,always,0,,,,,,2,
-3816,MD_MARIN@NPC_WATERATTACK,attack,184,1,2000,1000,15000,yes,target,always,0,,,,,,,
-3816,MD_MARIN@AL_HEAL,idle,28,1,10000,500,5000,yes,friend,myhpltmaxrate,90,,,,,,2,
-3816,MD_MARIN@AL_HEAL,attack,28,1,10000,500,5000,yes,friend,myhpltmaxrate,90,,,,,,,69
-
 // Episode 17.1 - Illusion (custom) #!todo
 20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
 20340,EL-A17T@NPC_POWERUP,attack,349,5,2000,0,60000,no,self,always,0,,,,,,6,
--- a/db/re/quest_db.yml
+++ b/db/re/quest_db.yml
@@ -1322,66 +1322,24 @@ Body:
  - Id: 3469
    Title: Illusion of Underwater 100 Kills - Standby
    TimeLimit: 4h
-  - Id: 3471
-    Title: Subjugation-Einbroch Field-2
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ein_fild03
  - Id: 3472
    Title: "[Standby] Subjugation-Einbroch Field-2"
    TimeLimit: 4h
-  - Id: 3473
-    Title: Subjugation-Lighthalzen Field-2
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: lhz_fild03
  - Id: 3474
    Title: "[Standby] Subjugation-Lighthalzen Field-2"
    TimeLimit: 4h
-  - Id: 3475
-    Title: Subjugation-Ida Plains-1
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ra_fild12
  - Id: 3476
    Title: "[Standby] Subjugation-Ida Plains-1"
    TimeLimit: 4h
-  - Id: 3477
-    Title: Subjugation-Veins Field-1
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ve_fild07
  - Id: 3478
    Title: "[Standby] Subjugation-Veins Field-1"
    TimeLimit: 4h
-  - Id: 3479
-    Title: "Subjugation-Ida Plains-2"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ra_fild08
  - Id: 3480
    Title: "[Standby] Subjugation-Ida Plains-2"
    TimeLimit: 4h
-  - Id: 3481
-    Title: "Subjugation-Veins Field-2"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ve_fild01
  - Id: 3482
    Title: "[Standby] Subjugation-Veins Field-2"
    TimeLimit: 4h
-  - Id: 3483
-    Title: "Subjugation-Ice Cave 1st Floor"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ice_dun01
  - Id: 3484
    Title: "[Standby] Subjugation-Ice Cave 1st Floor"
    TimeLimit: 4h
@@ -2854,101 +2812,29 @@ Body:
  - Id: 5900
    Title: "[Waiting] Cleaning the first power plant."
    TimeLimit: 4h
-  - Id: 5916
-    Title: "Subjugation-Einbroch Field-1"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ein_fild06
-        MapMobTargets:
-          MOLE: true
-          METALING: true
  - Id: 5917
    Title: "[Standby] Subjugation-Einbroch Field-1"
    TimeLimit: 4h
-  - Id: 5918
-    Title: "Subjugation-Lighthalzen Field-1"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: lhz_fild01
-        MapMobTargets:
-          RAFFLESIA: true
-          STEM_WORM: true
-          METALING: true 
  - Id: 5919
    Title: "[Standby] Subjugation-Lighthalzen Field-1"
    TimeLimit: 4h
-  - Id: 5920
-    Title: "Subjugation - Geffen field"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: gef_fild06
-        MapMobTargets:
-          PETIT: true
-          MANTIS: true
-          SIDE_WINDER: true
  - Id: 5921
    Title: "[Standby] Subjugation-Geffen Field"
    TimeLimit: 4h
-  - Id: 5922
-    Title: "Subjugation - Turtle Island"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: tur_dun01
-        MapMobTargets:
-          SPRING_RABBIT: true
-          DRAGON_TAIL: true
-          PERMETER: true
-          PEST: true
  - Id: 5923
    Title: "[Standby] Subjugation-Turtle Island"
    TimeLimit: 4h
-  - Id: 5924
-    Title: "Subjugation - In front of Thanatos Tower"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: hu_fild01
-        MapMobTargets:
-          NOVUS: true
-          NOVUS_: true
-          GEOGRAPHER: true
-          DRAGON_EGG: true
  - Id: 5925
    Title: "[Standby] Subjugation-Thanatos Tower"
    TimeLimit: 4h
-  - Id: 5926
-    Title: "Subjugation - Starlight Coral Zone"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: mal_dun01
-        MapMobTargets:
-          RED_ERUMA: true
-          SIORAVA: true
-          C5_RED_ERUMA: true
  - Id: 5927
    Title: "[Standby] Subjugation-Coral Zone"
    TimeLimit: 4h
-  - Id: 5928
-    Title: "Subjugation - Turtle Island Dungeon"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: tur_dun02
-        MapMobTargets:
-          SOLIDER: true
-          PERMETER: true
-          PEST: true
-          FREEZER: true
  - Id: 5929
    Title: "[Standby] Subjugation-Turtle Island Dungeon"
    TimeLimit: 4h
  - Id: 5930
-    Title: "Subjugation - Yanggeochon"
+    Title: Subjugation-Yanggeochon
    Targets:
      - Id: 1
        Count: 80
@@ -5704,99 +5590,24 @@ Body:
  - Id: 8661
    Title: "[Standby] Subjugation-Audumra Chowon-3"
    TimeLimit: 4h
-  - Id: 8662
-    Title: "Subjugation-Audumla Meadow-3"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ra_fild01
-        MapMobTargets:
-          ANOPHELES: true
-          DESERT_WOLF: true
-          ROWEEN: true
  - Id: 8664
    Title: "[Standby] Subjugation-Ida Plains-3"
    TimeLimit: 4h
-  - Id: 8665
-    Title: "Subjugation-Ida Plains-3"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ra_fild03
-        MapMobTargets:
-          ANACONDAQ: true
-          ANOPHELES: true
-          HILL_WIND_1: true
-          ROWEEN: true
  - Id: 8667
    Title: "[Standby] Subjugation-Audumra Chowon-1"
    TimeLimit: 4h
-  - Id: 8668
-    Title: "Subjugation-Audumla Meadow-1"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ra_fild04
-        MapMobTargets:
-          ANOPHELES: true
-          ROWEEN: true
-          HILL_WIND_1: true
-          DESERT_WOLF: true
  - Id: 8670
    Title: "[Standby] Subjugation-Audumra Chowon-2"
    TimeLimit: 4h
-  - Id: 8671
-    Title: "Subjugation-Audumla Meadow-2"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ra_fild05
-        MapMobTargets:
-          ANOPHELES: true
-          KOBOLD_1: true
-          KOBOLD_2: true
-          KOBOLD_3: true
-  - Id: 8672
-    Title: "Subjugation - Porto Luna"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ra_fild06
-        MapMobTargets:
-          ANOPHELES: true
-          KOBOLD_1: true
-          KOBOLD_2: true
-          KOBOLD_3: true
-          KOBOLD_ARCHER: true
  - Id: 8673
    Title: "[Standby] Subjugation-Portu Luna"
    TimeLimit: 4h
  - Id: 8676
    Title: "[Standby] Subjugation-Veins Field-3"
    TimeLimit: 4h
-  - Id: 8677
-    Title: "Subjugation-Veins Field-3"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ve_fild04
-        MapMobTargets:
-          GALION: true
-          DROSERA: true
-          MUSCIPULAR: true
  - Id: 8679
    Title: "[Standby] Subjugation-Veins Field-4"
    TimeLimit: 4h
-  - Id: 8680
-    Title: "Subjugation-Veins Field-4"
-    Targets:
-      - Id: 1
-        Count: 80
-        Location: ve_fild03
-        MapMobTargets:
-          MAGMARING: true
-          DROSERA: true
-          MUSCIPULAR: true
  - Id: 9000
    Title: Job Change to Knight
  - Id: 9001
@@ -8336,15 +8147,12 @@ Body:
    TimeLimit: 4h
  - Id: 12376
    Title: First transaction
-  - Id: 12377
-    Title: Attack on Weekend Dungeon
-    TimeLimit: +1h
  - Id: 12378
-    Title: Time to Rest
-    TimeLimit: 4h
+    Title: Fatigue recovery required
+    TimeLimit: 0h
  - Id: 12379
-    Title: Time to Rest
-    TimeLimit: 4h
+    Title: Fatigue recovery required
+    TimeLimit: 0h
  - Id: 12381
    Title: New Continent's Food Supplier
  - Id: 12382
@@ -8440,13 +8248,9 @@ Body:
  - Id: 12411
    Title: Come Back Tomorrow
    TimeLimit: 4h
-  - Id: 12416
-    Title: Contract with Emily
  - Id: 12417
    Title: Recovering Fatigue
    TimeLimit: 4h
-  - Id: 12418
-    Title: First visit to Poring Village
  - Id: 12420
    Title: Recovering Fatigue
    TimeLimit: 4h
@@ -9522,19 +9326,9 @@ Body:
    Title: To Granma
  - Id: 14584
    Title: Back to Recorder
-  - Id: 14585
-    Title: Investigating the Cause
-    Targets:
-      - Mob: POPE_MD_E_LUWMIN
-        Count: 1
  - Id: 14586
    Title: Time to Rest
    TimeLimit: 4h
-  - Id: 14587
-    Title: Investigating the Cause
-    Targets:
-      - Mob: POPE_MD_H_KTULLANUX
-        Count: 1
  - Id: 14588
    Title: The Competition
    Targets:
@@ -9790,17 +9584,6 @@ Body:
  - Id: 14687
    Title: Mysterious Device
    TimeLimit: +1h
-  - Id: 14688
-    Title: My name is Shorty
-  - Id: 14689
-    Title: Help Shorty
-  - Id: 14693
-    Title: To Payon
-  - Id: 14694
-    Title: To Prontera Field
-  - Id: 14695
-    Title: Cheer up, Sunsammi!
-    TimeLimit: +30mn
  - Id: 14699
    Title: Event once a day
    TimeLimit: 4h
@@ -10446,8 +10229,6 @@ Body:
    TimeLimit: 4h
  - Id: 16546
    Title: Farm Worker
-  - Id: 16547
-    Title: Juno Monster Society
  - Id: 17000
    Title: Meet with Father Bamph
  - Id: 17001
--- a/db/re/refine.yml
+++ b/db/re/refine.yml
@@ -30,8 +30,6 @@
 #           Bonus                       Refinement bonus. (Default: 0)
 #           RandomBonus                 Extra refinement bonus of 0~RandomBonus stacked on Bonus. (Default: 0)
 #           BlacksmithBlessingAmount    Amount of Blacksmith Blessing required. (Default: 0)
-#           BroadcastSuccess            Broadcast to the whole server when a refine attempt at this level succeeds. (Default: false)
-#           BroadcastFailure            Broadcast to the whole server when a refine attempt at this level fails. (Default: false)
 #           Chances:                    Success chance based on cost type. (Default: null)
 #             - Type                    Refinement cost type based on ore used.
 #               Rate                    Chance of success out of 0~10000. (Default: 0)
@@ -43,7 +41,7 @@

 Header:
  Type: REFINE_DB
-  Version: 2
+  Version: 1

 Body:
  - Group: Armor
@@ -254,8 +252,6 @@ Body:
          - Level: 13
            Bonus: 2800
            BlacksmithBlessingAmount: 16
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -271,8 +267,6 @@ Body:
          - Level: 14
            Bonus: 3200
            BlacksmithBlessingAmount: 22
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -287,8 +281,6 @@ Body:
                DowngradeAmount: 1
          - Level: 15
            Bonus: 3600
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -303,8 +295,6 @@ Body:
                DowngradeAmount: 1
          - Level: 16
            Bonus: 4000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -319,8 +309,6 @@ Body:
                DowngradeAmount: 1
          - Level: 17
            Bonus: 4500
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -335,8 +323,6 @@ Body:
                DowngradeAmount: 1
          - Level: 18
            Bonus: 5000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -351,8 +337,6 @@ Body:
                DowngradeAmount: 1
          - Level: 19
            Bonus: 5500
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
@@ -367,8 +351,6 @@ Body:
                DowngradeAmount: 1
          - Level: 20
            Bonus: 6000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
@@ -470,7 +452,6 @@ Body:
                DowngradeAmount: 1
          - Level: 8
            Bonus: 1440
-            BlacksmithBlessingAmount: 1
            Chances:
              - Type: Normal
                Rate: 2000
@@ -484,7 +465,6 @@ Body:
                DowngradeAmount: 1
          - Level: 9
            Bonus: 1800
-            BlacksmithBlessingAmount: 2
            Chances:
              - Type: Normal
                Rate: 2000
@@ -498,7 +478,6 @@ Body:
                DowngradeAmount: 1
          - Level: 10
            Bonus: 2160
-            BlacksmithBlessingAmount: 4
            Chances:
              - Type: Normal
                Rate: 900
@@ -512,7 +491,6 @@ Body:
                DowngradeAmount: 1
          - Level: 11
            Bonus: 2520
-            BlacksmithBlessingAmount: 7
            Chances:
              - Type: Normal
                Rate: 800
@@ -526,7 +504,6 @@ Body:
                BreakingRate: 10000
          - Level: 12
            Bonus: 2880
-            BlacksmithBlessingAmount: 11
            Chances:
              - Type: Normal
                Rate: 800
@@ -540,9 +517,6 @@ Body:
                BreakingRate: 10000
          - Level: 13
            Bonus: 3360
-            BlacksmithBlessingAmount: 16
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -556,9 +530,6 @@ Body:
                BreakingRate: 10000
          - Level: 14
            Bonus: 3840
-            BlacksmithBlessingAmount: 22
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -572,8 +543,6 @@ Body:
                BreakingRate: 10000
          - Level: 15
            Bonus: 4320
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -587,8 +556,6 @@ Body:
                BreakingRate: 10000
          - Level: 16
            Bonus: 4800
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -602,8 +569,6 @@ Body:
                BreakingRate: 10000
          - Level: 17
            Bonus: 5400
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -617,8 +582,6 @@ Body:
                BreakingRate: 10000
          - Level: 18
            Bonus: 6000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -632,8 +595,6 @@ Body:
                BreakingRate: 10000
          - Level: 19
            Bonus: 6600
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
@@ -647,8 +608,6 @@ Body:
                BreakingRate: 10000
          - Level: 20
            Bonus: 7200
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
@@ -865,8 +824,6 @@ Body:
            Bonus: 2600
            RandomBonus: 1800
            BlacksmithBlessingAmount: 16
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -883,8 +840,6 @@ Body:
            Bonus: 2800
            RandomBonus: 2100
            BlacksmithBlessingAmount: 22
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -900,8 +855,6 @@ Body:
          - Level: 15
            Bonus: 3000
            RandomBonus: 2400
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -917,8 +870,6 @@ Body:
          - Level: 16
            Bonus: 4800
            RandomBonus: 2700
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -934,8 +885,6 @@ Body:
          - Level: 17
            Bonus: 5100
            RandomBonus: 3000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -951,8 +900,6 @@ Body:
          - Level: 18
            Bonus: 5400
            RandomBonus: 3300
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -968,8 +915,6 @@ Body:
          - Level: 19
            Bonus: 5700
            RandomBonus: 3600
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1500
@@ -985,8 +930,6 @@ Body:
          - Level: 20
            Bonus: 6000
            RandomBonus: 3900
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1500
@@ -1206,8 +1149,6 @@ Body:
            Bonus: 3900
            RandomBonus: 3500
            BlacksmithBlessingAmount: 16
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -1224,8 +1165,6 @@ Body:
            Bonus: 4200
            RandomBonus: 4000
            BlacksmithBlessingAmount: 22
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -1241,8 +1180,6 @@ Body:
          - Level: 15
            Bonus: 4500
            RandomBonus: 4500
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -1258,8 +1195,6 @@ Body:
          - Level: 16
            Bonus: 8000
            RandomBonus: 5000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -1275,8 +1210,6 @@ Body:
          - Level: 17
            Bonus: 8500
            RandomBonus: 5500
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -1292,8 +1225,6 @@ Body:
          - Level: 18
            Bonus: 9000
            RandomBonus: 6000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -1309,8 +1240,6 @@ Body:
          - Level: 19
            Bonus: 9500
            RandomBonus: 6500
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1500
@@ -1326,8 +1255,6 @@ Body:
          - Level: 20
            Bonus: 10000
            RandomBonus: 7000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1500
@@ -1551,8 +1478,6 @@ Body:
            Bonus: 6500
            RandomBonus: 6400
            BlacksmithBlessingAmount: 16
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -1569,8 +1494,6 @@ Body:
            Bonus: 7000
            RandomBonus: 7200
            BlacksmithBlessingAmount: 22
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -1586,8 +1509,6 @@ Body:
          - Level: 15
            Bonus: 7500
            RandomBonus: 8000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1800
@@ -1603,8 +1524,6 @@ Body:
          - Level: 16
            Bonus: 11200
            RandomBonus: 8800
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -1620,8 +1539,6 @@ Body:
          - Level: 17
            Bonus: 11900
            RandomBonus: 9600
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -1637,8 +1554,6 @@ Body:
          - Level: 18
            Bonus: 12600
            RandomBonus: 10400
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1700
@@ -1654,8 +1569,6 @@ Body:
          - Level: 19
            Bonus: 13300
            RandomBonus: 11200
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1500
@@ -1671,8 +1584,6 @@ Body:
          - Level: 20
            Bonus: 14000
            RandomBonus: 12000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 1500
@@ -1900,8 +1811,6 @@ Body:
            Bonus: 9100
            RandomBonus: 12600
            BlacksmithBlessingAmount: 16
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -1918,8 +1827,6 @@ Body:
            Bonus: 9800
            RandomBonus: 14000
            BlacksmithBlessingAmount: 22
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -1935,8 +1842,6 @@ Body:
          - Level: 15
            Bonus: 10500
            RandomBonus: 15400
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -1952,8 +1857,6 @@ Body:
          - Level: 16
            Bonus: 16000
            RandomBonus: 16800
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -1969,8 +1872,6 @@ Body:
          - Level: 17
            Bonus: 17000
            RandomBonus: 18200
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -1986,8 +1887,6 @@ Body:
          - Level: 18
            Bonus: 18000
            RandomBonus: 19600
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -2003,8 +1902,6 @@ Body:
          - Level: 19
            Bonus: 19000
            RandomBonus: 21000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
@@ -2020,8 +1917,6 @@ Body:
          - Level: 20
            Bonus: 20000
            RandomBonus: 22400
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
@@ -2123,7 +2018,6 @@ Body:
                DowngradeAmount: 1
          - Level: 8
            Bonus: 6400
-            BlacksmithBlessingAmount: 1
            Chances:
              - Type: Normal
                Rate: 2000
@@ -2137,7 +2031,6 @@ Body:
                DowngradeAmount: 1
          - Level: 9
            Bonus: 7200
-            BlacksmithBlessingAmount: 2
            Chances:
              - Type: Normal
                Rate: 2000
@@ -2151,7 +2044,6 @@ Body:
                DowngradeAmount: 1
          - Level: 10
            Bonus: 8000
-            BlacksmithBlessingAmount: 4
            Chances:
              - Type: Normal
                Rate: 900
@@ -2165,7 +2057,6 @@ Body:
                DowngradeAmount: 1
          - Level: 11
            Bonus: 8800
-            BlacksmithBlessingAmount: 7
            Chances:
              - Type: Normal
                Rate: 800
@@ -2179,7 +2070,6 @@ Body:
                BreakingRate: 10000
          - Level: 12
            Bonus: 9600
-            BlacksmithBlessingAmount: 11
            Chances:
              - Type: Normal
                Rate: 800
@@ -2193,9 +2083,6 @@ Body:
                BreakingRate: 10000
          - Level: 13
            Bonus: 10400
-            BlacksmithBlessingAmount: 16
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -2209,9 +2096,6 @@ Body:
                BreakingRate: 10000
          - Level: 14
            Bonus: 11200
-            BlacksmithBlessingAmount: 22
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 800
@@ -2225,8 +2109,6 @@ Body:
                BreakingRate: 10000
          - Level: 15
            Bonus: 12000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -2240,8 +2122,6 @@ Body:
                BreakingRate: 10000
          - Level: 16
            Bonus: 12800
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -2255,8 +2135,6 @@ Body:
                BreakingRate: 10000
          - Level: 17
            Bonus: 13600
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -2270,8 +2148,6 @@ Body:
                BreakingRate: 10000
          - Level: 18
            Bonus: 14400
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 700
@@ -2285,8 +2161,6 @@ Body:
                BreakingRate: 10000
          - Level: 19
            Bonus: 15200
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
@@ -2300,8 +2174,6 @@ Body:
                BreakingRate: 10000
          - Level: 20
            Bonus: 16000
-            BroadcastSuccess: true
-            BroadcastFailure: true
            Chances:
              - Type: Normal
                Rate: 500
--- a/db/re/reputation.yml
+++ b/db/re/reputation.yml
@@ -54,8 +54,3 @@ Body:
    Variable: RepPointsIsgard
    Minimum: -3000
    Maximum: 3000
-
-Footer:
-  Imports:
-  - Path: db/re/generator/reputation.yml
-    Generator: true
--- a/db/re/reputation_group.yml
+++ b/db/re/reputation_group.yml
@@ -1,38 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Group Database
-###########################################################################
-#
-# Reputation Group Settings
-#
-###########################################################################
-# - Id                                  Client side group index.
-#   ScriptName                          Unused? Used for "ID" in client
-#   Name                                Visible name in window
-#   ReputeList                          List of Reputations
-###########################################################################
-
-Header:
-  Type: REPUTATION_GROUP_DB
-  Version: 1
-
-Footer:
-  Imports:
-    - Path: db/re/generator/reputation_group.yml
-      Generator: true
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
@@ -9635,13 +9635,15 @@ Body:
    Name: NPC_WEAPONBRAKER
    Description: Break weapon
    MaxLevel: 10
-    TargetType: Self
+    Type: Weapon
+    TargetType: Attack
    Flags:
      IsNpc: true
+    Range: 9
    Hit: Single
    HitCount: 1
-    Duration: 30000
-    Status: WeaponBreaker
+    Element: Weapon
+    Status: BrokenWeapon
  - Id: 344
    Name: NPC_ARMORBRAKE
    Description: Break armor
@@ -17022,7 +17024,7 @@ Body:
    Range: 11
    Hit: Multi_Hit
    HitCount: -20
-    Duration2: 18000
+    Duration1: 18000
    SplashArea: 9
    Knockback: 2
    CastCancel: true
@@ -17164,12 +17166,11 @@ Body:
    Name: NPC_MAXPAIN_ATK
    Description: Max Pain Attack
    MaxLevel: 10
-    Type: Weapon
+    Type: Misc
    TargetType: Attack
    DamageFlags:
      Splash: true
      IgnoreElement: true
-      IgnoreDefense: true
      IgnoreFlee: true
      IgnoreDefCard: true
    Flags:
@@ -44820,7 +44821,7 @@ Body:
      IsGuild: true
    CastCancel: true
    Duration1: 300000
-    Cooldown: 900000
+    Cooldown: 60000
    FixedCastTime: 1000
  - Id: 10018
    Name: GD_CHARGESHOUT_BEATING
@@ -44832,7 +44833,7 @@ Body:
    Flags:
      IsGuild: true
    CastCancel: true
-    Cooldown: 900000
+    Cooldown: 60000
    FixedCastTime: 1000
  - Id: 10019
    Name: GD_EMERGENCY_MOVE
@@ -44846,5 +44847,5 @@ Body:
      IsGuild: true
    SplashArea: 15
    Duration1: 10000
-    Cooldown: 60000
+    Cooldown: 600000
    Status: Emergency_Move
--- a/db/re/status.yml
+++ b/db/re/status.yml
--- a/db/readme.md
+++ b/db/readme.md
@@ -18,7 +18,6 @@ We want to add our own custom achievement that can be given to a player via an N

 #### /db/import/achievement_db.yml

-```yml
    - Id: 280000
      Group: None
      Name: Emperio
@@ -31,7 +30,6 @@ We want to add our own custom achievement that can be given to a player via an N
      Reward:
        TitleId: 1036
      Score: 50
-```


 ### Instances
@@ -40,30 +38,27 @@ We want to add our own customized Housing Instance.

 #### /db/import/instance_db.yml

-```yml
-    - Id: 35
-      Name: Home
-      IdleTimeOut: 900
-      Enter:
-        Map: 1@home
-        X: 24
-        Y: 6
-      AdditionalMaps:
-        - Map: 2@home
-        - Map: 3@home
-```
+	- Id: 35
+	    Name: Home
+        IdleTimeOut: 900
+        Enter:
+          Map: 1@home
+          X: 24
+          Y: 6
+        AdditionalMaps:
+          - Map: 2@home
+          - Map: 3@home


 ### Mob Alias
 ---
-We want to make Porings look like Baphomet.
+We want to give a custom mob a Novice player sprite.

-#### /db/import/mob_avail.yml
+#### /db/import/mob_avail.txt

-```yml
-    - Mob: PORING
-      Sprite: BAPHOMET
-```
+    // Structure of Database:
+    // MobID,SpriteID{,Equipment}
+    3850,0


 ### Custom Maps
@@ -72,71 +67,45 @@ We want to add our own custom maps. For this we need to add our map names to `im

 #### /db/import/map_index.txt

-```
    1@home	1250
    2@home
    3@home
    ev_has
    shops
    prt_pvp
-```


 ### Item Trade Restrictions
 ---
 We want to ensure that specific items cannot be traded, sold, dropped, placed in storage, etc.

-#### /db/import/item_db.yml
+#### /db/import/item_trade.txt

-```yml
-    - Id: 34000 # Old Green Box
-      Trade:
-        NoDrop: true
-        NoTrade: true
-        TradePartner: true
-        NoSell: true
-        NoCart: true
-        NoStorage: true
-        NoGuildStorage: true
-        NoMail: true
-        NoAuction: true
-    - Id: 34001 # House Keys
-      Trade:
-        NoDrop: true
-        NoTrade: true
-        TradePartner: true
-        NoSell: true
-        NoCart: true
-        NoStorage: true
-        NoGuildStorage: true
-        NoMail: true
-        NoAuction: true
-    - Id: 34002 # Reputation Journal
-      Trade:
-        NoDrop: true
-        NoTrade: true
-        TradePartner: true
-        NoSell: true
-        NoCart: true
-        NoStorage: true
-        NoGuildStorage: true
-        NoMail: true
-        NoAuction: true
-```
+    // Legend for 'TradeMask' field (bitmask):
+    // 1   - item can't be dropped
+    // 2   - item can't be traded (nor vended)
+    // 4   - wedded partner can override restriction 2
+    // 8   - item can't be sold to npcs
+    // 16  - item can't be placed in the cart
+    // 32  - item can't be placed in the storage
+    // 64  - item can't be placed in the guild storage
+    // 128 - item can't be attached to mail
+    // 256 - item can't be auctioned
+    // Full outright value = 511
+    34000,511,100	// Old Green Box
+    34001,511,100	// House Keys
+    34002,511,100	// Reputation Journal


 ### Custom Quests
 ---
 We want to add our own custom quests to the quest_db.

-#### /db/import/quest_db.yml
+#### /db/import/quest_db.txt

-```yml
-    - Id: 89001
-      Title: "Reputation Quest"
-    - Id: 89002
-      Title: "Reputation Quest"
-```
+    // Quest ID,Time Limit,Target1,Val1,Target2,Val2,Target3,Val3,MobID1,NameID1,Rate1,MobID2,NameID2,Rate2,MobID3,NameID3,Rate3,Quest Title
+    89001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Reputation Quest"
+    89002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Reputation Quest"



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

 Header:
  Type: REFINE_DB
-  Version: 2
+  Version: 1

 Footer:
  Imports:
--- a/db/reputation_group.yml
+++ b/db/reputation_group.yml
@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Reputation Group Database
-###########################################################################
-#
-# Reputation Group Settings
-#
-###########################################################################
-# - Id                                  Client side group index.
-#   ScriptName                          Unused? Used for "ID" in client
-#   Name                                Visible name in window
-#   ReputeList                          List of Reputations
-###########################################################################
-
-Header:
-  Type: REPUTATION_GROUP_DB
-  Version: 1
-
-Footer:
-  Imports:
-    - Path: db/re/reputation_group.yml
-      Mode: Renewal
-    - Path: db/import/reputation_group.yml
--- a/db/status.yml
+++ b/db/status.yml
@@ -35,14 +35,13 @@
 #   MinRate                   Minimum rate after status change reduction (10000 = 100%). (Default: 0)
 #   MinDuration               Minimum duration in milliseconds after status change reduction. (Default: 1)
 #   Fail:                     List of Status Changes that causes the status to fail to activate. (Optional)
-#   EndOnStart:               List of Status Changes that will end when the status activates. (Optional)
+#   End:                      List of Status Changes that will end when the status activates. (Optional)
 #   EndReturn:                List of Status Changes that will end when the status activates and won't give its effect. (Optional)
-#   EndOnEnd:                 List of Status Changes that will end when the status becomes inactive. (Optional)
 ###########################################################################

 Header:
  Type: STATUS_DB
-  Version: 3
+  Version: 2

 Footer:
  Imports:
--- a/doc/captcha_db.txt
+++ b/doc/captcha_db.txt
@@ -1,44 +0,0 @@
-//===== rAthena Documentation ================================
-//= Captcha Database Structure
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Last Updated: ========================================
-//= 20220920
-//===== Description: =========================================
-//= Explanation of the captcha_db.yml file and structure.
-//============================================================
-
---------------------------------------
-
-Id: Unique ID.
-
---------------------------------------
-
-Filename: Name of the BMP image file (with location).
-		  The path of the file can be different for each captcha image, but it's best practice to keep them in the same directory.
-
-Example:
-    Filename: db/import/captcha/rathena.bmp
-
---------------------------------------
-
-Answer: Correct answer for the captcha (case-sensitive).
-
---------------------------------------
-
-Bonus: NPC script that is ran when a captcha is successfully answered. Accepts all forms of script constants, variables, as well as the
-	   unique player variable @captcha_retries. This variable can be used within the Bonus script to get the remaining retries a player
-	   has. Coupled with the script command 'getbattleflag()' this could be used to assign different bonuses based on success rate.
-
-Example:
-    # Give level 10 Blessing for 20 minutes with no failures, else give for 30 seconds.
-    Bonus: >
-      if (@captcha_retries == getbattleflag("macro_detection_retry")) {
-        # Player solved it on first try
-        specialeffect2 EF_BLESSING;
-        sc_start SC_BLESSING,1200000,10;
-      } else {
-        # Player needed more than one try
-        specialeffect2 EF_BLESSING;
-        sc_start SC_BLESSING,30000,10;
-      }
--- a/doc/map_server_generator.md
+++ b/doc/map_server_generator.md
@@ -2,6 +2,8 @@

 This is a tool to generate files that are hard to manually create.

+Only navigation files can be generated at this time.
+
 ## How to run
 ### Linux
 Run `make tools`.
@@ -19,8 +21,6 @@ On Windows, prefix with `/`

 option | feature
 ---|---
-`generate-navi` | create navigation files
-`generate-reputation` | create reputation bson files
-`generate-itemmoveinfo` | create itemmoveinfov5.txt
+generate-navi | create navigation files


--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@@ -212,15 +212,3 @@ Allow to bypass the maximum stat parameter (at conf/player.conf) to
 maximum value 32,767.

 ---------------------------------------
-
-*macro_detect
-
-Allows player to use the client command /macro_detector.
-
---------------------------------------
-
-*macro_register
-
-Allows player to use the client commands /maco_register (used to add new captcha) and /macro_preview (used to preview captcha by ID).
-
---------------------------------------
--- a/doc/sample/npc_test_duplicate.txt
+++ b/doc/sample/npc_test_duplicate.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20211112
+//= 20180831
 //===== Description: ========================================= 
 //= An example of how duplicate NPCs are handled:
 //=  NPC variables are shared between all duplicates.
@@ -18,88 +18,14 @@ prontera,150,175,4	script	Duplicate Test Script	909,{
 	close;

 OnInit:
-	getmapxy(.map$, .x, .y, BL_NPC);
+	getmapxy(.map$, .x, .y, 1);
 	end;

 OnTouch:
-	getmapxy(.map$, .x, .y, BL_NPC);
+	getmapxy(.map$, .x, .y, 1);
 	emotion ET_SCISSOR;
 	end;
 }

 prontera,155,175,4	duplicate(Duplicate Test Script)	Duplicate Test2	909,2,2
 prontera,160,175,4	duplicate(Duplicate Test Script)	Duplicate Test3	909,3,3
-
-//duplicate command script
-prontera,150,168,4	script	Duplicate Command Test	909,{
-	mes "Would you like to create a new NPC?";
-	.@original_npc$ = "original_npc_unique_name";
-
-	mes "Input Map Name";
-	mes "recommended 'prontera'";
-	input .@map$;
-	clear;
-	mes "Input x";
-	mes "recommended '155'";
-	input .@x,0;
-	clear;
-	mes "Input y";
-	mes "recommended '168'";
-	input .@y,0;
-	clear;
-
-	switch( .@s = select( "Provide no info:With name:With name and look:With name, look and dir:cancel" ) ){
-		case 1:
-			.@new_npc$ = duplicate( .@original_npc$, .@map$, .@x, .@y );
-			break;
-		case 2:
-			mes "Input Duplicate NPC Name";
-			input .@name$;
-			clear;
-			.@new_npc$ = duplicate( .@original_npc$, .@map$, .@x, .@y, .@name$ );
-			break;
-		case 3:
-			mes "Input Duplicate NPC Name";
-			input .@name$;
-			clear;
-			mes "Input look";
-			mes "recommended '445'";
-			input .@look,0;
-			.@new_npc$ = duplicate( .@original_npc$, .@map$, .@x, .@y, .@name$, .@look );
-			break;
-		case 4:
-			mes "Input Duplicate NPC Name";
-			input .@name$;
-			clear;
-			mes "Input look";
-			mes "recommended '445'";
-			input .@look,0;
-			clear;
-			mes "Input dir";
-			mes "between " + DIR_NORTH + " and " + DIR_NORTHEAST;
-			input .@dir,DIR_NORTH,DIR_NORTHEAST;
-			.@new_npc$ = duplicate( .@original_npc$, .@map$, .@x, .@y, .@name$, .@look, .@dir );
-			break;
-		default:
-			mes "Ok, see you next time!";
-			close;
-	}
-
-	if( getnpcid( 0, .@new_npc$ ) == 0 ){
-		mes "Something went wrong!";
-		mes "The new NPC could not be found!";
-		close;
-	}
-	
-	clear;
-	mes "The new NPC is now at " + .@map$ + "," + .@x + "," + .@y;
-	end;
-}
-
-prontera,150,165,0	script	test npc::original_npc_unique_name	444,{
-	getmapxy(.@map$, .@x, .@y, BL_NPC);
-	mes "Hi.";
-	mes "My Unique Name is: " + strnpcinfo(3);
-	mes "My coords are "+ .@map$ +", "+ .@x +"/" +.@y ;
-	close;
-}
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -431,9 +431,8 @@ hexadecimal value. Notice that 0x10 is equal to 16. Also notice that if you try
 to 'mes 0x10' it will print '16'.

 Number values can't exceed the limits of an integer variable: Any number
-greater than INT64_MAX (9223372036854775807) or smaller than INT64_MIN
-(-9223372036854775808) will be capped to those values and will cause a warning
-to be reported.
+greater than INT_MAX (2147483647) or smaller than INT_MIN (-2147483648) will
+be capped to those values and will cause a warning to be reported.

 Variables
 ---------
@@ -1229,12 +1228,6 @@ Don't expect things to run smoothly if you don't make your scripts 'end'.

 ---------------------------------------

-*close3;
-
-The command is similar to 'close' but the cutin (if any) is cleared after closing.
-
---------------------------------------
-
 *end;

 This command will stop the execution for this particular script. The two
@@ -3589,32 +3582,6 @@ This command does not count skills which are set as flag 4 (permament granted) (

 ---------------------------------------

-*getrandmobid(<type>{,<flag>{,<level>}})
-
-This command returns a random monster ID from the random monster group.
-With <flag> you can apply certain restrictions which monsters of the group can be returned.
-Returns 0 if one of the parameters is invalid or no monster could be found with the given parameters.
-
-Valid <type> are:
-	MOBG_BRANCH_OF_DEAD_TREE
-	MOBG_PORING_BOX
-	MOBG_BLOODY_DEAD_BRANCH
-	MOBG_RED_POUCH_OF_SURPRISE
-	MOBG_CLASSCHANGE
-	MOBG_TAEKWON_MISSION
-	
-Valid <flag> are:
-	RMF_NONE            = 0x00 - Apply no flags
-	RMF_DB_RATE         = 0x01 - Apply the summon success chance found in the list (otherwise get any monster from the db)
-	RMF_CHECK_MOB_LV    = 0x02 - Apply a monster level check
-	RMF_MOB_NOT_BOSS    = 0x04 - Selected monster should not be a Boss type (default)
-	                           - (except those from MOBG_BLOODY_DEAD_BRANCH)
-	RMF_MOB_NOT_SPAWN   = 0x08 - Selected monster must have normal spawn
-	RMF_MOB_NOT_PLANT   = 0x10 - Selected monster should not be a Plant type
-	RMF_ALL             = 0xFF - Apply all flags
-	
---------------------------------------
-
 *getmonsterinfo(<mob ID>,<type>)
 *getmonsterinfo(<mob name>,<type>)

@@ -6310,28 +6277,6 @@ it just removes non-permanent script.

 ---------------------------------------

-*plagiarizeskill <skill_id>,<level>;
-
-Enable the player to plagiarize specific skills that are copyable.
-Return 1 on success, 0 otherwise.
-
-Note:
- - Plagiarism only able to copy skill while SC_PRESERVE is not active and skill is copyable by Plagiarism.
- - Reproduce can copy skill if SC__REPRODUCE is active and the skill is copyable by Reproduce.
-
---------------------------------------
-
-*plagiarizeskillreset <flag>;
-
-Remove a plagiarized skill from the player.
-Return 1 on success, 0 otherwise.
-
-Flag constants:
-	1 - Use for Plagiarism Skill
-	2 - Use for Reproduce Skill
-
---------------------------------------
-
 *skill <skill id>,<level>{,<flag>};
 *skill "<skill name>",<level>{,<flag>};
 *addtoskill <skill id>,<level>{,<flag>};
@@ -6895,29 +6840,6 @@ This command will fully unload a NPC object and all of it's duplicates.

 ---------------------------------------
 
-*duplicate "<NPC name>","<map>",<x>,<y>{,"<Duplicate NPC name>"{,<sprite>{,<dir>{,<xs>{,<xy>}}}}};
-
-This command will duplicate the NPC with the given <NPC name> on <map> at <x>/<y>.
-If <Duplicate NPC name>, <sprite>, <dir>, <xs> or <ys> is not provided the value of the original NPC will be used.
-The Unique name of the new duplicated NPC is returned on success. An empty string is returned on failure.
-
-NOTE:
-	Duplicates will always have the same NPC variables as the original NPC.
-	Editing a NPC variable in a duplicate or the original NPC will change it for the others.
-
---------------------------------------
- 
-*duplicate_dynamic("<NPC name>"{,<character ID>});
-
-This command will duplicate the NPC with the given <NPC name> near the attached player or the player with the given <character ID>.
-The Unique name of the new duplicated NPC is returned on success. An empty string is returned on failure.
-
-NOTE:
-	Duplicates will always have the same NPC variables as the original NPC.
-	Editing a NPC variable in a duplicate or the original NPC will change it for the others.
-
---------------------------------------
-
 *cloakonnpc {"<NPC object name>"{,<character ID>}};
 *cloakoffnpc {"<NPC object name>"{,<character ID>}};

@@ -8329,13 +8251,6 @@ Gets the reputation points for reputation group <type> for the attached player o

 ---------------------------------------

-*add_reputation_points(<type>,<points>{,<char id>})
-
-Adds the reputation points via <points> for reputation group <type> for the attached player or the given character ID.
-<type> is the client side index as stored in the Id field of the reputation.yml database files.
-
---------------------------------------
-
 *item_reform({<item id>{,<char id>}})
 *item_reform({<"item name">{,<char id>}})

@@ -8612,7 +8527,6 @@ Parameters (indexes) for monsters are:
 	UMOB_IGNORE_CELL_STACK_LIMIT
 	UMOB_RES
 	UMOB_MRES
-	UMOB_DAMAGETAKEN

 -----

@@ -9040,18 +8954,6 @@ Example:

 ---------------------------------------

-*cap_value(<number>, <min>, <max>)
-
-Returns the number but capped between <min> and <max>.
-
-Example:
-	// capped between 0 ~ 100
-	.@value = cap_value(10, 0, 100);   // .@value will be equal to 10
-	.@value = cap_value(1000, 0, 100); // .@value will be equal to 100
-	.@value = cap_value(-10, 3, 100);  // .@value will be equal to 3
-
---------------------------------------
-
 *round(<number>,<precision>);
 *ceil(<number>,<precision>);
 *floor(<number>,<precision>);
@@ -10282,7 +10184,7 @@ server and the egg will disappear when anyone tries to hatch it.
 This function will return pet information for the pet the invoking character
 currently has active. Valid types are:

- PETINFO_ID - Pet unique ID
+ PETINFO_ID - Pet ID
 PETINFO_CLASS - Pet class number as per 'db/(pre-)re/pet_db.yml' - will tell you what kind of a pet it is.
 PETINFO_NAME - Pet name. Will return "null" if there's no pet.
 PETINFO_INTIMATE - Pet friendly level (intimacy score). 1000 is full loyalty.
@@ -10964,29 +10866,6 @@ 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>});
-
-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 the normal client
-tags for displaying item links in mes dialogues, if the client supports them. 
-
-
-Examples:
-
-	npctalk "Knife [3] : "+itemlink(1201)+"";
-	npctalk "+16 Knife [3] : "+itemlink(1201,16)+"";
-	npctalk "+13 BXB Bapho+VR+EA2+EA1 : "+itemlink(18110,13,4147,4407,4833,4832)+"";
-	setarray .@opt_ids[0],RDMOPT_VAR_ATKPERCENT,RDMOPT_VAR_ATKPERCENT,RDMOPT_VAR_ATTMPOWER,0,0;
-	setarray .@opt_values[0],3,5,20,0,0;
-	setarray .@opt_params[0],0,0,0,0,0;
-	npctalk "+13 BXB Bapho+VR+EA2+EA1 + 3 Options : "+itemlink(18110,13,4147,4407,4833,4832,0,.@opt_ids,.@opt_values,.@opt_params)+"";
-
-
-RandomIDArray, RandomValueArray, and RandomParamArray only works if the
-client (and server) supports the Item Random Options feature (PACKETVER >= 20150225).
-
 ========================
 |14.- Channel commands.|
 ========================
@@ -11235,30 +11114,3 @@ See 'achievementinfo' for valid <type> values.
 - Excludes ACHIEVEINFO_LEVEL and ACHIEVEINFO_SCORE.

 ---------------------------------------
-
-*addfame(<amount>,{,<char id>})
-
-Increases the fame of the attached player or the supplied <char id> by the <amount> given.
-Note: Only works with classes that use the ranking system.
-
---------------------------------------
-
-*getfame({<char id>})
-
-Gets the fame points of the attached player or the supplied <char id>.
-Note: Only works with classes that use the ranking system.
-
---------------------------------------
-
-*getfamerank({<char id>})
-
-Returns fame rank (start from 1 to MAX_FAME_LIST), else 0.
-Note: Only works with classes that use the ranking system.
-
---------------------------------------
-
-*isdead({<account id>})
-
-Returns true if the player is dead else false.
-
---------------------------------------
--- a/doc/status.txt
+++ b/doc/status.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20221013
+//= 20220421
 //===== Description: =========================================
 //= Explanation of the status.yml file and structure.
 //============================================================
@@ -266,7 +266,7 @@ Fail: List of status that causes the status to fail to activate.

 ---------------------------------------

-EndOnStart: List of status that will end if the status activates.
+End: List of status that will end if the status activates.

 ---------------------------------------

@@ -276,10 +276,6 @@ EndReturn: List of status that will end if the status activates and it won't giv

 ---------------------------------------

-EndOnEnd: List of status that will end when the status becomes inactive.
-
---------------------------------------
-
 Notes:

 By default, statuses are 'Buff' (those that aren't explicitely given the 'Debuff' flag) which are removable by 'map_quit' in combination with 'battle_config.debuff_on_logout'.
--- a/doc/status_change.txt
+++ b/doc/status_change.txt
@@ -2827,8 +2827,3 @@ SC_PACKING_ENVELOPE9	(EFST_PACKING_ENVELOPE9)
 SC_PACKING_ENVELOPE10	(EFST_PACKING_ENVELOPE10)
 	desc: Increases HIT
 	val1: + HIT
-
-SC_WEAPONBREAKER
-	desc: Bonus given when using NPC_WEAPONBRAKER skill
-	val1: Skill level
-	val2: val1 * 2 weapon break chance
--- a/doc/yaml/db/item_group_db.yml
+++ b/doc/yaml/db/item_group_db.yml
@@ -6,7 +6,6 @@
 #
 ###########################################################################
 # - Group                      Group name of the item.
-#   AnnounceBoxItemId          Item to be shown in special item obtaining broadcast packet in the box name field. Uses the last item the player used if not defined. (Default: 0)
 #   SubGroups:
 #     - SubGroup:              SubGroup number associated with the list of item. See doc/item_group.txt for more information.
 #       List:                  List of item(s) for the SubGroup.
--- a/function.sh
+++ b/function.sh
@@ -4,7 +4,7 @@ M_SRV=map-server
 W_SRV=web-server
 INST_PATH=/opt
 PKG=rathena
-PKG_PATH="${INST_PATH}/${PKG}"
+PKG_PATH=$INST_PATH/$PKG

 check_files() {
    for i in ${L_SRV} ${C_SRV} ${M_SRV} ${W_SRV}
@@ -17,11 +17,11 @@ check_files() {
 }

 check_inst_right(){
-    if [ ! -w "${INST_PATH}" ]; then echo "You must have sudo right to use this install (write/read permission in ${INST_PATH}/ )" && exit; fi
+    if [ ! -w $INST_PATH ]; then echo "You must have sudo right to use this install (write/read permission in /opt/ )" && exit; fi
 }

 inst_launch_workaround(){
-  if [ -d "${PKG_PATH}" ]; then
-    if [ "$(pwd)" != "${PKG_PATH}" ]; then cd "${PKG_PATH}"; fi
+  if [ -d $PKG_PATH ]; then
+    if [ $(pwd) != $PKG_PATH ]; then cd $PKG_PATH; fi
  fi
 }
--- a/install.sh
+++ b/install.sh
@@ -6,12 +6,12 @@

 # NOTE: This requires GNU getopt.  On Mac OS X and FreeBSD, you have to install this
 # separately; see below.
-TEMP=$(getopt -o d: -l destdir: -- "$@")
+TEMP=`getopt -o d: -l destdir: -- "$@"`
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 # Note the quotes around `$TEMP': they are essential!
-eval set -- "${TEMP}"
+eval set -- "$TEMP"

-eval set -- "${TEMP}"
+eval set -- "$TEMP"
 while [ $# -gt 0 ]
 do
    case "$1" in
@@ -20,26 +20,26 @@ do
    shift
 done

-echo "destdir = ${PKG_PATH} "
+echo "destdir = $PKG_PATH "
 check_inst_right
 check_files
-mkdir -p "${PKG_PATH}/bin/"
-mkdir -p "${PKG_PATH}/etc/${PKG}/"
-mkdir -p "${PKG_PATH}/usr/${PKG}/"
-mkdir -p "${PKG_PATH}/var/${PKG}/log"
+mkdir -p $PKG_PATH/bin/
+mkdir -p $PKG_PATH/etc/$PKG/
+mkdir -p $PKG_PATH/usr/$PKG/
+mkdir -p $PKG_PATH/var/$PKG/log

 #we copy all file into opt/ dir and treat dir like normal unix arborescence
-cp -r db/ "${PKG_PATH}/var/${PKG}/db"
-if [ -d log ]; then cp -r log/* "${PKG_PATH}/var/${PKG}/log/"; fi
-cp -r conf/ "${PKG_PATH}/etc/${PKG}/conf"
-cp -r npc/ "${PKG_PATH}/usr/${PKG}/npc"
-cp athena-start "${PKG_PATH}/"
-cp *-server* "${PKG_PATH}/bin/"
+cp -r db/ $PKG_PATH/var/$PKG/db
+if [ -d log ]; then cp -r log/* $PKG_PATH/var/$PKG/log/; fi
+cp -r conf/ $PKG_PATH/etc/$PKG/conf
+cp -r npc/ $PKG_PATH/usr/$PKG/npc
+cp athena-start $PKG_PATH/
+cp *-server* $PKG_PATH/bin/

-ln -fs "${PKG_PATH}/var/${PKG}/db/" "${PKG_PATH}/db"
-ln -fs "${PKG_PATH}/var/${PKG}/log/" "${PKG_PATH}/log"
-ln -fs "${PKG_PATH}/etc/${PKG}/conf/" "${PKG_PATH}/conf"
-ln -fs "${PKG_PATH}/usr/${PKG}/npc/" "${PKG_PATH}/npc"
-ln -fs "${PKG_PATH}/athena-start" "/usr/bin/${PKG}"
-for f in $(ls "${PKG_PATH}/bin/") ; do ln -fs "${PKG_PATH}/bin/${f}" "${PKG_PATH}/${f}"; done
-echo "Installation is done. You can now control the server with '${PKG} start'"
+ln -fs $PKG_PATH/var/$PKG/db/ $PKG_PATH/db
+ln -fs $PKG_PATH/var/$PKG/log/ $PKG_PATH/log
+ln -fs $PKG_PATH/etc/$PKG/conf/ $PKG_PATH/conf
+ln -fs $PKG_PATH/usr/$PKG/npc/ $PKG_PATH/npc
+ln -fs $PKG_PATH/athena-start /usr/bin/$PKG
+for f in $(ls $PKG_PATH/bin/) ; do ln -fs $PKG_PATH/bin/$f $PKG_PATH/$f; done
+echo "Installation is done. You can now control the server with '$PKG start'"
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -743,7 +743,7 @@ einbech,46,107,6	script	Shena#ein::EinMonsters	846,{
 	}
 }

-einbech,48,107,4	duplicate(EinMonsters)	Luda#ein	850
+einbech,48,107,4	duplicate(EinMonsters)	Luda#ein	850,{

 einbech,148,242,5	script	Jung#ein	855,{
 	mes "[Jung]";
--- a/npc/custom/etc/autopot.txt
+++ b/npc/custom/etc/autopot.txt
@@ -11,7 +11,6 @@ OnInit:
 	.HP_Option = true;	//Allow HP option
 	.SP_Option = true;	//Allow SP option
 	.MinDelay = 100;	//Minimum Delay Allowed in milliseconds (Default and Recommended: 100) [lower values will increase server strain]
-	.MaxDelay = 1000;	//Maximum Delay Allowed in milliseconds (Default and Recommended: 1000)
 	setarray .blackList[0],0;	//Array of black listed item ID

 	if(!.HP_Option && !.SP_Option){
@@ -25,11 +24,11 @@ end;
 L_Help:
 	dispbottom "Available commands:";
 	if(.HP_Option && .SP_Option){
-		dispbottom "    @autopot <hp|sp> <item id> {<min hp|sp % [1..100]> {<delay [" + .MinDelay + ".."+.MaxDelay+"]>}}";
+		dispbottom "    @autopot <hp|sp> <item id> {<min hp|sp % [1..100]> {<delay [" + .MinDelay + "..1000]>}}";
 		dispbottom "    @autopot <hp|sp> list";
 		dispbottom "    @autopot <hp|sp> <on|off>";
 	}else{
-		dispbottom "    @autopot <" + (.HP_Option?"hp":"sp") + "> <item id> {<min " + (.HP_Option?"hp":"sp") + " % [1..100]> {<delay [" + .MinDelay + ".."+.MaxDelay+"]>}}";
+		dispbottom "    @autopot <" + (.HP_Option?"hp":"sp") + "> <item id> {<min " + (.HP_Option?"hp":"sp") + " % [1..100]> {<delay [" + .MinDelay + "..1000]>}}";
 		dispbottom "    @autopot <" + (.HP_Option?"hp":"sp") + "> list";
 		dispbottom "    @autopot <" + (.HP_Option?"hp":"sp") + "> <on|off>";
 	}
@@ -57,11 +56,10 @@ L_Start:
 	.@type$  = getarg(0,0);
 	.@potion = getarg(1,0);
 	setd "@autopot_" + .@type$ + "_Min",getarg(2,0);
-	@autopot_delay = getarg(3,.MinDelay);
+	@autopot_delay = getarg(3,0);

 	if (getd("@autopot_" + .@type$ + "_Min")   < 1  || getd("@autopot_" + .@type$ + "_Min") > 100)  setd "@autopot_" + .@type$ + "_Min",90;
-	if (@autopot_delay < .MinDelay) @autopot_delay = .MinDelay;
-	if (@autopot_delay > .MaxDelay) @autopot_delay = .MaxDelay;
+	if (@autopot_delay < 50 || @autopot_delay > 1000) @autopot_delay = .MinDelay;
 	if (getiteminfo(.@potion, ITEMINFO_TYPE) != IT_HEALING) {
 		dispbottom getitemname(.@potion) + " is not a healing item.";
 		end;
@@ -76,7 +74,7 @@ L_Start:
 	}
 	setd "@autopot_" + .@type$ + "_ID",.@potion;
 	setd "@autopot_" + .@type$ + "_Active",true;
-	addtimer @autopot_delay,strnpcinfo(3) + "::OnStart";
+	addtimer .@delay,strnpcinfo(3) + "::OnStart";
 	message strcharinfo(0), "Auto-Potion " + strtoupper(.@type$) + " enabled.";
 	callsub L_Info;
 	return;
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -53,7 +53,7 @@ L_SORRY:
  
 M_FIN:
 	mes "[Exorcist Master Fahae]";
-	mes "The path of fully vanquishing evil is far, help me in the way of God.";
+	mes "The path of fully venquishing evil is far, help me in the way of God.";
 	close;
  
 M_HERB:
--- a/npc/mapflag/nodynamicnpc.txt
+++ b/npc/mapflag/nodynamicnpc.txt
@@ -1,27 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: No dynamic NPC map setting.
-//===== Description: ========================================= 
-//= Blocks the use of dynamic NPCs on a map.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Lemongrass]
-//============================================================
-
-// Endless Tower
-1@tower	mapflag	nodynamicnpc
-2@tower	mapflag	nodynamicnpc
-3@tower	mapflag	nodynamicnpc
-4@tower	mapflag	nodynamicnpc
-5@tower	mapflag	nodynamicnpc
-6@tower	mapflag	nodynamicnpc
-
-// Sealed Catacomb
-1@cata	mapflag	nodynamicnpc
-2@cata	mapflag	nodynamicnpc
-
-// Orc's Memory
-1@orcs	mapflag	nodynamicnpc
-2@orcs	mapflag	nodynamicnpc
-
-// Nidhoggur's Nest
-1@nyd	mapflag	nodynamicnpc
-2@nyd	mapflag	nodynamicnpc
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -171,6 +171,7 @@ lhz_in02,286,95,4	shop	Beginner's Merchant#lhz	62,5112:-1,2416:-1,2113:-1,2512:-
 lhz_in02,271,99,5	shop	Armor Dealer#lhz	851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
 lhz_in02,276,99,4	shop	Weapon Dealer#lhz	851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
 lhz_in02,273,35,4	shop	Wand Dealer#lhz	854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1
+lhz_in02,105,21,3	shop	Jeweler#lhz	91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
 lhz_in02,17,220,5	shop	Vegetable Gardener#lhz2	91,515:-1,516:-1,535:-1
 lhz_in02,21,220,5	shop	Fruit Gardener#lhz2	102,512:-1,513:-1
 lhz_in02,32,219,5	shop	Butcher#lhz	54,517:-1
@@ -204,6 +205,8 @@ xmas_in,174,98,2	shop	Weapon Dealer#xmas	49,1201:-1,1204:-1,1207:-1,1210:-1,1213
 in_moc_16,22,20,7	shop	Sepulchral Merchant#moc	880,1771:-1
 moc_ruins,93,53,2	shop	Item Collector#moc1	85,911:-1,528:-1,919:-1,925:-1
 moc_ruins,81,113,0	shop	Item Collector#moc2	85,911:-1,528:-1,919:-1,925:-1
+moc_ruins,110,105,2	shop	Jeweler#moc1	102,721:-1,723:-1,726:-1,728:-1,729:-1
+moc_ruins,52,85,6	shop	Jeweler#moc2	99,730:-1,2613:-1
 moc_ruins,113,126,4	shop	Trader#moc1	99,747:-1
 moc_ruins,131,138,0	shop	Trader#moc2	93,748:-1
 moc_ruins,71,139,5	shop	Trader#moc3	93,2612:-1
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -752,6 +752,15 @@ function	script	F_GetPlatinumSkills	{
 	return;
 }

+//////////////////////////////////////////////////////////////////////////////////
+// Shortcut : close button and clear cutin.
+//////////////////////////////////////////////////////////////////////////////////
+function	script	close3	{
+	close2;
+	cutin "",255;
+	end;
+}
+
 //////////////////////////////////////////////////////////////////////////////////
 // Return true if the card is a charm (enchant card), false otherwise.
 //////////////////////////////////////////////////////////////////////////////////
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -40,19 +40,12 @@ izlude,164,138,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,
 izlude_in,115,61,0	shop	Tool Dealer#iz	47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
 izlude_in,121,64,3	shop	Trading Merchant#iz	900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1

-//=======================================================
-// Lighthalzen
-//=======================================================
-lhz_in02,105,21,3	shop	Jeweler#lhz	91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
-
 //=======================================================
 // Morocc - Post Ep. 12.1
 //=======================================================
 moc_ruins,118,170,4	shop	Pet Groomer#moc	125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
 moc_ruins,91,128,4	shop	Tool Dealer#moc1	93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
 moc_ruins,114,63,6	shop	Tool Dealer#moc2	99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1
-moc_ruins,110,105,2	shop	Jeweler#moc1	102,721:-1,723:-1,726:-1,728:-1,729:-1
-moc_ruins,52,85,6	shop	Jeweler#moc2	99,730:-1,2613:-1

 //=======================================================
 // Ninja Shops
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -3095,10 +3095,10 @@

 // Luina 1
 //============================================================
-aldeg_cas01,51,102,5	duplicate(GuildRelay1)	Buzz#01	754
-aldeg_cas01,75,39,3	duplicate(GuildRelay2)	Lenya#01	754
-aldeg_cas01,200,175,3	duplicate(GuildRelay3)	Gealuve#01	754
-aldeg_cas01,59,224,3	duplicate(GuildRelay4)	Pariz#01	754
+aldeg_cas01,51,102,5	duplicate(GuildRelay1)	Buzz#01	754,{
+aldeg_cas01,75,39,3	duplicate(GuildRelay2)	Lenya#01	754,{
+aldeg_cas01,200,175,3	duplicate(GuildRelay3)	Gealuve#01	754,{
+aldeg_cas01,59,224,3	duplicate(GuildRelay4)	Pariz#01	754,{

 // Luina 2
 //============================================================
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -2274,24 +2274,8 @@ que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	403
 	end;
 	
 OnTouch_:
-	.@i = charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1);
-	if(compare(strnpcinfo(4),"aru")) {
-		switch(.@i) {
-			case 1:	warp "arug_cas01",157,369;	break;
-			case 2:	warp "arug_cas02",349,355;	break;
-			case 3:	warp "arug_cas03",321,153;	break;
-			case 4:	warp "arug_cas04",321,153;	break;
-			case 5:	warp "arug_cas05",321,153;	break;
-		}
-	} else {
-		switch(.@i) {
-			case 1:	warp "schg_cas01",369,306;	break;
-			case 2:	warp "schg_cas02",177,355;	break;
-			case 3:	warp "schg_cas03",81,95;	break;
-			case 4:	warp "schg_cas04",369,306;	break;
-			case 5:	warp "schg_cas05",369,306;	break;
-		}
-	}
+	set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
+	warp .@t$,157,369;
 	end;
 	
 OnInit:
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -7481,7 +7481,7 @@ OnTouch:
 	mes "Oh, please don't disturb";
 	mes "it's sleep. It hates that.";
 	mes "By the way, doesn't it";
-	mes "remind you of something?";
+	mes "remind you of somehing?";
 	mes "I mean, like maybe";
 	mes "a vagrant or a hobo?";
 	close;
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -366,7 +366,7 @@ dewata,95,203,6	script	Travel Guide#dew	536,{
 	emotion ET_PROFUSELY_SWEAT;
 	next;
 	mes "[Guide]";
-	mes "Even in modern times Borobudur temple is a pilgrimage site for many monks worshiping the Buddha. It's also a major tourist attraction, as you can imagine.";
+	mes "Even in modern times Borobudur temple is a pilgimage site for many monks worshiping the Buddha. It's also a major tourist attraction, as you can imagine.";
 	emotion ET_PROFUSELY_SWEAT;
 	next;
 	mes "[Guide]";
--- a/npc/re/custom/lasagna/lasagna_npcs.txt
+++ b/npc/re/custom/lasagna/lasagna_npcs.txt
@@ -5507,7 +5507,7 @@ conch_in,26,64,5	script	Captain Gamberi#dorcon0	4_DR_GAMBERI,{
 			mes "Then when would we be able to set off?";
 			next;
 			mes "[Stello]";
-			mes "Maybe tomorrow.";
+			mes "Maybe tommorrow.";
 			next;
 			mes "[" + strcharinfo(0) + "]";
 			mes "Isn't the fog covering the area near the shore? wouldn't it be a problem to just sail off?";
--- a/npc/re/instances/EclageInterior.txt
+++ b/npc/re/instances/EclageInterior.txt
@@ -266,7 +266,7 @@ OnMyMobDead:
 	mes "[Avant]";
 	mes "Did something happen to you?";
 	mes "There was a subtle and magical echo to it.";
-	mes "Immediately after that, you were thrown here.";
+	mes "Immidiately after that, you were thrown here.";
 	next;
 	if (select("It's all because of you!:Shenime said...") == 1) {
 		mes "[Avant]";
--- a/npc/re/instances/PoringVillage.txt
+++ b/npc/re/instances/PoringVillage.txt
@@ -1,686 +0,0 @@
-//===== rAthena Script =======================================
-//= Poring Village
-//===== Description: =========================================
-//= [Walkthrough Conversion]
-//= Poring Village instance
-//===== Changelogs: ==========================================
-//= 1.0 First version. [Capuche]
-//============================================================
-
-// Enchant
-prt_fild05,174,238,7	script	Veggie Enchanter#0	4_F_02,2,2,{
-	mes "[Veggie Enchanter]";
-	mes "50 Jellopies and 20,000 zeny are all you need to get special effect on your green onion or carrot!";
-	next;
-	mes "[Veggie Enchanter]";
-	mes "Enchant and reset have ^ff000030% of failure.^000000 Invest in your veggie and luck!";
-	next;
-	switch( select( "How much do I need to enchant?", "Enchant to Poring Village Veggie", "Reset Poring Village Veggie" ) ) {
-	case 1:
-		mes "[Veggie Enchanter]";
-		mes "As I heard, you can get Poring Village Green Onion or Carrot if you go west a bit more from here.";
-		next;
-		mes "[Veggie Enchanter]";
-		mes "I do enchant to the fresh vegetable.";
-		next;
-		mes "[Veggie Enchanter]";
-		mes "Enchant or Reset requires 20,000z and 50 Jellopy! It's not bad, is it?";
-		next;
-		mes "[Veggie Enchanter]";
-		mes "Well... As you know, it's a vegetable any way. So sometimes it can be broken.";
-		close;
-	case 2:
-		.@equip_id = getequipid(EQI_HEAD_LOW);
-
-		switch( .@equip_id ) {
-		case -1:
-			mes "[Veggie Enchanter]";
-			mes "Please put on the equipment you'd like to enchant first.";
-			close;
-		case 19238:	// PoringTownOnion
-		case 19239:	// PoringTownCarrot
-			break;
-		default:
-			mes "[Veggie Enchanter]";
-			mes "This is not a vegetable!?";
-			close;
-		}
-		if (getequipcardid(EQI_HEAD_LOW,3) > 0) {
-			mes "[Veggie Enchanter]";
-			mes "This vegetable cannot be enchanted anymore.";
-			close;
-		}
-		if (countitem(909) < 50 || Zeny < 20000) {
-			mes "[Veggie Enchanter]";
-			mes "This enchant requires 50 Jellopy and 20,000z..... But... you don't have them.";
-			close;
-		}
-		delequip EQI_HEAD_LOW;
-		delitem 909,50;	// Jellopy
-		Zeny -= 20000;
-
-		if (rand(100) < 70) {
-			.@r = rand(5356);
-			if (.@r < 160) .@card = 4795;	// HP100
-			else if (.@r < 200) .@card = 4796;	// HP200
-			else if (.@r < 1000) .@card = 4928;	// SP10
-			else if (.@r < 1400) .@card = 4870;	// SP25
-			else if (.@r < 1480) .@card = 4800;	// SP50
-			else if (.@r < 1880) .@card = 4700;	// Strength1
-			else if (.@r < 2280) .@card = 4730;	// Agility1
-			else if (.@r < 3410) .@card = 4740;	// Vitality1
-			else if (.@r < 3810) .@card = 4710;	// Inteligence1
-			else if (.@r < 4210) .@card = 4720;	// Dexterity1
-			else if (.@r < 5340) .@card = 4750;	// Luck1
-			else if (.@r < 5348) .@card = 4992;	// HPdrain1
-			else if (.@r < 5356) .@card = 4993;	// SPdrain1
-
-			getitem2 .@equip_id,1,1,0,0,0,0,0,.@card;
-			mes "[Veggie Enchanter]";
-			mes "Tada! Enchant is done! Check your vegetable.";
-			specialeffect2 EF_REPAIRWEAPON;
-			close;
-		}
-		mes "[Veggie Enchanter]";
-		mes "It must have been a rotten vegetable. It's a shame that I can't stand this level of power...";
-		specialeffect2 EF_LORD;
-		close;
-	case 3:
-		.@equip_id = getequipid(EQI_HEAD_LOW);
-
-		switch( .@equip_id ) {
-		case -1:
-			mes "[Veggie Enchanter]";
-			mes "Please put on the equipment you'd like to enchant first.";
-			close;
-		case 19238:	// PoringTownOnion
-		case 19239:	// PoringTownCarrot
-			break;
-		default:
-			mes "[Veggie Enchanter]";
-			mes "This is not a vegetable!?";
-			close;
-		}
-		if (getequipcardid(EQI_HEAD_LOW,3) == 0) {
-			mes "[Veggie Enchanter]";
-			mes "This is a vegetable that has never been fortified...";
-			close;
-		}
-		if (countitem(909) < 50 || Zeny < 20000) {
-			mes "[Veggie Enchanter]";
-			mes "This enchant requires 50 Jellopy and 20,000z..... But... you don't have them.";
-			close;
-		}
-		delequip EQI_HEAD_LOW;
-		delitem 909,50;	// Jellopy
-		Zeny -= 20000;
-
-		if (rand(100) < 70) {
-			getitem .@equip_id,1;
-			mes "[Veggie Enchanter]";
-			mes "The item is complete! Check it out.";
-			specialeffect2 EF_REPAIRWEAPON;
-			close;
-		}
-		mes "[Veggie Enchanter]";
-		mes "It must have been a rotten vegetable. It's a shame that I can't stand this level of power...";
-		specialeffect2 EF_LORD;
-		close;
-	}
-	end;
-
-OnTouch:
-	npctalk "Veggie Enchanter: Make your green onion or carrot stronger!", "", bc_self;
-	end;
-}
-
-
-// Instance
-prt_fild05,145,235,5	script	Emily#0	4_GEFFEN_03,4,4,{
-	if (BaseLevel < 30) {
-		mes "[Emily]";
-		mes "Wow~ You look like a novice. I do want to adventure with you someday when you grow up!";
-		close;
-	}
-	if (BaseLevel > 60) {
-		mes "[Emily]";
-		mes "Oh, now you are stronger than me. How did you grow so fast?";
-		next;
-		mes "[Emily]";
-		mes "I should find another adventurer who is similar with my level. It's been nice knowing you.";
-		close;
-	}
-	if (isbegin_quest(12416) == 0) {
-		mes "[Emily]";
-		mes "My name is Emily. I was waiting for someone who will go on adventures with me!";
-		next;
-		select("Who said I will adventure with you?");
-		mes "[Emily]";
-		mes "Well, come one. Don't be stern. Listen, you can decide after listening to my story. Of course, I can give you a proper reward.";
-		next;
-		if (select( "Proper Reward?", "I'm not interested." ) == 2) {
-			mes "[Emily]";
-			mes "How square! It's much better to be together!";
-			close;
-		}
-		mes "[Emily]";
-		mes "Yes! Proper Reward.";
-		next;
-		mes "[Emily]";
-		mes "It seems this Poring Village can be defeated by beginners just like us. It's just a wild guess though...";
-		next;
-		mes "[Emily]";
-		mes "Well, actually I cannot give you the reward officially through adventurer association. But we can separate the income after hunting.";
-		next;
-		select("But 50-50 sounds fair to me.");
-		mes "[Emily]";
-		mes "No way. 70-30. And I'm 70 of course.";
-		next;
-		select("It's gotta be 50-50 or it's no good");
-		mes "[Emily]";
-		mes "How about 60-40!!";
-		next;
-		select("50-50 ...");
-		mes "[Emily]";
-		mes "This drives me crazy. OK, 50-50. Let's go with this.";
-		setquest 12416;	// Contract with Emily
-		completequest 12416;
-		close;
-	}
-	switch( checkquest(12417,PLAYTIME) ) {
-	case -1:
-		break;
-	case 0:
-	case 1:
-		mes "^ff0000Any processing of monsters such as monster taming inside the dungeon will not be considered a normal progress. Please note that.^000000";
-		next;
-		mes "^ff0000In beginner mode, the player transforms into a monster. Please note that the existing transformation effect disappears when entering and proceeding.^000000";
-		next;
-		mes "[Emily]";
-		mes "So, are you ready?";
-		next;
-		mes "[Emily]";
-		mes "You look very tired.";
-		next;
-		mes "[Emily]";
-		mes "Why don't you come back after a while? Take a break for now.";
-		close;
-	case 2:
-		mes "^ff0000Any processing of monsters such as monster taming inside the dungeon will not be considered a normal progress. Please note that.^000000";
-		next;
-		mes "^ff0000In beginner mode, the player transforms into a monster. Please note that the existing transformation effect disappears when entering and proceeding. ^000000";
-		next;
-		mes "[Emily]";
-		mes "So, are you ready?";
-		next;
-		mes "^0000ffAll Traces of the Poring Village quest were removed. Now, talk to Emily again to enter^000000";
-		erasequest 12417;
-		close;
-	}
-	mes "^ff0000Any processing of monsters such as monster taming inside the dungeon will not be considered a normal progress. Please note that.^000000";
-	next;
-	mes "^ff0000In beginner mode, the player transforms into a monster. Please note that the existing transformation effect disappears when entering and proceeding.^000000";
-	next;
-	mes "[Emily]";
-	mes "So, are you ready?";
-	if (isbegin_quest(12418) == 0)
-		setquest 12418;	// First Visit to Poring Village
-	next;
-	if (getcharid(1) < 1) {
-		mes "[Emily]";
-		mes "Hmm you should create a party first to start this grand adventure.";
-		close;
-	}
-	.@md_name$ = "Poring Village";
-
-	if (is_party_leader())
-		.@menu$[0] = "Create the entrance";
-	if (instance_live_info(ILI_NAME, instance_id(IM_PARTY)) == .@md_name$)
-		.@menu$[1] = "Enter the dungeon";
-
-	switch( select( .@menu$[0], .@menu$[1], "Cancel" ) ) {
-	case 1:
-		mes "[Emily]";
-		mes "Now I'm looking for the entrance, please talk to me again after it's totally open.";
-		instance_create(.@md_name$);
-		close;
-	case 2:
-		switch( instance_enter(.@md_name$) ) {
-		case IE_OTHER:
-			mes "An unknown error occurred.";
-			close;
-		case IE_NOINSTANCE:
-			mes "^ff0000Time's crack is not created yet.^000000";
-			close;
-		case IE_NOMEMBER:
-			end;
-		case IE_OK:
-			mapannounce "prt_fild05", "Party member " + strcharinfo(0) + " of the party " + getpartyname(getcharid(0)) + " enters " + .@md_name$ + ".", bc_map,0xFF9900;
-			setquest 12417;	// Overcoming fatigue
-			// warp "1@begi",100,22;
-			end;
-		}
-		end;
-	case 3:
-		end;
-	}
-	end;
-
-OnTouch:
-	if (isbegin_quest(12416) == 0 && BaseLevel >= 30 && BaseLevel <= 60)
-		npctalk "Emily: Hey, there! May I talk to you for a minute?";
-	end;
-
-OnInit:
-	questinfo( QTYPE_JUMPING_PORING, QMARK_YELLOW , "isbegin_quest(12416) == 0 && BaseLevel >= 30 && BaseLevel <= 60" );
-	end;
-}
-
-1@begi,106,30,0	script	#start_wp1_0	HIDDEN_WARP_NPC,4,4,{
-	end;
-OnTouch:
-	disablenpc();
-	donpcevent instance_npcname("#start_wp1_1") + "::OnStart";
-	end;
-
-OnInstanceInit:
-	'map_begi$ = instance_mapname("1@begi");
-
-	setcell 'map_begi$,146,35,146,41,cell_walkable,0;
-	setcell 'map_begi$,154,100,154,107,cell_walkable,0;
-	setcell 'map_begi$,59,187,59,197,cell_walkable,0;
-
-	disablenpc instance_npcname("#start_wp1_2");
-	disablenpc instance_npcname("#gift");
-	end;
-}
-
-1@begi,106,30,5	script	#start_wp1_1	4_GEFFEN_03,{
-	mes "[Emily]";
-	mes "Let's go forward.";
-	close;
-
-OnStart:
-	npctalk "Emily: So.. is this Poring Village?";
-	sleep 2000;
-	npctalk "Emily: OK. Let's go!";
-	sleep 2000;
-	disablenpc();
-	donpcevent instance_npcname("#start_wp1_2") + "::OnStart";
-	donpcevent instance_npcname("poring_village_1") + "::OnStart";
-	end;
-}
-
-1@begi,140,37,5	script	#start_wp1_2	4_GEFFEN_03,{
-	mes "[Emily]";
-	mes "I'm going to start slowly now...";
-	close;
-
-OnStart:
-	enablenpc();
-	sleep 1000;
-	npctalk "Emily: Hmmm. It seems they made barriers not to let us go easily.";
-	sleep 3000;
-	npctalk "Emily: I'm quite sure Poring gathered a lot of treasure somewhere.";
-	sleep 4000;
-	mapannounce 'map_begi$, "???: I can hear a human's voice. Make them welcome, everybody.", bc_map, 0xFFFF00;
-	sleep 4000;
-	npctalk "Emily: What is it saying?";
-	sleep 3000;
-	npctalk "Emily: It sounds someone is rushing here... ";
-	sleep 2500;
-	mapannounce 'map_begi$, "???: Don't let them run! Take all valuable items from them!", bc_map, 0xFFFF00;
-	sleep 2500;
-	npctalk "Emily: Well... OK. They don't seem very friendly. Quick, hide!";
-	sleep 4000;
-	// disablenpc();
-	hideonnpc();	// hideonnpc instead of disablenpc (official) to display text on rAthena
-	sleep 1000;
-	npctalk "Emily: Oooops. Can't you hide? Well..... Cheer up!";
-	// disablenpc instance_npcname("#poring_wl18");
-	hideonnpc instance_npcname("#poring_wl18");
-	specialeffect EF_LORD,AREA, instance_npcname("#poring_wl18");
-	sleep 500;
-	// disablenpc instance_npcname("#poring_wl19");
-	hideonnpc instance_npcname("#poring_wl19");
-	specialeffect EF_LORD,AREA, instance_npcname("#poring_wl19");
-	sleep 500;
-	disablenpc instance_npcname("#poring_wl15");
-	sleep 500;
-	disablenpc instance_npcname("#poring_wl16");
-	disablenpc instance_npcname("#poring_wl17");
-	disablenpc instance_npcname("#poring_wl20");
-	disablenpc instance_npcname("#poring_wl21");
-	setcell 'map_begi$,146,35,146,41,cell_walkable,1;
-	end;
-}
-
-// First wall
-1@begi,146,35,6	duplicate(dummy_npc)	#poring_wl15	4_ROPEPILE,1,0
-1@begi,146,36,6	duplicate(dummy_npc)	#poring_wl16	4_ROPEPILE,1,0
-1@begi,146,37,6	duplicate(dummy_npc)	#poring_wl17	4_ROPEPILE,1,0
-1@begi,146,38,6	duplicate(dummy_npc)	#poring_wl18	4_ROPEPILE,1,0
-1@begi,146,39,6	duplicate(dummy_npc)	#poring_wl19	4_ROPEPILE,1,0
-1@begi,146,40,6	duplicate(dummy_npc)	#poring_wl20	4_ROPEPILE,1,0
-1@begi,146,41,6	duplicate(dummy_npc)	#poring_wl21	4_ROPEPILE,1,0
-
-// Second wall
-1@begi,59,187,6	duplicate(dummy_npc)	#poring_wl9	4_ROPEPILE,1,0
-1@begi,59,188,6	duplicate(dummy_npc)	#poring_wl10	4_ROPEPILE,1,0
-1@begi,59,189,6	duplicate(dummy_npc)	#poring_wl11	4_ROPEPILE,1,0
-1@begi,59,190,6	duplicate(dummy_npc)	#poring_wl12	4_ROPEPILE,1,0
-1@begi,59,191,6	duplicate(dummy_npc)	#poring_wl13	4_ROPEPILE,1,0
-1@begi,59,192,6	duplicate(dummy_npc)	#poring_wl14	4_ROPEPILE,1,0
-
-// Others
-1@begi,154,100,6	duplicate(dummy_npc)	#poring_wl1	4_ROPEPILE,1,0
-1@begi,154,101,6	duplicate(dummy_npc)	#poring_wl2	4_ROPEPILE,1,0
-1@begi,154,102,6	duplicate(dummy_npc)	#poring_wl3	4_ROPEPILE,1,0
-1@begi,154,103,6	duplicate(dummy_npc)	#poring_wl4	4_ROPEPILE,1,0
-1@begi,154,104,6	duplicate(dummy_npc)	#poring_wl5	4_ROPEPILE,1,0
-1@begi,154,105,6	duplicate(dummy_npc)	#poring_wl6	4_ROPEPILE,1,0
-1@begi,154,106,6	duplicate(dummy_npc)	#poring_wl7	4_ROPEPILE,1,0
-1@begi,154,107,6	duplicate(dummy_npc)	#poring_wl8	4_ROPEPILE,1,0
-
-
-1@begi,1,1,5	script	poring_village_1	-1,{
-	end;
-OnStart:
-	.@event$ = instance_npcname("poring_village_1") + "::OnMobDead";
-
-	areamonster 'map_begi$, 153,32, 171,32, "--en--", "MD_DROPS",7, .@event$;
-	areamonster 'map_begi$, 48,54, 71,57, "--en--", "MD_DROPS",8, .@event$;
-	areamonster 'map_begi$, 170,38, 189,38, "--en--", "MD_POPORING",8, .@event$;
-	areamonster 'map_begi$, 24,72, 28,92, "--en--", "MD_POPORING",8, .@event$;
-	areamonster 'map_begi$, 188,42, 191,58, "--en--", "MD_MARIN",8, .@event$;
-	areamonster 'map_begi$, 158,67, 174,68, "--en--", "MD_MARIN",3, .@event$;
-	areamonster 'map_begi$, 117,68, 131,68, "--en--", "MD_MARIN",4, .@event$;
-	areamonster 'map_begi$, 79,113, 92,113, "--en--", "MD_MARIN",6, .@event$;
-
-	monster 'map_begi$,101,66, "--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,57,113, "--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,68,113, "--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,176,66, "--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,158,68, "--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,157,67, "--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,149,66, "--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,125,67, "--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,121,67, "--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,102,67, "--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,101,68, "--en--","MD_PORING",1, .@event$;
-	end;
-OnMobDead:
-	if (mobcount( 'map_begi$, instance_npcname("poring_village_1") + "::OnMobDead" ) > 3)
-		end;
-	killmonster 'map_begi$, instance_npcname("poring_village_1") + "::OnMobDead";
-	mapannounce 'map_begi$, "Emily: Wow~ You are quite strong! You defeated all these Porings!", bc_map, 0xFFFF00;
-	sleep 2000;
-	mapannounce 'map_begi$, "Emily: But the Poring looks unique somehow. Be careful!", bc_map, 0xFFFF00;
-	sleep 2000;
-	mapannounce 'map_begi$, "Emily: Ah, there is a unique force if you go near the column of blue light.", bc_map, 0xFFFF00;
-	sleep 2000;
-	monster 'map_begi$,132,103,"--en--","MD_GOLDRING",1, instance_npcname("poring_village_1") + "::OnBossDead";
-	end;
-OnBossDead:
-	if (mobcount( 'map_begi$, instance_npcname("poring_village_1") + "::OnBossDead" ) > 0)
-		end;
-	killmonster 'map_begi$, instance_npcname("poring_village_1") + "::OnBossDead";
-	donpcevent instance_npcname("poring_village_2") + "::OnStart";
-	sleep 6000;
-	// disablenpc instance_npcname("#poring_wl4");
-	hideonnpc instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl4");
-	// disablenpc instance_npcname("#poring_wl5");
-	hideonnpc instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl5");
-	disablenpc instance_npcname("#poring_wl1");
-	disablenpc instance_npcname("#poring_wl2");
-	disablenpc instance_npcname("#poring_wl3");
-	disablenpc instance_npcname("#poring_wl6");
-	disablenpc instance_npcname("#poring_wl7");
-	disablenpc instance_npcname("#poring_wl8");
-	setcell 'map_begi$,154,100,154,107,cell_walkable,1;
-	end;
-}
-
-1@begi,1,1,5	script	poring_village_2	-1,{
-	end;
-OnStart:
-	.@event$ = instance_npcname("poring_village_2") + "::OnMobDead";
-
-	monster 'map_begi$,191,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,191,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,191,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,192,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,194,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,194,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,195,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,195,97,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,199,108,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,201,107,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,203,108,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,206,107,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,213,108,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,214,109,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,214,109,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,214,109,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,214,115,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,214,112,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,214,113,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,214,117,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,214,111,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,215,108,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,215,107,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,216,107,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,197,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,197,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,192,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,190,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,188,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,188,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,184,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,182,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,157,144,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,154,143,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,154,144,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,152,143,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,142,144,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,130,144,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,129,144,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,127,144,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,120,144,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,117,144,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,116,144,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,114,143,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,103,144,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,102,144,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,102,144,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,93,143,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,88,144,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,88,144,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,84,144,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,84,144,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,83,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,76,143,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,75,144,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,73,144,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,73,143,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,72,144,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,69,143,"--en--","MD_POPORING",1, .@event$;
-	monster 'map_begi$,64,144,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,59,143,"--en--","MD_PORING",1, .@event$;
-	monster 'map_begi$,59,144,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,52,144,"--en--","MD_DROPS",1, .@event$;
-	monster 'map_begi$,51,143,"--en--","MD_PORING",1, .@event$;
-	end;
-OnMobDead:
-	if (mobcount( 'map_begi$, instance_npcname("poring_village_2") + "::OnMobDead" ) > 4)
-		end;
-	killmonster 'map_begi$, instance_npcname("poring_village_2") + "::OnMobDead";
-	mapannounce 'map_begi$, "Emily: Hmm.. here is another Boss... It looks strong...", bc_map, 0xFFFF00;
-	sleep 2000;
-	mapannounce 'map_begi$, "Emily: I'm not good at battle.. Let me look for treasure first. See you soon~", bc_map, 0xFFFF00;
-	sleep 2000;
-	monster 'map_begi$,42,173,"--en--","MD_AMERING",1, instance_npcname("poring_village_2") + "::OnBossDead";
-	end;
-OnBossDead:
-	if (mobcount( 'map_begi$, instance_npcname("poring_village_2") + "::OnBossDead" ) > 0)
-		end;
-	killmonster 'map_begi$, instance_npcname("poring_village_2") + "::OnBossDead";
-	donpcevent instance_npcname("poring_village_3") + "::OnStart";
-	sleep 6000;
-	// disablenpc instance_npcname("#poring_wl10");
-	hideonnpc instance_npcname("#poring_wl10");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl10");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl10");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl10");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl10");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl10");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl10");
-	// disablenpc instance_npcname("#poring_wl13");
-	hideonnpc instance_npcname("#poring_wl13");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl13");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl13");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl13");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl13");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl13");
-	specialeffect EF_LORD, AREA, instance_npcname("#poring_wl13");
-	disablenpc instance_npcname("#poring_wl9");
-	disablenpc instance_npcname("#poring_wl11");
-	disablenpc instance_npcname("#poring_wl12");
-	disablenpc instance_npcname("#poring_wl14");
-	setcell 'map_begi$,59,187,59,197,cell_walkable,1;
-	end;
-}
-
-1@begi,1,1,5	script	poring_village_3	-1,{
-	end;
-OnStart:
-	.@event$ = instance_npcname("poring_village_3") + "::OnMobDead";
-
-	monster 'map_begi$,81,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,84,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,85,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,86,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,87,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,88,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,90,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,93,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,94,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,94,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,95,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,98,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,99,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,103,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,103,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,104,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,108,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,111,197,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,128,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,128,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,130,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,132,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,132,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,132,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,133,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,134,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,135,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,136,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,137,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,141,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,143,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,144,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,144,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,146,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,150,185,"--en--","MD_MARIN",1, .@event$;
-	monster 'map_begi$,150,185,"--en--","MD_MARIN",1, .@event$;
-	end;
-OnMobDead:
-	if (mobcount( 'map_begi$, instance_npcname("poring_village_3") + "::OnMobDead" ) > 4)
-		end;
-	killmonster 'map_begi$, instance_npcname("poring_village_3") + "::OnMobDead";
-	mapannounce 'map_begi$, "King Poring: Excuse me... But... Would you please get back now?...", bc_map, 0xFFFF;
-	sleep 2000;
-	mapannounce 'map_begi$, "Emily: What? Who are you?", bc_map, 0xFFFF00;
-	sleep 2000;
-	mapannounce 'map_begi$, "King Poring: I am the leader of this Poring Village. Sorry for the late introduction.", bc_map, 0xFFFF;
-	sleep 2000;
-	mapannounce 'map_begi$, "King Poring: Maybe there is some misunderstanding on our flyers. This village is so poor and has nothing valuable.", bc_map, 0xFFFF;
-	sleep 2000;
-	mapannounce 'map_begi$, "Emily: It's for me to judge after looking around more....", bc_map, 0xFFFF00;
-	sleep 2000;
-	mapannounce 'map_begi$, "King Poring: Ugh.... I don't like fighting but there is no choice.", bc_map, 0xFFFF;
-	sleep 2000;
-	monster 'map_begi$,182,194,"--en--","PORING",10;
-	for ( .@i = 0; .@i < 10; ++.@i ) {
-		setunitdata $@mobid[.@i], UMOB_MODE, (MD_CANMOVE | MD_LOOTER | MD_AGGRESSIVE | MD_CANATTACK);
-		setunitdata $@mobid[.@i], UMOB_SPEED, 200;
-	}
-	monster 'map_begi$,182,194,"--en--","MD_KING_PORING",1, instance_npcname("poring_village_3") + "::OnBossDead";
-	end;
-OnBossDead:
-	if (mobcount( 'map_begi$, instance_npcname("poring_village_3") + "::OnBossDead" ) > 0)
-		end;
-	killmonster 'map_begi$, instance_npcname("poring_village_3") + "::OnBossDead";
-	enablenpc instance_npcname("#gift");
-	end;
-}
-
-1@begi,117,108,5	script	Blue Light Column#1	4_ENERGY_BLUE,4,4,{
-	end;
-OnTouch:
-	switch( rand(3) ) {
-	case 0:
-		unittalk getcharid(3), "" + strcharinfo(0) + " : Ohhhhh!!! Release the parrot inside!!!!";
-		break;
-	case 1:
-		unittalk getcharid(3), "" + strcharinfo(0) + " : I think it's ok to peck someone right now!!";
-		break;
-	case 2:
-		unittalk getcharid(3), "" + strcharinfo(0) + " : Have you been bitten by a mad parrot?";
-		break;
-	}
-	transform 1629,60000;
-	specialeffect2 EF_ENHANCE;
-	sc_start SC_GLASTHEIM_STATE,30000,20;
-	end;
-}
-1@begi,37,165,5	duplicate(Blue Light Column#1)	Blue Light Column#2	4_ENERGY_BLUE,4,4
-1@begi,175,199,5	duplicate(Blue Light Column#1)	Blue Light Column#3	4_ENERGY_BLUE,4,4
-
-
-1@begi,199,186,5	script	#gift	4_GEFFEN_03,{
-	mes "[Emily]";
-	mes "You can have all of the items you find in this dungeon. I already have some.";
-	next;
-	if (isbegin_quest(12418) == 1) {
-		mes "[Emily]";
-		mes "Ah, I found some items. Let me give you one of them. Just to celebrate your first visit!";
-		next;
-		if (rand(100) < 50)
-			getitem 19238,1;	// PoringTownOnion
-		else
-			getitem 19239,1;	// PoringTownCarrot
-		completequest 12418;
-	}
-	mes "[Emily]";
-	mes "I don't need this novice box. You can take it. Now, let's go out side!";
-	close2;
-	getitem 23302,1;	// PoringsPreciousBox
-	warp "prt_fild05",149,238;
-	end;
-}
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1100,7 +1100,7 @@ OnTimer11000:
 	mapannounce "job3_rang02","Test Supervisor, Caution : When you use a 'Bombring Capsule' a Bombring is summoned near you, and after 3 seconds it will explode.",bc_map,"0x87ceeb"; //FW_NORMAL 12 0 0
 	end;
 OnTimer14000:
-	mapannounce "job3_rang02","Test Supervisor, Caution : The explosive range of the Bombring is a 5x5 cell around the Bombring, so be careful not to be caught in the explosion.",bc_map,"0xffb6c1"; //FW_NORMAL 12 0 0
+	mapannounce "job3_rang02","Test Supervisor, Caution : The explosive range of the Bombring is a 5x5 cell around the Bombring, so be carefull not to be caught in the explosion.",bc_map,"0xffb6c1"; //FW_NORMAL 12 0 0
 	end;
 OnTimer17000:
 	mapannounce "job3_rang02","Test Supervisor, Caution : Whilst progressing, if you complete the mission given by an staff member come and see me, then you will pass the 2nd practical test!",bc_map,"0x87ceeb"; //FW_NORMAL 12 0 0
--- a/npc/re/mapflag/nodynamicnpc.txt
+++ b/npc/re/mapflag/nodynamicnpc.txt
@@ -1,140 +0,0 @@
-//===== rAthena Script =======================================
-//= Mapflag: No dynamic NPC map setting.
-//===== Description: ========================================= 
-//= Blocks the use of dynamic NPCs on a map.
-//===== Additional Comments: ================================= 
-//= 1.0 Initial script. [Lemongrass]
-//============================================================
-
-// Mistwood Maze
-1@mist	mapflag	nodynamicnpc
-
-// Culvert
-1@pump	mapflag	nodynamicnpc
-2@pump	mapflag	nodynamicnpc
-
-// Octopus Cave
-1@cash	mapflag	nodynamicnpc
-
-// Bangungot Hospital 2F
-1@ma_h	mapflag	nodynamicnpc
-
-// Buwaya Cave
-1@ma_c	mapflag	nodynamicnpc
-
-// Bakonawa Lake
-1@ma_b	mapflag	nodynamicnpc
-
-// Wolfchev's Laboratory
-1@lhz	mapflag	nodynamicnpc
-
-// Old Glast Heim
-1@gl_k	mapflag	nodynamicnpc
-2@gl_k	mapflag	nodynamicnpc
-
-// Eclage Interior
-1@ecl	mapflag	nodynamicnpc
-
-// Sara's Memories
-1@sara	mapflag	nodynamicnpc
-
-// Geffen Magic Tournament
-1@gef	mapflag	nodynamicnpc
-1@gef_in	mapflag	nodynamicnpc
-1@ge_st	mapflag	nodynamicnpc
-
-// Horror Toy Factory
-1@xm_d	mapflag	nodynamicnpc
-
-// Faceworm's Nest
-1@face	mapflag	nodynamicnpc
-
-// Ghost Palace
-1@spa	mapflag	nodynamicnpc
-
-// Devil's Tower
-1@tnm1	mapflag	nodynamicnpc
-1@tnm2	mapflag	nodynamicnpc
-1@tnm3	mapflag	nodynamicnpc
-
-// Assault on the Airship
-1@air1	mapflag	nodynamicnpc
-1@air2	mapflag	nodynamicnpc
-
-// Fenrir and Sarah
-1@glast	mapflag	nodynamicnpc
-
-// Wave Mode - Forest
-1@def01	mapflag	nodynamicnpc
-
-// Wave Mode - Sky
-1@def02	mapflag	nodynamicnpc
-
-// Nightmarish Jitterbug
-1@jtb	mapflag	nodynamicnpc
-
-// Isle of Bios
-1@dth1	mapflag	nodynamicnpc
-1@dth2	mapflag	nodynamicnpc
-1@dth3	mapflag	nodynamicnpc
-
-// Morse's Cave
-1@rev	mapflag	nodynamicnpc
-
-// Temple of the Demon God
-1@eom	mapflag	nodynamicnpc
-
-// Central Laboratory
-1@lab	mapflag	nodynamicnpc
-
-// Last room
-1@uns	mapflag	nodynamicnpc
-
-// Charleston in Distress
-1@mcd	mapflag	nodynamicnpc
-
-// Ritual of Blessing
-2@mir	mapflag	nodynamicnpc
-
-// Room of Consciousness
-1@mir	mapflag	nodynamicnpc
-
-// Sky Fortress Invasion
-1@sthb	mapflag	nodynamicnpc
-1@sthc	mapflag	nodynamicnpc
-1@sthd	mapflag	nodynamicnpc
-
-// Heart Hunter War Base 1 + 2
-1@swat	mapflag	nodynamicnpc
-
-// Werner Laboratory central room#1 + 2
-1@slw	mapflag	nodynamicnpc
-
-// Infinite Space
-1@infi	mapflag	nodynamicnpc
-
-// Regenschirm
-1@rgsr	mapflag	nodynamicnpc
-
-// Sealed OS
-1@os_b	mapflag	nodynamicnpc
-
-// OS Occupation + 2nd OS Search
-1@os_a	mapflag	nodynamicnpc
-
-// Cor Memorial
-1@cor	mapflag	nodynamicnpc
-
-// Half Moon In The Daylight
-1@pop1	mapflag	nodynamicnpc
-1@pop2	mapflag	nodynamicnpc
-1@pop3	mapflag	nodynamicnpc
-
-// Weekend Dungeon
-1@md_pay	mapflag	nodynamicnpc
-
-// Friday Dungeon
-1@md_gef	mapflag	nodynamicnpc
-
-// Poring Village
-1@begi	mapflag	nodynamicnpc
--- a/npc/re/merchants/Emperium_Seller.txt
+++ b/npc/re/merchants/Emperium_Seller.txt
@@ -1,42 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Emperium Seller
-//===== By: ================================================== 
-//= Pokye
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
-//= Sell Emperium
-//===== Additional Comments: ================================= 
-//= 1.0 Special thanks for Balfear and Everade
-//============================================================ 
-
-prt_in,212,169,3	script	Guild Clerk	4_M_04,{
-	if (gettime(DT_DAYOFWEEK) >= 1 && gettime(DT_DAYOFWEEK) <= 6 && gettime(DT_HOUR) >= 18 && gettime(DT_HOUR) <= 23) {
-		mes "[Guild Clerk]";
-		mes "The Emperium to be distributed to the guild office today has arrived. If you want to purchase, please put as many as you want~";
-		next;
-		mes "[Guild Clerk]";
-		mes "It seems that many people are looking for Emperium today. It's just a personal feeling.";
-		close2;                                                                                                         
-		callshop "emp_seller#slo";
-		end;
-	}
-	mes "[Guild Clerk]";
-	mes "Our guild office actively supports the smooth gathering of adventurers.";
-	next;
-	mes "[Guild Clerk]";
-	mes "As part of that,";
-	mes "we are selling a limited quantity of 100 <ITEM>Emperium<INFO>714</INFO></ITEM> every day";
-	mes "from ^0000ff18:00 to 23:59^000000 from ^0000ffMonday to Saturday^000000.";
-	next;
-	mes "[Guild Clerk]";
-	mes "Please note that our guild office does not sell all the time because we have to run around to supply Emperium outside of the hours.";
-	close;
-
-OnHour00:
-	npcshopupdate "emp_seller#slo",714,0,100;
-	end;
-}
-	marketshop	emp_seller#slo	FAKE_NPC,714:1000000:100
--- a/npc/re/merchants/Gemstone_Bagger.txt
+++ b/npc/re/merchants/Gemstone_Bagger.txt
@@ -1,59 +0,0 @@
-//===== rAthena Script =======================================
-//= Gemstone Bagger
-//===== Description: =========================================
-// The information in this script was taken from kro
-//===== Changelogs: ==========================================
-//= 1.0 First Version. [JohnnyPlayy, Pokye]
-//============================================================
- 
-//= Gemstone Bagger
-//============================================================
-	script	#GemstoneBagger	HIDDEN_NPC,{
-	mes "[Gemstone Bagger]";
-	mes "We pack gemstones in bags in an easy to find way.";
-	mes "What would you like to do?";
-	next;
-	switch(select("Exchange Gemstones:Cancel")) {
-	case 1:
-		mes "[Gemstone Bagger]";
-		mes "I will prepare a bag for gemstones.";
-		close2;
-		callshop "Gemstone_Bagger";
-		break;
-	case 2:
-		mes "[Gemstone Bagger]";
-		mes "Come back if you need help.";
-		close;
-	}
-}
-
-//= Duplicate
-//============================================================
-alb2trea,89,65,3	duplicate(#GemstoneBagger)	Gemstone Bagger#01	1_F_MERCHANT_01
-alberta_in,178,97,5	duplicate(#GemstoneBagger)	Gemstone Bagger#02	4_M_01
-aldeba_in,100,54,3	duplicate(#GemstoneBagger)	Gemstone Bagger#03	4_F_02
-ama_in01,20,26,5	duplicate(#GemstoneBagger)	Gemstone Bagger#04	4_M_JPN
-cmd_fild07,259,126,5	duplicate(#GemstoneBagger)	Gemstone Bagger#05	4_F_01
-cmd_in01,84,178,3	duplicate(#GemstoneBagger)	Gemstone Bagger#06	4_M_04
-ein_in01,197,22,5	duplicate(#GemstoneBagger)	Gemstone Bagger#07	4_F_EINWOMAN
-einbroch,222,206,5	duplicate(#GemstoneBagger)	Gemstone Bagger#08	4_M_EINMAN
-geffen_in,77,175,3	duplicate(#GemstoneBagger)	Gemstone Bagger#09	1_F_03
-gonryun,146,82,5	duplicate(#GemstoneBagger)	Gemstone Bagger#10	4_M_TWOLDMAN
-hu_in01,252,370,3	duplicate(#GemstoneBagger)	Gemstone Bagger#11	4_F_02
-izlude_in,55,110,5	duplicate(#GemstoneBagger)	Gemstone Bagger#12	4_M_01
-lhz_in02,40,145,5	duplicate(#GemstoneBagger)	Gemstone Bagger#13	4_F_03
-lhz_in03,243,106,5	duplicate(#GemstoneBagger)	Gemstone Bagger#14	4_M_EINMAN
-lou_in02,244,175,5	duplicate(#GemstoneBagger)	Gemstone Bagger#15	4_F_CHNWOMAN
-malangdo,233,160,3	duplicate(#GemstoneBagger)	Gemstone Bagger#16	4_CAT_ADV2
-moc_ruins,95,128,3	duplicate(#GemstoneBagger)	Gemstone Bagger#17	1_F_01
-morocc,153,241,7	duplicate(#GemstoneBagger)	Gemstone Bagger#18	4W_M_03
-morocc,143,101,5	duplicate(#GemstoneBagger)	Gemstone Bagger#19	4_F_04
-payon,163,96,3	duplicate(#GemstoneBagger)	Gemstone Bagger#20	1_F_ORIENT_01
-payon_in01,12,47,3	duplicate(#GemstoneBagger)	Gemstone Bagger#21	1_F_ORIENT_01
-payon_in02,84,40,3	duplicate(#GemstoneBagger)	Gemstone Bagger#22	4_M_ORIENT01
-prt_fild05,292,226,3	duplicate(#GemstoneBagger)	Gemstone Bagger#23	1_M_01
-prt_in,125,78,5	duplicate(#GemstoneBagger)	Gemstone Bagger#24	1_M_INNKEEPER
-um_in,103,115,3	duplicate(#GemstoneBagger)	Gemstone Bagger#25	4_M_UMOLDMAN
-xmas_in,36,37,5	duplicate(#GemstoneBagger)	Gemstone Bagger#26	4_M_04
-yuno,221,115,3	duplicate(#GemstoneBagger)	Gemstone Bagger#27	4_F_02
-yuno_in01,34,30,3	duplicate(#GemstoneBagger)	Gemstone Bagger#28	4_F_02
--- a/npc/re/merchants/Slot_Move_Card_Sales.txt
+++ b/npc/re/merchants/Slot_Move_Card_Sales.txt
@@ -1,32 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Slot Move Card Sales
-//===== By: ================================================== 
-//= Pokye
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
-//= Character Position Change Coupon seller.
-//===== Additional Comments: ================================= 
-//= 1.0 Special thanks for Balfear and Everade
-//============================================================ 
-
-prt_in,211,173,3	script	Slot Move Card Sales#slo	4_F_01,{
-	mes "[Salesman]";
-	mes "Howdy.";
-	mes "I'm selling <ITEM>[Character Position Change Coupon]<INFO>12786</INFO></ITEM>.";
-	mes "You can ^4d4dffchange the slot position of a character using the card^000000.";
-	next;
-	mes "[Salesman]";
-	mes "I sell it in a limited quantity every week, so if you don't see anything,";
-	mes "it means all of the items are sold out, so please come back next time.";
-	close2;
-	callshop "change_slot#slo";
-	end;
-
-OnMon0000:
-	npcshopupdate "change_slot#slo",12786,0,9999;
-	end;
-}
-	marketshop	change_slot#slo	FAKE_NPC,12786:100000:9999
--- a/npc/re/merchants/barters.yml
+++ b/npc/re/merchants/barters.yml
@@ -48,7 +48,6 @@ Header:
 Footer:
  Imports:
  - Path: npc/re/merchants/barters/Extended_Ammunition.yml
-  - Path: npc/re/merchants/barters/Gemstone_Bagger.yml
  - Path: npc/re/merchants/barters/quests_16_1.yml
  - Path: npc/re/merchants/barters/quests_16_2.yml
  - Path: npc/re/merchants/barters/quests_17_1.yml
--- a/npc/re/merchants/barters/Gemstone_Bagger.yml
+++ b/npc/re/merchants/barters/Gemstone_Bagger.yml
@@ -1,71 +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/>.
-#
-###########################################################################
-# Barter Database
-###########################################################################
-#
-# Barter Settings
-#
-###########################################################################
-#  - Name               NPC name.
-#    Map                Map name. (Default: not on a map)
-#    X                  Map x coordinate. (Default: 0)
-#    Y                  Map y coordinate. (Default: 0)
-#    Direction          Direction the NPC is looking. (Default: North)
-#    Sprite             Sprite name of the NPC. (Default: FakeNpc)
-#    Items:             List of sold items.
-#      - Index          Index of the item inside the shop. (0-...)
-#                       Maximum index depends on client.
-#        Item           Aegis name of the item.
-#        Stock          Amount of item in stock. 0 means unlimited. (Default: 0)
-#        Zeny           Cost of them item in Zeny. (Default: 0)
-#        RequiredItems: List of required items (Optional)
-#          - Index      Index of the required item. (0-4)
-#            Item       Aegis name of required item.
-#            Amount     Amount of required item. (Default: 1)
-#            Refine     Refine level of required item. (Default: 0)
-###########################################################################
-
-Header:
-  Type: BARTER_DB
-  Version: 1
-
-Body:
-###########################################################################
-##= Gemstone Bagger ( Exchange )
-###########################################################################
-  - Name: Gemstone_Bagger
-    Items:
-      - Index: 0
-        Item: Gemstone_Blue
-        RequiredItems:
-          - Index: 0
-            Item: Blue_Gemstone
-            Amount: 500
-      - Index: 1
-        Item: Gemstone_YL
-        RequiredItems:
-          - Index: 0
-            Item: Yellow_Gemstone
-            Amount: 500
-      - Index: 2
-        Item: Gemstone_Red
-        RequiredItems:
-          - Index: 0
-            Item: Red_Gemstone
-            Amount: 500
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -341,7 +341,7 @@ malangdo,233,180,3	script	Dark MachineTX100	564,{
 	getitem .@exchange_id[.@i], .@reward_amount - .@fee;
 	mes "[Dark Machine TX100]";
 	mes "Received ^003399"+getitemname(.@coin)+"^000000 for ^003399"+.@payment_amount+"^000000 unit(s).";
-	mes "We have exchanged your coin to ^003399"+(.@reward_amount-.@fee)+"^000000 unit(s) of ^003399"+.@coin_text$+" Level Coin^000000, deducted ^003399"+.@fee+"^000000 unit(s) as exchanging fee.";
+	mes "We have excanged your coin to ^003399"+(.@reward_amount-.@fee)+"^000000 unit(s) of ^003399"+.@coin_text$+" Level Coin^000000, deducted ^003399"+.@fee+"^000000 unit(s) as exchanging fee.";
 	close;
 }

--- a/npc/re/merchants/enchan_rockridge.txt
+++ b/npc/re/merchants/enchan_rockridge.txt
@@ -435,7 +435,7 @@ har_in01,19,86,4	script	Weapon Dealer#rockridge01	1_F_02,{
 		mes "Sure, if you have things I can sell.";
 		mes "Show me what you've got.";
 		close2;
-		callshop "bullets_rockridge", 2;
+		callshop "armor_rockridge", 2;
 		end;
 	case 5:
 		mes "[Weapon Dealer]";
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -20,7 +20,7 @@
 //= 1.8 Added Rebellion Machines. [Rekiem]
 //= 1.9 Added Renewal Ninja shops. [Euphy]
 //= 2.0 Moved and updated Morocc merchants. [zackdreaver]
-//============================================================
+//============================================================ 

 //=======================================================
 // Alberta
@@ -99,7 +99,6 @@ s_atelier,114,117,1	shop	Part-Timer#sc_yuno	92,6123:-1,6120:-1
 lighthalzen,337,240,4	shop	Trap Specialist#lhz	66,7940:-1,12341:-1
 lhz_in03,181,17,4	shop	Black Marketeer#lhz	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 s_atelier,15,65,5	shop	Part-Timer#sc_lgt	89,6123:-1,6120:-1
-lhz_in02,105,21,3	shop	Jeweler#lhz	91,721:-1,723:-1,726:-1,728:-1,729:-1,719:-1,720:-1,722:-1,1000321:-1,730:-1,2613:-1

 //=======================================================
 // Malangdo
@@ -122,18 +121,16 @@ morocc,146,103,6	shop	Tool Dealer#moc3	99,1750:-1,611:-1,501:-1,502:-1,503:-1,50
 morocc,151,241,4	shop	Tool Dealer#moc4	93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,23280:-1,601:-1,602:-1,23288:-1,1065:-1
 moc_ruins,118,170,4	shop	Pet Groomer#moc	125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
 morocc,203,87,4	shop	Pet Groomer#moc1	125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
-morocc,154,55,6	shop	Jeweler#moc3	99,721:-1,723:-1,726:-1,728:-1,729:-1,719:-1,720:-1,722:-1,1000321:-1,730:-1,2613:-1
+morocc,154,55,6	shop	Jeweler#moc3	99,730:-1,2613:-1
 morocc,171,103,4	shop	Item Collector#moc3	85,911:-1,528:-1,919:-1,925:-1
 morocc,205,247,2	shop	Item Collector#moc4	85,911:-1,528:-1,919:-1,925:-1
 morocc,140,90,6	shop	Trader#moc6	99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
-morocc,166,54,2	shop	Jeweler#moc4	102,721:-1,723:-1,726:-1,728:-1,729:-1,719:-1,720:-1,722:-1,1000321:-1,730:-1,2613:-1
+morocc,166,54,2	shop	Jeweler#moc4	102,721:-1,723:-1,726:-1,728:-1,729:-1,1000321:-1
 morocc,34,68,0	shop	Trader#moc7	93,748:-1
 morocc,269,193,4	shop	Trader#moc8	89,2609:-1,1516:-1,1522:-1
 morocc,256,191,5	shop	Trader#moc9	93,2612:-1
 morocc,149,245,7	shop	Advanced Potion Merchant#moc1	4_F_ALCHE_A,11621:-1,11622:-1,11623:-1,11624:-1
 morocc,170,84,1	shop	Advanced Potion Merchant#moc2	4_F_ALCHE_A,11621:-1,11622:-1,11623:-1,11624:-1
-moc_ruins,110,105,2	shop	Jeweler#moc1	102,721:-1,723:-1,726:-1,728:-1,729:-1,719:-1,720:-1,722:-1,1000321:-1,730:-1,2613:-1
-moc_ruins,52,85,6	shop	Jeweler#moc2	99,721:-1,723:-1,726:-1,728:-1,729:-1,719:-1,720:-1,722:-1,1000321:-1,730:-1,2613:-1

 //=======================================================
 // Mid Camp
@@ -174,7 +171,6 @@ s_atelier,17,110,1	shop	Part-Timer#sc_prt	67,6123:-1,6120:-1
 prontera,96,209,4	shop	Rebellion Accessories	564,25187:-1,7663:-1,7664:-1,7665:-1,7940:300,13200:-1,13221:-1,13222:-1,13215:-1,13216:-1,13217:-1,13218:-1,13219:-1,13220:-1,13228:-1,13229:-1,13231:-1,13232:-1,13230:-1
 prontera,92,209,4	shop	Rebellion Weapons	564,13120:-1,13122:-1,13189:-1,13195:-1,13192:-1,13193:-1,13194:-1,13197:-1,13198:-1,28200:-1,28201:-1
 prt_in,129,68,3	shop	Advanced Potion Merchant#prt	4_F_ALCHE_A,11621:-1,11622:-1,11623:-1,11624:-1
-prt_in,117,79,5	shop	Toy Dealer#prt	715,2239:-1,2201:-1,2243:-1,2212:-1,2242:-1,2241:-1

 //=======================================================
 // Rachel
--- a/npc/re/other/item_merge.txt
+++ b/npc/re/other/item_merge.txt
@@ -25,7 +25,7 @@ prontera,146,95,3	script	Mergician#pron	64,{
 		close;
 	}
 	mes "[Mergician]";
-	mes "Do you believe in the miracle of Merge god?? If so, repeat my spell loudly as I pronounce it!!!";
+	mes "Do you believe in the miracle of Merge god?? If so, repeat my spell loudly as I pronunce it!!!";
 	mes "Merge Merge, Merrrrge!!!";
 	next;
 	switch(select("What is the miracle of Merge?:Merrrrge!!!!:Abandon...")) {
--- a/npc/re/other/kachua_key.txt
+++ b/npc/re/other/kachua_key.txt
@@ -1,72 +0,0 @@
-//===== rAthena Script =======================================
-//= Dynamic NPC: Kachua's Secret Box
-//===== Description: =========================================
-//- [Official conversion]
-//= Kachua's Secret Box is a Gachapon NPC.
-//= It lets the player exchange a Kachua's Secret Key for a random item.
-//= It also gives a Kachua's Mileage Coupon for each pull.
-//===== Changelogs: ==========================================
-//= 1.0 First version. [secretdataz]
-//============================================================
-
-sec_in02,126,178,3	script	Kachua's Secret Box#bm	4_TREASURE_BOX,{
-	.@key$ = "K_Secret_Key";
-	mes "A Secret Box where no one knows what's inside.";
-	mes "^4d4dffYou can open this box by consuming <ITEM>[Kachua's Secret Key]<INFO>23919</INFO></ITEM>.^000000";
-	next;
-	switch(select("^4d4dffOpen the box 1 time (1 Kachua's Secret Key)^000000","^4d4dffOpen the box 10 times (10 Kachua's Secret Keys)^000000")) {
-		case 1:
-			mes "^FF0000[Notice]^000000";
-			mes "^FF0000Exchange one random item with one Kachua's Secret Key.^000000";
-			mes "^FF0000The item exchanged above cannot be withdrawn, nor can it be exchanged to Kachua's Secret Key.^000000";
-			next;
-			if(select("Keep going.","Stop conversation.") == 2) {
-				mes "You have decided not to open the Box.";
-				close;
-			} else if (countitem(.@key$) < 1) {
-				mes "Not enough <ITEM>[Kachua Secret Key]<INFO>23919</INFO></ITEM>.";
-				close;
-			} else {
-				if (checkweight(1201,1) == 0 || ((MaxWeight - Weight) * 100 / MaxWeight) < 10) {
-					mes "^4d4dffPlease make sure you have enough space in your inventory.^000000";
-					close;
-				}
-				delitem(.@key$, 1);
-				getgroupitem(IG_MAIN_LUCKY_BOX); // TODO: change to consumeitem "Main_Lucky_Box" when consumeitem is fixed
-				mes "Kachua's Secret Box was opened!";
-				mes "Were you lucky?";
-				specialeffect2 EF_VALLENTINE;
-				close;
-			}
-		case 2:
-			mes "^FF0000[Notice]^000000";
-			mes "^FF0000Exchange 10 random item with 10 Kachua's Secret Key.^000000";
-			mes "^FF0000The items exchanged above cannot be withdrawn, nor can it be exchanged to Kachua's Secret Key.^000000";
-			next;
-			if(select("Keep going.","Stop conversation.") == 2) {
-				mes "You have decided not to open the Box.";
-				close;
-			} else if (countitem(.@key$) < 10) {
-				mes "You do not have enough <ITEM>[Kachua Secret Key]<INFO>23919</INFO></ITEM>.";
-				close;
-			} else {
-				for (.@i = 1; .@i <= 10; ++.@i) {
-					progressbar "4d4dff",2;
-					if (checkweight(1201,1) == 0 || ((MaxWeight - Weight) * 100 / MaxWeight) < 10) {
-						mes "^4d4dffPlease make sure you have enough space in your inventory.^000000";
-						close;
-					}
-					if (countitem(.@key$) < 1) { // Custom check, just in case
-						close;
-					}
-					delitem(.@key$, 1);
-					getgroupitem(IG_MAIN_LUCKY_BOX); // TODO: change to consumeitem "Main_Lucky_Box" when consumeitem is fixed
-					dispbottom "Kachua's Secret Box was opened " + .@i + " times. Another one is being opened.",0xFFFFFF;
-					specialeffect2 EF_VALLENTINE;
-				}
-				mes "Kachua's Secret Box was opened 10 times!";
-				mes "Were you lucky?";
-				close;
-			}
-	}
-}
--- a/npc/re/quests/HelpMeShorty.txt
+++ b/npc/re/quests/HelpMeShorty.txt
--- a/npc/re/quests/juno_monster_society.txt
+++ b/npc/re/quests/juno_monster_society.txt
--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -86,7 +86,6 @@ npc: npc/re/instances/NightmarishJitterbug.txt
 npc: npc/re/instances/OctopusCave.txt
 npc: npc/re/instances/OldGlastHeim.txt
 npc: npc/re/instances/OsOccupation.txt
-npc: npc/re/instances/PoringVillage.txt
 npc: npc/re/instances/Regenschirm.txt
 npc: npc/re/instances/RitualOfBlessing.txt
 npc: npc/re/instances/RoomOfConsciousness.txt
@@ -120,7 +119,6 @@ npc: npc/re/merchants/clothing_buff_removal.txt
 npc: npc/re/merchants/coin_exchange.txt
 npc: npc/re/merchants/Dealer_Update.txt
 npc: npc/re/merchants/diamond.txt
-npc: npc/re/merchants/Emperium_Seller.txt
 npc: npc/re/merchants/enchan_illusion_16_2.txt
 npc: npc/re/merchants/enchan_illusion_17_1.txt
 npc: npc/re/merchants/enchan_ko.txt
@@ -132,7 +130,6 @@ npc: npc/re/merchants/enchantgrade.txt
 npc: npc/re/merchants/Extended_Ammunition.txt
 npc: npc/re/merchants/Extended_Stylist.txt
 npc: npc/re/merchants/flute.txt
-npc: npc/re/merchants/Gemstone_Bagger.txt
 npc: npc/re/merchants/gld_mission_exchange.txt
 npc: npc/re/merchants/ghost_palace_exchange.txt
 npc: npc/re/merchants/guild_warehouse.txt
@@ -151,7 +148,6 @@ npc: npc/re/merchants/quivers.txt
 npc: npc/re/merchants/refine.txt
 npc: npc/re/merchants/renters.txt
 npc: npc/re/merchants/shops.txt
-npc: npc/re/merchants/Slot_Move_Card_Sales.txt
 npc: npc/re/merchants/socket_enchant2.txt
 //npc: npc/re/merchants/ticket_refiner.txt
 //npc: npc/re/merchants/enchan_upg.txt
@@ -174,7 +170,6 @@ npc: npc/re/other/resetskill.txt
 npc: npc/re/other/stone_change.txt
 npc: npc/re/other/turbo_track.txt
 npc: npc/re/other/CashShop_Functions.txt
-npc: npc/re/other/kachua_key.txt

 // --------------------------- Quests ---------------------------
 // - Eden Group -------------------------------------------------
@@ -206,9 +201,7 @@ npc: npc/re/quests/seals/megingard_seal.txt
 // --------------------------------------------------------------
 npc: npc/re/quests/cooking_quest.txt
 //npc: npc/re/quests/cupet.txt
-npc: npc/re/quests/HelpMeShorty.txt
 npc: npc/re/quests/homun_s.txt
-npc: npc/re/quests/juno_monster_society.txt
 npc: npc/re/quests/magic_books.txt
 npc: npc/re/quests/monstertamers.txt
 npc: npc/re/quests/mrsmile.txt
--- a/npc/test/ci/0000_funcs.txt
+++ b/npc/test/ci/0000_funcs.txt
@@ -1,15 +0,0 @@
-function	script	AssertTrue	{
-	if (!getarg(0)) {
-		errormes "AssertTrue failed for " + getarg(1) + ".";
-		return false;
-	}
-	return true;
-}
-
-function	script	AssertEquals	{
-	if (getarg(0) != getarg(1)) {
-		errormes "AssertEquals failed for " + getarg(2) + ": expected " + getarg(0) + ", got " + getarg(1) + ".";
-		return false;
-	}
-	return true;
-}
--- a/npc/test/ci/7291.txt
+++ b/npc/test/ci/7291.txt
@@ -1,35 +0,0 @@
-	script	itemlink#ci	-1,{
-OnInit:
-	if( checkre(0) ){
-		if( PACKETVER >= 20200916 ){
-			.@expected$ = "<ITEML>0000213v0%0g&00'00)18X)1ck)00)00+2R,00-00</ITEML>";
-		}else if( PACKETVER >= 20150225 ){
-			// Grade does not exist (clientside) yet
-			.@expected$ = "<ITEMLINK>0000213v0%0g&00(18X(1ck(00(00*2R+00,00</ITEMLINK>";
-		}else if( PACKETVER >= 20100000 ){
-			// Random Options do not exist (clientside) yet
-			.@expected$ = "<ITEMLINK>0000213v0%0g&00(18X(1ck(00(00</ITEMLINK>";
-		}else{
-			// Item Link does not exist (clientside) yet
-			.@expected$ = "Crimson Saber";
-		}
-
-		setarray .@opt_ids,RDMOPT_WEAPON_ATTR_GROUND;
-		.@actual$ = itemlink(13454,16,4399,4608,0,0,0,.@opt_ids,.@opt_dummy,.@opt_dummy);
-		AssertEquals(.@expected$, .@actual$, "Generated itemlink for +16 Earth Crimson Saber");
-	}else{
-		if( PACKETVER >= 20200916 ){
-			.@expected$ = "<ITEML>000021hS%0a&00'00)18X)00)00)00</ITEML>";
-		}else if( PACKETVER >= 20100000 ){
-			// Grade does not exist (clientside) yet// Grade does not exist (clientside) yet
-			.@expected$ = "<ITEMLINK>000021hS%0a&00(18X(00(00(00</ITEMLINK>";
-		}else{
-			// Item Link does not exist (clientside) yet
-			.@expected$ = "Blade";
-		}
-
-		// No Random Options in Pre-Renewal
-		.@actual$ = itemlink(1108,10,4399);
-		AssertEquals(.@expected$, .@actual$, "Generated itemlink for +10 Blade[4]");
-	}
-}
--- a/Show More
+++ b/Show More