Merge branch 'master' into feature/blocking_play

Small cleanup
2020-09-10 08:26:20 -04:00 · 2020-08-13 11:24:20 -04:00 · 2020-08-13 11:19:44 -04:00 · 2020-08-05 11:42:45 -04:00 · 2020-08-05 11:18:59 -04:00 · 2020-06-22 10:30:31 -04:00
623 changed files with 134729 additions and 853716 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,4 +12,3 @@ configure.in text eol=lf
 Makefile text eol=lf
 Makefile.in text eol=lf
 *.sh text eol=lf
-*.sql text eol=lf
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -7,7 +7,6 @@ Table of Contents
  * [Reporting Bugs](#reporting-bugs)
  * [Suggesting Enhancements](#suggesting-enhancements)
  * [Issue Labels](#issue-labels)
-  * [Local Development Environment](#local-development-environment)
  * [Become a Team Member](#become-a-team-member)

 Reporting Bugs
@@ -162,13 +161,6 @@ For the most part you as a user will have no reason to worry about the **Milesto
 [search-rathena-label-typemaintenance]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Amaintenance
 [search-rathena-label-typequestion]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Aquestion

-Local Development Environment
-----------------------------
-
-Developers can get up and running quickly with a Dockerized development environment that installs all dependencies needed to run and develop on rAthena.
-See [Docker documentation](https://github.com/rathena/rathena/blob/master/tools/docker/README.md) for details
-
-
 Become a Team Member
 --------------------

--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,3 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: type:bug
-assignees: ''
-
---
-
 <!-- NOTE: Anything within these brackets will be hidden on the preview of the Issue. -->

 * **rAthena Hash**: 
@@ -30,7 +21,7 @@ How to get your GitHub Hash:
  * Result: <!-- Describe the issue that you experienced in detail. -->
  * Expected Result: <!-- Describe what you would expect to happen in detail. -->
  * How to Reproduce: <!-- If you have not stated in the description of the result already, please give us a short guide how we can reproduce your issue. -->
-  * Official Information: <!-- If possible, provide information from official servers (kRO or other sources) which prove that the result is wrong. Please take into account that iRO (especially iRO Wiki) is not always the same as kRO. -->
+  * Official Information:<!-- If possible, provide information from official servers (kRO or other sources) which prove that the result is wrong. Please take into account that iRO (especially iRO Wiki) is not always the same as kRO. -->
  <!-- * _NOTE: Make sure you quote ``` `@atcommands` ``` just like this so that you do not tag uninvolved GitHub users!_ -->

 * **Modifications that may affect results**: 
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,35 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: type:enhancement
-assignees: ''
-
---
-
-<!-- NOTE: Anything within these brackets will be hidden on the preview of the Feature Request. -->
-
-**Is your request related to a missing feature?**
-
-<!--
-  Provide a clear and concise description of what the feature pertains to.
-->
-
-**Describe the solution you'd like**
-
-<!--
-  Provide a clear and concise description of what you want to happen.
-->
-
-**Describe alternatives you've considered**
-
-<!--
-  Let us know about other solutions you've tried or researched.
-->
-
-**Additional context**
-
-<!--
-  Is there anything else you can add about the proposal?
-  You might want to link to related issues here if you haven't already.
-->
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 /autom4te.cache/requests
 /autom4te.cache/traces.0
 #Global
-.vscode
 .Apple*
 .DS_Store
 .clang_complete
@@ -42,8 +41,6 @@ Thumbs.db
 /map-server
 /mapcache
 /nbproject
-/yaml2sql
-/yamlupgrade

 # /3rdparty/libconfig/
 /3rdparty/libconfig/Makefile
@@ -122,8 +119,6 @@ Thumbs.db
 /mapserv.bat
 /runserver.bat
 /serv.bat
-/yaml2sql.bat
-/yamlupgrade.bat

 # dlls
 /libmysql.dll
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,17 +56,6 @@ set(CMAKE_CXX_CREATE_SHARED_LIBRARY)
 set(CMAKE_DEBUG_POSTFIX "d")
 set(CMAKE_RELEASE_POSTFIX "r")

-# Set a default build type if none was specified
-set(default_build_type "Release")
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
-  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
-      STRING "Choose the type of build." FORCE)
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif()
-
 #
 # Prevent building in the source directory by default
 #
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="doc/logo.png" align="right" height="90" />
+<img src="branding/logo.png" align="right" height="90" />

 # rAthena
 [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena) [![Build status](https://ci.appveyor.com/api/projects/status/8574b8nlwd57loda/branch/master?svg=true)](https://ci.appveyor.com/project/rAthenaAPI/rathena/branch/master) [![Total alerts](https://img.shields.io/lgtm/alerts/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/alerts/) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/context:cpp) ![GitHub](https://img.shields.io/github/license/rathena/rathena.svg) ![GitHub repo size](https://img.shields.io/github/repo-size/rathena/rathena.svg)
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ LOG_DIR="./log"
 print_start() {
 	#    more << EOF
 	echo "rAthena is starting..."
-	echo "            (c) 2021 rAthena Project"
+	echo "            (c) 2017 rAthena Project"
 	echo ""
 	echo ""
 	echo "checking..."
--- a/branding/logo.png
+++ b/branding/logo.png
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
@@ -283,19 +283,12 @@ Body:
      4064 Mechanic         4065 Guillotine Cross  4073 Royal Guard    4074 Sorcerer
      4075 Minstrel            4076 Wanderer              4077 Sura                  4078 Genetic
      4079 Shadow Chaser
-      ----- 4th Class -----
-      4252 Dragon Knight    4253 Meister                    4254 Shadow Cross     4255 Arch Mage
-      4256 Cardinal               4257 Windhawk              4258 Imperial Guard     4259 Biolo
-      4260 Abyss Chaser     4261 Elemental Master 4262 Inquisitor               4263 Troubadour
-      4264 Trouvere
      ----- Expanded Class -----
           23 Super Novice      24 Gunslinger              25 Ninja                 4045 Super Baby
      4046 Taekwon           4047 Star Gladiator     4049 Soul Linker            4050 Gangsi
      4051 Death Knight    4052 Dark Collector    4190 Ex. Super Novice  4191 Ex. Super Baby
      4211 Kagerou            4212 Oboro             4215 Rebellion        4218 Summoner
      4239 Star Emperor   4240 Soul Reaper
-      4302 Sky Emperor    4303 Soul Ascetic         4304 Shinkiro                 4305 Shiranui
-      4306 Night Watch     4307 Hyper Novice        4308 Spirit Handler
      ----- Baby Novice And Baby 1st Class -----
      4023 Baby Novice      4024 Baby Swordman    4025 Baby Magician   4026 Baby Archer
      4027 Baby Acolyte      4028 Baby Merchant       4029 Baby Thief
@@ -335,10 +328,6 @@ Body:
    Help: |
      Params: [<HP> <SP>]
      Heals the desired amount of HP and SP. No value specified will do a full heal.
-  - Command: healap
-    Help: |
-      Params: [<AP>]
-      Heals the desired amount of AP. No value specified will do a full AP heal.
  - Command: dye
    Aliases:
      - ccolor
@@ -484,9 +473,6 @@ Body:
  - Command: stpoint
    Help: |
      Params: <number of points> - Gives you the desired number of stat points.
-  - Command: trpoint
-    Help: |
-      Params: <number of points> - Gives you the desired number of trait stat points.
  - Command: skpoint
    Help: |
      Params: <number of points> - Gives you the desired number of skill points.
@@ -523,30 +509,6 @@ Body:
    Help: |
      Params: <amount>
      Raises LUK by given amount.
-  - Command: pow
-    Help: |
-      Params: <amount>
-      Raises POW by given amount.
-  - Command: sta
-    Help: |
-      Params: <amount>
-      Raises STA by given amount.
-  - Command: wis
-    Help: |
-      Params: <amount>
-      Raises WIS by given amount.
-  - Command: spl
-    Help: |
-      Params: <amount>
-      Raises SPL by given amount.
-  - Command: con
-    Help: |
-      Params: <amount>
-      Raises CON by given amount.
-  - Command: crt
-    Help: |
-      Params: <amount>
-      Raises CRT by given amount.
  - Command: allstats
    Aliases:
      - allstat
@@ -555,14 +517,6 @@ Body:
    Help: |
      Params: <value>
      Adds value in all stats (maximum if no value).
-  - Command: alltraits
-    Aliases:
-      - alltrait
-      - traitall
-      - traitsall
-    Help: |
-      Params: <value>
-      Adds value in all traits (maximum if no value).
  - Command: addwarp
    Help: |
      Params: <map name> <x coord> <y coord> <NPC name>
--- a/conf/battle/drops.conf
+++ b/conf/battle/drops.conf
@@ -153,42 +153,3 @@ rare_drop_announce: 0
 // If RENEWAL_DROP, Bubble Gum, or any other modifiers are active autoloot
 // will take them into account.
 autoloot_adjust: 0
-
-// Does autoloot work when a monster is killed by mercenary only?
-mercenary_autoloot: no
-
-// Is getting items from a mercenary disabled when their master's idle?
-// Set to no, or the amount of seconds (NOT milliseconds) that need to pass before considering
-// a character idle.
-// Characters in a chat/vending are always considered idle.
-// A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
-// Their master will only receive items if 'mercenary_autoloot' is activated,
-// otherwise they will be dropped on the ground as usual.
-// NOTE: This option uses a special timer to track idle time, separated from the normal idle timer.
-mer_idle_no_share: no
-
-// How the server should measure the mercenary master's idle time? (Note 3)
-// (This will only work if 'mer_idle_no_share' is enabled).
-// 0x001 - Walk Request
-// 0x002 - UseSkillToID Request (Targetted skill use attempt)
-// 0x004 - UseSkillToPos Request (AoE skill use attempt)
-// 0x008 - UseItem Request (Including equip/unequip)
-// 0x010 - Attack Request
-// 0x020 - Chat Request (Whisper, Party, Guild, Battlegrounds, etc)
-// 0x040 - Sit/Standup Request
-// 0x080 - Emotion Request
-// 0x100 - DropItem Request
-// 0x200 - @/#Command Request
-// Please note that at least 1 option has to be enabled.
-// Be mindful that the more options used, the easier it becomes to cheat this features.
-// Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) = 0x1F
-// NOTE: This allows you to configure different settings for mercenary, separated from normal idle timer and 'idletime_option'.
-// It will only apply to mercenary-only kills and it will not affect normal autoloot and party share options.
-idletime_mer_option: 0x1F
-
-// If drop rate was below this amount and bonus is applied to it, the bonus can't make it exceed this amount.
-drop_rate_cap: 9000
-drop_rate_cap_vip: 9000
-
-// Displays a colored pillar effect for items dropped by monsters that contain random options.
-rndopt_drop_pillar: on
--- a/conf/battle/exp.conf
+++ b/conf/battle/exp.conf
@@ -102,11 +102,6 @@ disp_zeny: no
 // through external means (ie: stat point buyers/sellers)
 use_statpoint_table: yes

-// Use the contents of db/statpoint.yml when doing a stats reset and leveling up? (Note 1)
-// If no, an equation will be used which preserves trait points earned/lost 
-// through external means (ie: trait point buyers/sellers)
-use_traitpoint_table: yes
-
 // EXP cost for cast PR_REDEMPTIO (Note 2)
 exp_cost_redemptio: 1

@@ -114,3 +109,6 @@ exp_cost_redemptio: 1
 // If by default, the 'exp_cost_redemptio' is 1 (1%) and every single player revived the penalty is reduced to 0.2%,
 // it means 'exp_cost_redemptio_limit' is 5.
 exp_cost_redemptio_limit: 5
+
+// EXP cost for cast LG_INSPIRATION (Note 2)
+exp_cost_inspiration: 1
--- a/conf/battle/feature.conf
+++ b/conf/battle/feature.conf
@@ -71,10 +71,6 @@ feature.roulette: on
 // Requires: 2015-05-13aRagexe or later
 feature.achievement: on

-// Refine UI (Note 1)
-// Requires: 2016-10-12aRagexeRE or later
-feature.refineui: on
-
 // Equipment Switch (Note 1)
 // Requires: 2017-02-08bRagexeRE or later
 feature.equipswitch: on
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -18,7 +18,6 @@ guild_max_castles: 0

 // Activate guild skills delay by relog?
 // Official setting is 5 minutes (300000 ms), otherwise allow guild leaders to relog to cancel the 5 minute delay.
-// Note: This was changed in renewal in favor of individual skill cooldown.
 guild_skill_relog_delay: 300000

 // Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -52,9 +52,14 @@ dead_branch_active: yes
 // Change to 'yes' to only summon monsters less than or equal to the player's base level.
 random_monster_checklv: no

+// Can any player equip any item regardless of the gender restrictions
+// NOTE: Wedding Rings and Whips/Musical Instruments will check gender regardless of setting.
+ignore_items_gender: yes
+
 // On map change it will check for items not tagged as "available" and
 // auto-delete them from inventory/cart/storage.
-// NOTE: An item is not available if it was not loaded from the item_db.
+// NOTE: An item is not available if it was not loaded from the item_db or
+// specified as unavailable in db/item_avail.txt
 // 0x1: Inventory
 // 0x2: Cart
 // 0x4: Storage
@@ -98,7 +103,7 @@ item_enabled_npc: yes
 // Default: yes
 item_flooritem_check: yes

-// Set default bound type when item with BindOnEquip flag is equipped (see db/[pre-]re/item_db.yml)
+// Set default bound type for item_flag &8 (see db/[pre-]re/item_flag.txt
 // 0 - None
 // 1 - Account
 // 2 - Guild
@@ -115,6 +120,11 @@ default_bind_on_equip: 4
 // 0x8 = Only Guild Leader can sell BOUND_GUILD items to Shops or Itemshops (if 0x1 or 0x4 set)
 allow_bound_sell: 0x0

+// Turn on event refine chance (see db/{pre-}re/refine_db.yml)
+// no = normal refine chances in effect (official/default value)
+// yes = event refine chances in effect
+event_refine_chance: no
+
 // Hide n last characters of player's name with asterisk (*) when the player
 // obtained an item with special broadcast flag.
 // Note: Players with short names can be fully converted to asterisks if this
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -183,3 +183,8 @@ mail_delay: 1000

 // Hides items from the player's favorite tab from being sold to a NPC. (Note 1)
 hide_fav_sell: no
+
+// Block the player from moving, using/picking/dropping items, using skills, chatting, and swapping equipment while changing maps.
+// Disables the ability for players to pre-cast skills when changing maps to avoid cast times.
+// Duration is in milliseconds. Set to 0 to disable.
+blocking_play_delay: 20000
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -136,14 +136,6 @@ mob_spawn_delay: 100
 plant_spawn_delay: 100
 boss_spawn_delay: 100

-// Should the mobs respawn time have variance applied to it? (Note 3)
-// On official servers monsters spawned by the boss_monster command (mostly MVPs) have variance, legacy Athena behavior is that variance is applied for all mobs.
-// 0: None
-// 1: Boss monsters (official)
-// 2: Normal monsters
-// 3: All monsters (legacy Athena)
-mob_spawn_variance: 1
-
 // Should mobs not spawn within the viewing range of players?
 // 0 is disabled, otherwise it is the number of retries before giving up 
 // and spawning the mob within player-view anyway, unless the max (100) is used,
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -74,9 +74,6 @@ max_third_aspd: 193
 // Max ASPD for extended class (Kagerou/Oboro and Rebellion). (Default 193, Highest allowed 199)
 max_extended_aspd: 193

-// Max ASPD for Summoner Class (Doram). (Default 193, Highest allowed 199)
-max_summoner_aspd: 193
-
 // Maximum walk speed rate (200 would be capped to twice the normal speed)
 max_walk_speed: 300

@@ -108,7 +105,6 @@ max_baby_parameter: 80
 max_baby_third_parameter: 117
 max_extended_parameter: 125
 max_summoner_parameter: 120
-max_fourth_parameter: 130

 // Status points bonus for transcendent class
 transcendent_status_points: 52
@@ -285,45 +281,3 @@ idletime_option: 0x7C1F
 // - Summoners are small size (0) instead of medium (1)
 summoner_race: 11
 summoner_size: 0
-
-//================================
-// 4th Job Systems
-//================================
-// How many trait points do players get when changing to a 4th job?
-// Default: 7
-trait_points_job_change: 7
-
-// Max trait stats cap.
-// Trait Stats: POW, STA, WIS, SPL, CON, CRT
-// Official is 100.
-max_trait_parameter: 100
-
-// Max amount of RES/MRES to take into the resistance damage reduction formula.
-// A setting of 625 means the max reduction of damage allowed is 50.0%.
-// Formula is 100 - 100 * (5000 + RES) / (5000 + 10 * RES)
-// Note: Best to leave this setting alone unless you know what your doing.
-// Default: 625
-max_res_mres_reduction: 625
-
-// Maximum AP
-// Default: 1000
-max_ap: 1000
-
-// Players' maximum AP rate? (Default is 100)
-ap_rate: 100
-
-// The amount of AP a player will respawn with, 0 is default.
-// (Unit is in percentage of total AP, 100 is full heal of AP, 0 is respawn with 0 AP total.)
-restart_ap_rate: 0
-
-// Is AP lost when the player dies?
-// Default: yes
-loose_ap_on_death: yes
-
-// Is AP lost when the player enters a PVP/GVG/WoE/Battleground maps?
-// Default: yes
-loose_ap_on_map: yes
-
-// Do player's keep their AP when logging out?
-// Default: yes
-keep_ap_on_logout: yes
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -274,9 +274,8 @@ sg_miracle_skill_duration: 3600000
 sg_angel_skill_ratio: 10

 // Skills that bHealPower has effect on
-// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun,
-// 32: Coluceo Heal, 64: Highness Heal, 128: Mediale Votum, 256: Dilectio Heal
-skill_add_heal_rate: 487
+// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun
+skill_add_heal_rate: 7

 // Whether the damage of EarthQuake with a single target on screen is able to be reflected.
 // Note: On official servers, EQ is reflectable when there is only one target on the screen, 
@@ -304,7 +303,7 @@ dancing_weaponswitch_fix: yes
 // 3: 1+2
 skill_trap_type: 0

-// Area of Bowling Bash chain reaction (pre-renewal only)
+// Area of Bowling Bash chain reaction
 // 0: Use official gutter line system
 // 1: Gutter line system without demi gutter bug
 // 2-20: Area around caster (2 = 5x5, 3 = 7x7, 4 = 9x9, ..., 20 = 41x41)
@@ -342,9 +341,9 @@ arrow_shower_knockback: yes
 stormgust_knockback: yes

 // For RENEWAL_CAST (Note 2)
-// By default skill that has '-1' value for Fixed Casting Time will use 20% of cast time
+// By default skill that has '0' value for Fixed Casting Time will use 20% of cast time
 // as Fixed Casting Time, and the rest (80%) as Variable Casting Time.
-// Put it 0 to disable default Fixed Casting Time (just like 0 in the skill_db.yml).
+// Put it 0 to disable default Fixed Casting Time (just like -1 in the skill_db.yml).
 default_fixed_castrate: 20

 // On official servers, skills that hit all targets on a path (e.g. Focused Arrow Strike and First Wind) first
@@ -411,7 +410,3 @@ skill_drop_items_full: no
 // 2: Enabled on renewal.
 // 3: 1+2
 switch_remove_edp: 2
-
-// Max Level Difference when casting Meister's Attack Machine on other party members.
-// Default: 15
-attack_machine_level_difference: 15
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -197,7 +197,7 @@ char_del_restriction: 3
 // Uncomment to customize the restriction
 //allowed_job_flag: 3

-// Folder that contains the database files.
+// What folder the DB files are in (item_db.txt, etc.)
 db_path: db

 //===================================
@@ -290,8 +290,4 @@ mail_delete_days: 15
 // Default: yes
 mail_retrieve: yes

-// Should mails without any attachments be returned to their sender?
-// Default: yes
-mail_return_empty: yes
-
 import: conf/import/char_conf.txt
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -12,9 +12,6 @@ inter_log_filename: log/inter.log
 // Level range for sharing within a party
 party_share_level: 15

-// Amount of status points a new character will start with
-start_status_points: 48
-
 // You can specify the codepage to use in your MySQL tables here.
 // (Note that this feature requires MySQL 4.1+)
 //default_codepage:
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1247,7 +1247,7 @@ map: rebel_in
 map: 1@md_gef
 map: 1@md_pay

-// Rockridge
+// Localizing Rockridge
 map: har_in01
 map: harboro1
 map: harboro2
@@ -1260,29 +1260,29 @@ map: rockrdg2
 map: 1@gl_k2
 map: 2@gl_k2

-// Newbie Mode Horror Toy Factory
+// Chicken Mode Horror Toy Factory
 map: 1@xm_d2

-// Illusion Of Moonlight
+// Illusion Payon (Moonlight)
 map: pay_d03_i

-// Illusion Of Vampire
+// Illusion Geffen (Vampire)
 map: gef_d01_i

-// Illusion Of Frozen
+// Illusion Ice (Frozen)
 map: ice_d03_i

 // Suspicious shipwreck
 map: 1@tre

-// Poring Village
+// Poring Town
 map: 1@begi

-// Illusion Of Turtle Island
+// Illusion Turtle island (Archery)
 map: tur_d03_i
 map: tur_d04_i

-// Volcanic island Comodo
+// Volcanic island Korodo
 map: 1@crd

 // ??
@@ -1313,10 +1313,10 @@ map: vis_h02
 map: vis_h03
 map: vis_h04

-// Illusion of Teddy Bear
+// Illusion Teddy Bear Nasarian Empire
 map: ein_d02_i

-// Illusion of Luanda
+// Illusion Ruande
 map: com_d02_i

 // Soul Reaper Job Change
@@ -1345,143 +1345,6 @@ map: 2012rwc_06
 map: 2012rwc_07
 map: 2012rwc_08

-// ep17.1
-map: 1@cor
-map: 1@os_a
-map: 1@os_b
-map: 1@rgsr
-map: gl_cas01_
-map: mag_dun03
-map: pub_cat
-map: rgsr_in
-map: sp_cor
-map: sp_os
-map: sp_rudus
-map: sp_rudus2
-map: sp_rudus3
-
-// ep17.2
-map: 1@bamn
-map: 1@bamq
-map: 1@ghg
-map: 1@herbs
-map: 1@lost
-map: ba_2whs01
-map: ba_2whs02
-map: ba_bath
-map: ba_in01
-map: ba_lib
-map: ba_maison
-map: ba_pw01
-map: ba_pw02
-map: ba_pw03
-map: 1@odin
-map: ba_chess
-map: ba_go
-map: ba_lost
-
-// Illusion of Labyrinth
-map: prt_mz03_i
-
-// Illusion of Underwater
-map: iz_d04_i
-map: iz_d05_i
-
-// 4th jobs change
-map: 1@4win
-map: 1@4mag
-map: 1@4mst
-map: 1@4sac
-map: 1@4tro
-map: 1@4inq
-map: 1@4cdn
-map: 1@4igd
-map: 1@4drk
-map: job4_bio
-map: job4_mag
-map: job4_tro
-
-// Gefen Night Arena
-map: 1@ge_sn
-
-// Traces of heroes
-map: 1@mjo1
-map: 1@mjo2
-map: 1@spa2
-
-// Instance Thanatos Tower
-map: 1@thts
-map: 2@thts
-map: 3@thts
-map: 4@thts
-map: 5@thts
-map: 6@thts
-map: 7@thts
-map: 8@thts
-
-// Glastheim Challenge Mode
-map: 1@gl_he
-map: 1@gl_he2
-
-// EDDA
-map: 1@gl_prq
-map: 1@gol1
-map: 1@gol2
-
-// 2018 Halloween
-map: 1@halo
-
-// Constellation Tower
-map: 1@ch_t
-map: 2@ch_t
-map: 3@ch_t
-
-// Level 200 Expansion
-map: abyss_04
-map: ein_dun03
-map: odin_past
-
-// Grade Enhancer
-map: grademk
-
-// Level 250 Expansion
-map: sp_rudus4
-map: amicitia1
-map: amicitia2
-map: nif_dun01
-map: nif_dun02
-
-// // Monster Invasion event
-map: e_hugel
-
-// Training Ground outside Prontera
-map: tra_fild
-
-// Episode 18: Direction of Prayer
-map: 1@adv
-map: 1@advs
-map: 1@nyr
-map: 1@oz
-map: 1@tcamp
-map: 2@nyr
-map: gw_fild01
-map: gw_fild02
-map: oz_dun01
-map: oz_dun02
-map: que_thr
-map: wolfvill
-
-// Sunken tower
-map: 1@ch_u
-
-// Illusion of Twins
-map: ant_d02_i
-
-// ??
-map: verus02_a
-map: verus02_b
-map: tur_d04ia
-map: tur_d04ib

 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
--- a/conf/msg_conf/char_msg.conf
+++ b/conf/msg_conf/char_msg.conf
@@ -129,26 +129,6 @@
 119: Soul Reaper
 120: Baby Star Emperor
 121: Baby Soul Reaper
-122: Dragon Knight
-123: Meister
-124: Shadow Cross
-125: Arch Mage
-126: Cardinal
-127: Windhawk
-128: Imperial Guard
-129: Biolo
-130: Abyss Chaser
-131: Elemental Master
-132: Inquisitor
-133: Troubadour
-134: Trouvere
-135: Sky Emperor
-136: Soul Ascetic
-137: Shinkiro
-138: Shiranui
-139: Night Watch
-140: Hyper Novice
-141: Spirit Handler

 199: Unknown Job

--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -429,8 +429,8 @@
 404: War of Emperium SE is currently in progress.
 405: War of Emperium SE has been ended.
 406: War of Emperium SE is currently not in progress.
+//407: free
 //chrif related
-407: Char-Server disconnected
 408: Need disconnection to perform change-sex request...
 409: Your sex has been changed (need disconnection by the server)...
 //410-411 used by cash shop
@@ -464,7 +464,7 @@
 // Homunculus messages
 450: You already have a homunculus

-451: Cash Shop is disabled on this map.
+//451 free

 // Message System
 460: Please enter a valid language (usage: @langtype <language>).
@@ -751,7 +751,7 @@
 716: Your '%s' is now: %d

 // MVP EXP reward message
-717: Congratulations! You are the MVP! Your reward EXP Points are %llu !!
+717: Congratulations! You are the MVP! Your reward EXP Points are %u !!

 // @showrate
 718: Personal rate information is not displayed now.
@@ -836,10 +836,7 @@
 // Achievements
 772: Achievements are disabled.

-// @refineui
-773: This command requires packet version 2016-10-12 or newer.
-774: This command is disabled via configuration.
-775: You have already opened the refine UI.
+//773-775 reserved for refine UI
 //776-781 reserved for tax system

 782: Star Emperor
@@ -871,55 +868,7 @@
 // @reloadattendancedb
 795: Attendance database has been reloaded.

-// NoRODEX Mapflag
-796: You cannot use RODEX on this map.
-
-797: This command is unavailable to non-4th class.
-
-//798-799 free
-
-800: Dragon Knight
-801: Meister
-802: Shadow Cross
-803: Arch Mage
-804: Cardinal
-805: Windhawk
-806: Imperial Guard
-807: Biolo
-808: Abyss Chaser
-809: Elemental Master
-810: Inquisitor
-811: Troubadour
-812: Trouvere
-813: Sky Emperor
-814: Soul Ascetic
-815: Shinkiro
-816: Shiranui
-817: Night Watch
-818: Hyper Novice
-819: Spirit Handler
-
-// @trpoint
-820: Please enter a number (usage: @trpoint <number of points>).
-
-// @chargeap
-821: AP recovered.
-822: AP modified.
-823: AP have already been recovered.
-
-// @displayskillcast
-824: Usage: @displayskillcast <skill ID> {<skill level> <ground target flag> <cast time>}
-
-// @displayskill (2nd Message Line)
-825: Effect Types: 0: All, 1: Damage, 2: Splash Dmg, 3: No Damage, 4: Ground
-
-// @displayskillunit
-826: Usage: @displayskillunit <unit ID> {<skill level> <range>}
-
-// @mobinfo RES/MRES
-827:  RES:%d  MRES:%d
-
-//828-899 free
+//796-899 free

 //------------------------------------
 // More atcommands message
@@ -1240,7 +1189,7 @@
 1165: Usage: @useskill <skill ID> <skill level> <char name>

 // @displayskill
-1166: Usage: @displayskill <skill ID> {<skill level> <type>}
+1166: Usage: @displayskill <skill ID> {<skill level>}

 // @skilltree
 1167: Usage: @skilltree <skill ID> <char name>
@@ -1378,12 +1327,12 @@
 1239: Please enter a monster name/ID (usage: @mobinfo <monster_name_or_monster_ID>).
 1240: MVP Monster: '%s'/'%s'/'%s' (%d)
 1241: Monster: '%s'/'%s'/'%s' (%d)
-1242:  Lv:%d  HP:%d  Base EXP:%llu  Job EXP:%llu  HIT:%d  FLEE:%d
+1242:  Lv:%d  HP:%d  Base EXP:%u  Job EXP:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)
 1245:  Drops:
 1246: This monster has no drops.
-1247:  MVP Bonus EXP:%llu
+1247:  MVP Bonus EXP:%u
 1248:  MVP Items:
 1249: This monster has no MVP prizes.

--- a/conf/msg_conf/map_msg_chn.conf
+++ b/conf/msg_conf/map_msg_chn.conf
@@ -441,7 +441,7 @@
 // Homunculus messages
 450: 你已經擁有一個人工生命體了

-451: Cash Shop is disabled on this map.
+//451 free

 // Message System
 460: 請輸入合法的語言 (usage: @langtype <language>).
@@ -1134,12 +1134,12 @@
 1239: 請輸入魔物名稱或魔物ID (用法: @mobinfo <魔物名稱或魔物ID>).
 1240: MVP 魔物: '%s'/'%s'/'%s' (%d)
 1241: 魔物: '%s'/'%s'/'%s' (%d)
-1242: 等級:%d  血量:%d  基本經驗值:%llu  職業經驗值:%llu  命中率:%d  迴避率:%d
+1242: 等級:%d  血量:%d  基本經驗值:%u  職業經驗值:%u  命中率:%d  迴避率:%d
 1243: 防禦:%d  魔防:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244: 物理攻擊力:%d~%d 攻擊範圍:%d~%d~%d  體型:%s  種族: %s  屬性: %s (Lv:%d)
 1245: 掉落:
 1246: 此魔物不掉落道具.
-1247: MVP額外經驗值:%llu
+1247: MVP額外經驗值:%u
 1248: MVP額外獎勵道具:
 1249: 此魔物無MVP額外獎勵道具.

--- a/conf/msg_conf/map_msg_frn.conf
+++ b/conf/msg_conf/map_msg_frn.conf
@@ -449,7 +449,7 @@
 // Homunculus messages
 450: Vous possédez déjà un homunculus

-451: Cash Shop is disabled on this map.
+//451 free

 // Message System
 460: Entrez une langue (usage: @langtype <langue>).
@@ -1147,12 +1147,12 @@
 1239: Entrez un nom de monstre/ID (usage: @mobinfo <nom_du_monstre_ou_ID>).
 1240: Monstre MVP: '%s'/'%s'/'%s' (%d)
 1241: Monstre: '%s'/'%s'/'%s' (%d)
-1242:  Lv:%d  HP:%d  Base EXP:%llu  Job EXP:%llu  HIT:%d  FLEE:%d
+1242:  Lv:%d  HP:%d  Base EXP:%u  Job EXP:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Elément: %s (Lv:%d)
 1245:  Drops:
 1246: Ce monstre n'a pas de drops.
-1247:  MVP Bonus EXP:%llu
+1247:  MVP Bonus EXP:%u
 1248:  MVP Items:
 1249: Ce monstre n'a pas de Prix spécial MVP.

--- a/conf/msg_conf/map_msg_grm.conf
+++ b/conf/msg_conf/map_msg_grm.conf
@@ -407,8 +407,6 @@
 // Homunculus messages
 450: Du hast bereitz ein Homunculus

-451: Cash Shop is disabled on this map.
-
 // Messages of others (Nicht für GM commands)
 // ----------------------------------------

--- a/conf/msg_conf/map_msg_idn.conf
+++ b/conf/msg_conf/map_msg_idn.conf
@@ -459,7 +459,7 @@
 // Pesan-pesan untuk Homunculus
 450: Kamu sudah memiliki homunculus

-451: Cash Shop is disabled on this map.
+//451 free

 // Sistem Pesan
 460: Harap masukkan tipe bahasa yang valid. (Penggunaan: @langtype <bahasa>).
@@ -743,6 +743,9 @@
 715: Point Shop: '%s'
 716: '%s' milikmu saat ini: %d

+//Item Group
+717: [%s] mendapatkan [%s] dari '%s'
+
 //@showrate
 718: Informasi mengenai rate pribadi tidak akan ditampilkan lagi.
 719: Informasi mengenai rate pribadi akan ditampilkan kembali.
@@ -1240,7 +1243,7 @@
 1244: ATK:%d~%d  Jarak:%d~%d~%d  Ukuran:%s  Race: %s  Elemen: %s (Lv:%d)
 1245: Barang yang dijatuhkan:
 1246: Monster ini tidak menjatuhkan barang.
-1247: Bonus EXP MVP:%llu
+1247: Bonus EXP MVP:%u
 1248: Item MVP:
 1249: Monster ini tidak memiliki bonus MVP.

--- a/conf/msg_conf/map_msg_por.conf
+++ b/conf/msg_conf/map_msg_por.conf
--- a/conf/msg_conf/map_msg_rus.conf
+++ b/conf/msg_conf/map_msg_rus.conf
@@ -449,7 +449,7 @@
 // Сообщения команды @makehomun
 450: У вас уже есть гомункулус

-451: Cash Shop is disabled on this map.
+//451 free

 // @langtype
 460: Введите существующий язык (Используйте: @langtype <язык>).
@@ -1147,12 +1147,12 @@
 1239: Введите ID/название монстра (Использование: @mobinfo <ID/название монстра>).
 1240: MVP монстр: '%s'/'%s'/'%s' (%d)
 1241: Монстр: '%s'/'%s'/'%s' (%d)
-1242:  Ур.:%d  HP:%d  Базовый опыт:%llu   Проф. опыт:%llu  HIT:%d  FLEE:%d
+1242:  Ур.:%d  HP:%d  Базовый опыт:%u   Проф. опыт:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Дальность:%d~%d~%d  Размер:%s  Раса: %s  Элемент: %s (Ур.:%d)
 1245:  Предметы:
 1246: С этого монстра не падают предметы.
-1247:  MVP бонус к опыту:%llu
+1247:  MVP бонус к опыту:%u
 1248:  MVP предметы:
 1249:  Этот монстр не имеет MVP призов.

--- a/conf/msg_conf/map_msg_spn.conf
+++ b/conf/msg_conf/map_msg_spn.conf
@@ -458,7 +458,7 @@
 // Mensajes de homúnculos
 450: Ya tienes un homúnculo.

-451: Cash Shop is disabled on this map.
+//451 free

 // Sistema de mensajería
 460: Introduce un idioma válido (instrucciones: @langtype <idioma>)
@@ -745,7 +745,7 @@
 716: Tu '%s' ahora es: %d

 // MVP EXP reward message
-717: ¡Enhorabuena! ¡Eres todo un MVP! ¡¡Puntos de experiencia obtenidos: %llu!!
+717: ¡Enhorabuena! ¡Eres todo un MVP! ¡¡Puntos de experiencia obtenidos: %u!!

 // @showrate
 718: La información de ratio personal no se mostrará.
@@ -1286,12 +1286,12 @@
 1239: Introduce el nombre/ID de un monstruo (instrucciones: @mobinfo <nombre/ID del monstruo>).
 1240: Monstruo MVP: '%s'/'%s'/'%s' (%d)
 1241: Monstruo: '%s'/'%s'/'%s' (%d)
-1242: Nv:%d  HP:%d  EXP de base:%llu  EXP de oficio:%llu  HIT:%d  FLEE:%d
+1242: Nv:%d  HP:%d  EXP de base:%u  EXP de oficio:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Rango:%d~%d~%d  Tamaño:%s  Raza: %s  Elemento: %s (Nv:%d)
 1245: Objetos:
 1246: Este monstruo no tiene ningún objeto.
-1247: Bono de EXP MVP:%llu
+1247: Bono de EXP MVP:%u
 1248: Objetos MVP:
 1249: Este monstruo no tiene ningún objeto de MVP.

--- a/conf/msg_conf/map_msg_tha.conf
+++ b/conf/msg_conf/map_msg_tha.conf
@@ -447,7 +447,7 @@
 // Homunculus messages
 450: ¤<>³<EFBFBD><C2B3> Homunculus <20><><EFBFBD>טב<D798>י<EFBFBD>.

-451: Cash Shop is disabled on this map.
+//451 free

 // Message System
 460: ג»<D792>´א<C2B4><D790><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>טµי<C2B5>§<EFBFBD><C2A7><EFBFBD> (<28><>¸<EFBFBD>ד×י: @langtype <<3C><><EFBFBD><EFBFBD>>).
@@ -1140,12 +1140,12 @@
 1239: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID Monster (<28><>¸<EFBFBD>ד×י: @mobinfo <×<>ט<EFBFBD>/ID mob>).
 1240: MVP Monster: '%s'/'%s'/'%s' (%d)
 1241: Monster: '%s'/'%s'/'%s' (%d)
-1242:  Lv:%d  HP:%d  Base EXP:%llu  Job EXP:%llu  HIT:%d  FLEE:%d
+1242:  Lv:%d  HP:%d  Base EXP:%u  Job EXP:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)
 1245:  Drops:
 1246: Monster ¹<>יה<D799>ט<EFBFBD><D798>¢<EFBFBD>§µ<C2A7>.
-1247:  MVP Bonus EXP:%llu
+1247:  MVP Bonus EXP:%u
 1248:  MVP Items:
 1249: Monster ¹<>יה<D799>ט<EFBFBD><D798>¢<EFBFBD>§<EFBFBD><C2A7>§<EFBFBD><C2A7><EFBFBD> MVP.

--- a/db/abra_db.yml
+++ b/db/abra_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/achievement_db.yml
+++ b/db/achievement_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2017 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -16,34 +16,70 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 ###########################################################################
-# Achievement Database
+# Renewal Achievement Database
 ###########################################################################
 #
 # Achievement Settings
 #
 ###########################################################################
-# - Id                  Achievement ID.
-#   Group               Achievement group type. (Defaut: None)
-#   Name                Achievement name.
-#   Targets:            List of targets the achievement requires. (Default: null)
-#     - Id              Index value used for import methods.
-#       Mob             Target mob. (Default: 0)
-#       Count           Target count. (Default: 1)
-#   Condition           Conditional statement that must be met for the achievement to be considered complete. (Default: null)
-#   Map                 Map name that is used for the AG_CHATTING type. (Default: -1)
-#   Dependents:         List of achievements that need to be completed before this achievement is considered complete. (Default: null)
-#     - Id: <bool>      Achievement ID pre-requisite.
-#   Rewards:            List of rewards that are given on completion. (Default: null)
-#     Item              Item name.
-#     Amount            Amount of item. (Default: 1)
-#     Script            Bonus Script. (Default: null)
-#     TitleId           Title ID. (Default: 0)
-#   Score               Achievement points that are given on completion. (Default: 0)
+# ID - Unique achievement ID.
+###########################################################################
+# Group - Achievement group type. Each achievement type calls a specific
+# objective check.
+# Valid groups:
+#  AG_ADD_FRIEND
+#  AG_ADVENTURE
+#  AG_BABY
+#  AG_BATTLE
+#  AG_CHATTING
+#  AG_CHATTING_COUNT
+#  AG_CHATTING_CREATE
+#  AG_CHATTING_DYING
+#  AG_EAT
+#  AG_GET_ITEM
+#  AG_GET_ZENY
+#  AG_GOAL_ACHIEVE
+#  AG_GOAL_LEVEL
+#  AG_GOAL_STATUS
+#  AG_HEAR
+#  AG_JOB_CHANGE
+#  AG_MARRY
+#  AG_PARTY
+#  AG_ENCHANT_FAIL
+#  AG_ENCHANT_SUCCESS
+#  AG_SEE
+#  AG_SPEND_ZENY
+#  AG_TAMING
+###########################################################################
+# Name - Achievement name. Used when sending rewards through RODEX.
+###########################################################################
+# Target - A list of monster ID and count values that the achievement
+# requires. The target count can also be used for achievements that keep
+# a counter while not being related to monster kills.
+# Capped at MAX_ACHIEVEMENT_OBJECTIVES.
+###########################################################################
+# Condition - A conditional statement that must be met for the achievement
+# to be considered complete.
+###########################################################################
+# Map - A map name that is used for the AG_CHATTING type which increments
+# the counter based on the player's map.
+###########################################################################
+# Dependent: - A list of achievement IDs that need to be completed before
+# this achievement is considered complete.
+###########################################################################
+# Reward - A list of rewards that are given on completion. All fields are
+# optional.
+#   ItemID: Item ID
+#   Amount:  Amount of Item ID (default 1)
+#   Script: Bonus Script
+#   TitleID: Title ID
+###########################################################################
+# Score - Achievement points that are given on completion.
 ###########################################################################

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

 Footer:
  Imports:
--- a/db/achievement_level_db.yml
+++ b/db/achievement_level_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -22,8 +22,9 @@
 # Achievement Level Settings
 #
 ###########################################################################
-# - Level     Achievement Level.
-#   Points    Required total scoring points to reach this level.
+# Level - Achievement Level
+###########################################################################
+# Points - Required total scoring points to reach this level.
 ###########################################################################

 Header:
--- a/db/attendance.yml
+++ b/db/attendance.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/attr_fix.yml
+++ b/db/attr_fix.yml
@@ -1,40 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2019 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/>.
-#
-###########################################################################
-# Elemental Attribute Damage Adjustment Tables
-###########################################################################
-#
-# Elemental Attribute Damage Adjustment Settings
-#
-###########################################################################
-# - Level                        Level of the Attribute.
-#   <element>:                   Attacker's weapon element.
-#       <element>: <value>       Target's defense element. <value> in %, default 100. Value accepted from -100 to 200.
-###########################################################################
-
-Header:
-  Type: ATTRIBUTE_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/attr_fix.yml
-    Mode: Prerenewal
-  - Path: db/re/attr_fix.yml
-    Mode: Renewal
-  - Path: db/import/attr_fix.yml
--- a/db/battleground_db.yml
+++ b/db/battleground_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/castle_db.txt
+++ b/db/castle_db.txt
@@ -0,0 +1,62 @@
+// Guild Castles Database
+//
+// Structure of Database:
+// CastleID,MapName,CastleName,OnGuildBreakEventName,Flag
+//
+// 01. CastleID                 Unique ID of the castle. Must remain unique across all map-servers.
+// 02. MapName                  Map name to be considered as the castle map.
+// 03. CastleName               Name of the castle (used by scripts and guardian name tags).
+// 04. OnGuildBreakEventName    NPC unique name to invoke ::OnGuildBreak on, when a occupied
+//                              castle is abandoned during guild break.
+
+// WOE FE castle
+0,aldeg_cas01,Neuschwanstein,Agit#aldeg_cas01	// kRO : Noisyubantian
+1,aldeg_cas02,Hohenschwangau,Agit#aldeg_cas02	// kRO : Hohensyubangawoo
+2,aldeg_cas03,Nuernberg,Agit#aldeg_cas03		// kRO : Nyirenverk
+3,aldeg_cas04,Wuerzburg,Agit#aldeg_cas04		// kRO : Byirtsburi
+4,aldeg_cas05,Rothenburg,Agit#aldeg_cas05		// kRO : Rotenburk
+5,gefg_cas01,Repherion,Agit#gefg_cas01			// kRO : Reprion
+6,gefg_cas02,Eeyolbriggar,Agit#gefg_cas02		// kRO : Yolbriger
+7,gefg_cas03,Yesnelph,Agit#gefg_cas03			// kRO : Isinlife
+8,gefg_cas04,Bergel,Agit#gefg_cas04				// kRO : Berigel
+9,gefg_cas05,Mersetzdeitz,Agit#gefg_cas05		// kRO : Melsedetsu
+10,payg_cas01,Bright Arbor,Agit#payg_cas01		// kRO : Mingting
+11,payg_cas02,Scarlet Palace,Agit#payg_cas02	// kRO : Tiantan
+12,payg_cas03,Holy Shadow,Agit#payg_cas03		// kRO : Fuying
+13,payg_cas04,Sacred Altar,Agit#payg_cas04		// kRO : Honglou
+14,payg_cas05,Bamboo Grove Hill,Agit#payg_cas05	// kRO : Zhulinxian
+15,prtg_cas01,Kriemhild,Agit#prtg_cas01			// kRO : Creamhilt
+16,prtg_cas02,Swanhild,Agit#prtg_cas02			// kRO : Sbanhealt
+17,prtg_cas03,Fadhgridh,Agit#prtg_cas03			// kRO : Lazrigees
+18,prtg_cas04,Skoegul,Agit#prtg_cas04			// kRO : Squagul
+19,prtg_cas05,Gondul,Agit#prtg_cas05			// kRO : Guindull
+
+// WOE NGuild castle
+20,nguild_alde,Earth,Agit_N01
+21,nguild_gef,Air,Agit_N02
+22,nguild_pay,Water,Agit_N03
+23,nguild_prt,Fire,Agit_N04
+
+// WOE SE castle
+24,schg_cas01,Himinn,Manager#schg_cas01			// kRO : Himinn
+25,schg_cas02,Andlangr,Manager#schg_cas02		// kRO : Andlangr
+26,schg_cas03,Viblainn,Manager#schg_cas03		// kRO : Viblainn
+27,schg_cas04,Hljod,Manager#schg_cas04			// kRO : Hljod
+28,schg_cas05,Skidbladnir,Manager#schg_cas05	// kRO : Skidbladnir
+29,arug_cas01,Mardol,Manager#arug_cas01			// kRO : Mardol
+30,arug_cas02,Cyr,Manager#arug_cas02			// kRO : Cyr
+31,arug_cas03,Horn,Manager#arug_cas03			// kRO : Horn
+32,arug_cas04,Gefn,Manager#arug_cas04			// kRO : Gefn
+33,arug_cas05,Bandis,Manager#arug_cas05			// kRO : Bandis
+
+// WOE TE castle
+34,te_aldecas1,Kafragarten 1,Manager_TE#Glaris
+35,te_aldecas2,Kafragarten 2,Manager_TE#Defolty
+36,te_aldecas3,Kafragarten 3,Manager_TE#Sorin
+37,te_aldecas4,Kafragarten 4,Manager_TE#Bennit
+38,te_aldecas5,Kafragarten 5,Manager_TE#W
+39,te_prtcas01,Gloria 1,Manager_TE#Gaebolg
+40,te_prtcas02,Gloria 2,Manager_TE#Richard
+41,te_prtcas03,Gloria 3,Manager_TE#Wigner
+42,te_prtcas04,Gloria 4,Manager_TE#Heine
+43,te_prtcas05,Gloria 5,Manager_TE#Nerious
--- a/db/castle_db.yml
+++ b/db/castle_db.yml
@@ -1,41 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Guild Castles Database
-###########################################################################
-#
-# Guild Castles Settings
-#
-###########################################################################
-# - Id                Unique ID of the castle.
-#   Map               Map name to be considered as the castle map.
-#   Name              Name of the castle (used by scripts and guardian name tags).
-#   Npc               NPC unique name to invoke ::OnGuildBreak on, when a occupied castle is abandoned during guild break.
-###########################################################################
-
-Header:
-  Type: CASTLE_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/castle_db.yml
-    Mode: Prerenewal
-  - Path: db/re/castle_db.yml
-    Mode: Renewal
-  - Path: db/import/castle_db.yml
--- a/db/const.txt
+++ b/db/const.txt
@@ -0,0 +1,252 @@
+// Script Constant Database
+//
+// Structure of Database:
+// Identifier	Value[	Type]
+//
+// Alternatively:
+// Identifier,Value[,Type]
+//
+// 01. Identifier   Unique name for the constant, must not have same name as script commands, functions or variables.
+// 02. Value        Value assigned to the constant. This value cannot be changed during the runtime of the server.
+// 03. Type         Specifies whether the identifier is a constant (0) or a parameter (1) (optional, defaults to 0).
+//
+// NOTE:            Parameters are special in that they retrieve certain runtime values depending on the specified ID
+//                  in field Value. Depending on the implementation values assigned by scripts to parameters will affect
+//                  runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
+
+RDMOPT_VAR_MAXHPAMOUNT	1
+RDMOPT_VAR_MAXSPAMOUNT	2
+RDMOPT_VAR_STRAMOUNT	3
+RDMOPT_VAR_AGIAMOUNT	4
+RDMOPT_VAR_VITAMOUNT	5
+RDMOPT_VAR_INTAMOUNT	6
+RDMOPT_VAR_DEXAMOUNT	7
+RDMOPT_VAR_LUKAMOUNT	8
+RDMOPT_VAR_MAXHPPERCENT	9
+RDMOPT_VAR_MAXSPPERCENT	10
+RDMOPT_VAR_HPACCELERATION	11
+RDMOPT_VAR_SPACCELERATION	12
+RDMOPT_VAR_ATKPERCENT	13
+RDMOPT_VAR_MAGICATKPERCENT	14
+RDMOPT_VAR_PLUSASPD	15
+RDMOPT_VAR_PLUSASPDPERCENT	16
+RDMOPT_VAR_ATTPOWER	17
+RDMOPT_VAR_HITSUCCESSVALUE	18
+RDMOPT_VAR_ATTMPOWER	19
+RDMOPT_VAR_ITEMDEFPOWER	20
+RDMOPT_VAR_MDEFPOWER	21
+RDMOPT_VAR_AVOIDSUCCESSVALUE	22
+RDMOPT_VAR_PLUSAVOIDSUCCESSVALUE	23
+RDMOPT_VAR_CRITICALSUCCESSVALUE	24
+RDMOPT_ATTR_TOLERACE_NOTHING	25
+RDMOPT_ATTR_TOLERACE_WATER	26
+RDMOPT_ATTR_TOLERACE_GROUND	27
+RDMOPT_ATTR_TOLERACE_FIRE	28
+RDMOPT_ATTR_TOLERACE_WIND	29
+RDMOPT_ATTR_TOLERACE_POISON	30
+RDMOPT_ATTR_TOLERACE_SAINT	31
+RDMOPT_ATTR_TOLERACE_DARKNESS	32
+RDMOPT_ATTR_TOLERACE_TELEKINESIS	33
+RDMOPT_ATTR_TOLERACE_UNDEAD	34
+RDMOPT_ATTR_TOLERACE_ALLBUTNOTHING	35
+RDMOPT_DAMAGE_PROPERTY_NOTHING_USER	36
+RDMOPT_DAMAGE_PROPERTY_NOTHING_TARGET	37
+RDMOPT_DAMAGE_PROPERTY_WATER_USER	38
+RDMOPT_DAMAGE_PROPERTY_WATER_TARGET	39
+RDMOPT_DAMAGE_PROPERTY_GROUND_USER	40
+RDMOPT_DAMAGE_PROPERTY_GROUND_TARGET	41
+RDMOPT_DAMAGE_PROPERTY_FIRE_USER	42
+RDMOPT_DAMAGE_PROPERTY_FIRE_TARGET	43
+RDMOPT_DAMAGE_PROPERTY_WIND_USER	44
+RDMOPT_DAMAGE_PROPERTY_WIND_TARGET	45
+RDMOPT_DAMAGE_PROPERTY_POISON_USER	46
+RDMOPT_DAMAGE_PROPERTY_POISON_TARGET	47
+RDMOPT_DAMAGE_PROPERTY_SAINT_USER	48
+RDMOPT_DAMAGE_PROPERTY_SAINT_TARGET	49
+RDMOPT_DAMAGE_PROPERTY_DARKNESS_USER	50
+RDMOPT_DAMAGE_PROPERTY_DARKNESS_TARGET	51
+RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_USER	52
+RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_TARGET	53
+RDMOPT_DAMAGE_PROPERTY_UNDEAD_USER	54
+RDMOPT_DAMAGE_PROPERTY_UNDEAD_TARGET	55
+RDMOPT_MDAMAGE_PROPERTY_NOTHING_USER	56
+RDMOPT_MDAMAGE_PROPERTY_NOTHING_TARGET	57
+RDMOPT_MDAMAGE_PROPERTY_WATER_USER	58
+RDMOPT_MDAMAGE_PROPERTY_WATER_TARGET	59
+RDMOPT_MDAMAGE_PROPERTY_GROUND_USER	60
+RDMOPT_MDAMAGE_PROPERTY_GROUND_TARGET	61
+RDMOPT_MDAMAGE_PROPERTY_FIRE_USER	62
+RDMOPT_MDAMAGE_PROPERTY_FIRE_TARGET	63
+RDMOPT_MDAMAGE_PROPERTY_WIND_USER	64
+RDMOPT_MDAMAGE_PROPERTY_WIND_TARGET	65
+RDMOPT_MDAMAGE_PROPERTY_POISON_USER	66
+RDMOPT_MDAMAGE_PROPERTY_POISON_TARGET	67
+RDMOPT_MDAMAGE_PROPERTY_SAINT_USER	68
+RDMOPT_MDAMAGE_PROPERTY_SAINT_TARGET	69
+RDMOPT_MDAMAGE_PROPERTY_DARKNESS_USER	70
+RDMOPT_MDAMAGE_PROPERTY_DARKNESS_TARGET	71
+RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_USER	72
+RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_TARGET	73
+RDMOPT_MDAMAGE_PROPERTY_UNDEAD_USER	74
+RDMOPT_MDAMAGE_PROPERTY_UNDEAD_TARGET	75
+RDMOPT_BODY_ATTR_NOTHING	76
+RDMOPT_BODY_ATTR_WATER	77
+RDMOPT_BODY_ATTR_GROUND	78
+RDMOPT_BODY_ATTR_FIRE	79
+RDMOPT_BODY_ATTR_WIND	80
+RDMOPT_BODY_ATTR_POISON	81
+RDMOPT_BODY_ATTR_SAINT	82
+RDMOPT_BODY_ATTR_DARKNESS	83
+RDMOPT_BODY_ATTR_TELEKINESIS	84
+RDMOPT_BODY_ATTR_UNDEAD	85
+//RDMOPT_BODY_ATTR_ALL	86
+RDMOPT_RACE_TOLERACE_NOTHING	87
+RDMOPT_RACE_TOLERACE_UNDEAD	88
+RDMOPT_RACE_TOLERACE_ANIMAL	89
+RDMOPT_RACE_TOLERACE_PLANT	90
+RDMOPT_RACE_TOLERACE_INSECT	91
+RDMOPT_RACE_TOLERACE_FISHS	92
+RDMOPT_RACE_TOLERACE_DEVIL	93
+RDMOPT_RACE_TOLERACE_HUMAN	94
+RDMOPT_RACE_TOLERACE_ANGEL	95
+RDMOPT_RACE_TOLERACE_DRAGON	96
+RDMOPT_RACE_DAMAGE_NOTHING	97
+RDMOPT_RACE_DAMAGE_UNDEAD	98
+RDMOPT_RACE_DAMAGE_ANIMAL	99
+RDMOPT_RACE_DAMAGE_PLANT	100
+RDMOPT_RACE_DAMAGE_INSECT	101
+RDMOPT_RACE_DAMAGE_FISHS	102
+RDMOPT_RACE_DAMAGE_DEVIL	103
+RDMOPT_RACE_DAMAGE_HUMAN	104
+RDMOPT_RACE_DAMAGE_ANGEL	105
+RDMOPT_RACE_DAMAGE_DRAGON	106
+RDMOPT_RACE_MDAMAGE_NOTHING	107
+RDMOPT_RACE_MDAMAGE_UNDEAD	108
+RDMOPT_RACE_MDAMAGE_ANIMAL	109
+RDMOPT_RACE_MDAMAGE_PLANT	110
+RDMOPT_RACE_MDAMAGE_INSECT	111
+RDMOPT_RACE_MDAMAGE_FISHS	112
+RDMOPT_RACE_MDAMAGE_DEVIL	113
+RDMOPT_RACE_MDAMAGE_HUMAN	114
+RDMOPT_RACE_MDAMAGE_ANGEL	115
+RDMOPT_RACE_MDAMAGE_DRAGON	116
+RDMOPT_RACE_CRI_PERCENT_NOTHING	117
+RDMOPT_RACE_CRI_PERCENT_UNDEAD	118
+RDMOPT_RACE_CRI_PERCENT_ANIMAL	119
+RDMOPT_RACE_CRI_PERCENT_PLANT	120
+RDMOPT_RACE_CRI_PERCENT_INSECT	121
+RDMOPT_RACE_CRI_PERCENT_FISHS	122
+RDMOPT_RACE_CRI_PERCENT_DEVIL	123
+RDMOPT_RACE_CRI_PERCENT_HUMAN	124
+RDMOPT_RACE_CRI_PERCENT_ANGEL	125
+RDMOPT_RACE_CRI_PERCENT_DRAGON	126
+RDMOPT_RACE_IGNORE_DEF_PERCENT_NOTHING	127
+RDMOPT_RACE_IGNORE_DEF_PERCENT_UNDEAD	128
+RDMOPT_RACE_IGNORE_DEF_PERCENT_ANIMAL	129
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLANT	130
+RDMOPT_RACE_IGNORE_DEF_PERCENT_INSECT	131
+RDMOPT_RACE_IGNORE_DEF_PERCENT_FISHS	132
+RDMOPT_RACE_IGNORE_DEF_PERCENT_DEVIL	133
+RDMOPT_RACE_IGNORE_DEF_PERCENT_HUMAN	134
+RDMOPT_RACE_IGNORE_DEF_PERCENT_ANGEL	135
+RDMOPT_RACE_IGNORE_DEF_PERCENT_DRAGON	136
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_NOTHING	137
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_UNDEAD	138
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_ANIMAL	139
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLANT	140
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_INSECT	141
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_FISHS	142
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_DEVIL	143
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_HUMAN	144
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_ANGEL	145
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_DRAGON	146
+RDMOPT_CLASS_DAMAGE_NORMAL_TARGET	147
+RDMOPT_CLASS_DAMAGE_BOSS_TARGET	148
+RDMOPT_CLASS_DAMAGE_NORMAL_USER	149
+RDMOPT_CLASS_DAMAGE_BOSS_USER	150
+RDMOPT_CLASS_MDAMAGE_NORMAL	151
+RDMOPT_CLASS_MDAMAGE_BOSS	152
+RDMOPT_CLASS_IGNORE_DEF_PERCENT_NORMAL	153
+RDMOPT_CLASS_IGNORE_DEF_PERCENT_BOSS	154
+RDMOPT_CLASS_IGNORE_MDEF_PERCENT_NORMAL	155
+RDMOPT_CLASS_IGNORE_MDEF_PERCENT_BOSS	156
+RDMOPT_DAMAGE_SIZE_SMALL_TARGET	157
+RDMOPT_DAMAGE_SIZE_MIDIUM_TARGET	158
+RDMOPT_DAMAGE_SIZE_LARGE_TARGET	159
+RDMOPT_DAMAGE_SIZE_SMALL_USER	160
+RDMOPT_DAMAGE_SIZE_MIDIUM_USER	161
+RDMOPT_DAMAGE_SIZE_LARGE_USER	162
+RDMOPT_DAMAGE_SIZE_PERFECT	163
+RDMOPT_DAMAGE_CRI_TARGET	164
+RDMOPT_DAMAGE_CRI_USER	165
+RDMOPT_RANGE_ATTACK_DAMAGE_TARGET	166
+RDMOPT_RANGE_ATTACK_DAMAGE_USER	167
+RDMOPT_HEAL_VALUE	168
+RDMOPT_HEAL_MODIFY_PERCENT	169
+RDMOPT_DEC_SPELL_CAST_TIME	170
+RDMOPT_DEC_SPELL_DELAY_TIME	171
+RDMOPT_DEC_SP_CONSUMPTION	172
+//RDMOPT_HP_DRAIN	173
+//RDMOPT_SP_DRAIN	174
+RDMOPT_WEAPON_ATTR_NOTHING	175
+RDMOPT_WEAPON_ATTR_WATER	176
+RDMOPT_WEAPON_ATTR_GROUND	177
+RDMOPT_WEAPON_ATTR_FIRE	178
+RDMOPT_WEAPON_ATTR_WIND	179
+RDMOPT_WEAPON_ATTR_POISON	180
+RDMOPT_WEAPON_ATTR_SAINT	181
+RDMOPT_WEAPON_ATTR_DARKNESS	182
+RDMOPT_WEAPON_ATTR_TELEKINESIS	183
+RDMOPT_WEAPON_ATTR_UNDEAD	184
+RDMOPT_WEAPON_INDESTRUCTIBLE	185
+RDMOPT_BODY_INDESTRUCTIBLE	186
+RDMOPT_MDAMAGE_SIZE_SMALL_TARGET	187
+RDMOPT_MDAMAGE_SIZE_MIDIUM_TARGET	188
+RDMOPT_MDAMAGE_SIZE_LARGE_TARGET	189
+RDMOPT_MDAMAGE_SIZE_SMALL_USER	190
+RDMOPT_MDAMAGE_SIZE_MIDIUM_USER	191
+RDMOPT_MDAMAGE_SIZE_LARGE_USER	192
+RDMOPT_ATTR_TOLERACE_ALL	193
+RDMOPT_RACE_WEAPON_TOLERACE_NOTHING	194
+RDMOPT_RACE_WEAPON_TOLERACE_UNDEAD	195
+RDMOPT_RACE_WEAPON_TOLERACE_ANIMAL	196
+RDMOPT_RACE_WEAPON_TOLERACE_PLANT	197
+RDMOPT_RACE_WEAPON_TOLERACE_INSECT	198
+RDMOPT_RACE_WEAPON_TOLERACE_FISHS	199
+RDMOPT_RACE_WEAPON_TOLERACE_DEVIL	200
+RDMOPT_RACE_WEAPON_TOLERACE_HUMAN	201
+RDMOPT_RACE_WEAPON_TOLERACE_ANGEL	202
+RDMOPT_RACE_WEAPON_TOLERACE_DRAGON	203
+//RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_TARGET	204
+//RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_USER	205
+RDMOPT_RACE_TOLERACE_PLAYER_HUMAN	206
+RDMOPT_RACE_TOLERACE_PLAYER_DORAM	207
+RDMOPT_RACE_DAMAGE_PLAYER_HUMAN	208
+RDMOPT_RACE_DAMAGE_PLAYER_DORAM	209
+RDMOPT_RACE_MDAMAGE_PLAYER_HUMAN	210
+RDMOPT_RACE_MDAMAGE_PLAYER_DORAM	211
+RDMOPT_RACE_CRI_PERCENT_PLAYER_HUMAN	212
+RDMOPT_RACE_CRI_PERCENT_PLAYER_DORAM	213
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_HUMAN	214
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_DORAM	215
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_HUMAN	216
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_DORAM	217
+//RDMOPT_REFLECT_DAMAGE_PERCENT	218
+RDMOPT_MELEE_ATTACK_DAMAGE_TARGET	219
+RDMOPT_MELEE_ATTACK_DAMAGE_USER	220
+//RDMOPT_ADDSKILLMDAMAGE_NOTHING	221
+//RDMOPT_ADDSKILLMDAMAGE_WATER	222
+//RDMOPT_ADDSKILLMDAMAGE_GROUND	223
+//RDMOPT_ADDSKILLMDAMAGE_FIRE	224
+//RDMOPT_ADDSKILLMDAMAGE_WIND	225
+//RDMOPT_ADDSKILLMDAMAGE_POISON	226
+//RDMOPT_ADDSKILLMDAMAGE_SAINT	227
+//RDMOPT_ADDSKILLMDAMAGE_DARKNESS	228
+//RDMOPT_ADDSKILLMDAMAGE_TELEKINESIS	229
+//RDMOPT_ADDSKILLMDAMAGE_UNDEAD	230
+
+SWORDCLAN	1
+ARCWANDCLAN	2
+GOLDENMACECLAN	3
+CROSSBOWCLAN	4
+JUMPINGCLAN	5
--- a/db/const.yml
+++ b/db/const.yml
@@ -1,51 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Script Constant Database
-###########################################################################
-#
-# Script Constant Settings
-#
-###########################################################################
-# - Name             Unique name for the constant. Must not have same name as script commands, functions, or variables.
-#   Value            Value assigned to the constant. This value cannot be changed during the runtime of the server.
-#   Parameter        Specifies whether the identifier is a parameter. (Default: false)
-#                    Note: Parameters are special in that they retrieve certain runtime values depending on the specified ID
-#                    in field Value. Depending on the implementation values assigned by scripts the parameters will affect
-#                    runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
-###########################################################################
-
-Header:
-  Type: CONSTANT_DB
-  Version: 1
-
-Body:
-  - Name: SWORDCLAN
-    Value: 1
-  - Name: ARCWANDCLAN
-    Value: 2
-  - Name: GOLDENMACECLAN
-    Value: 3
-  - Name: CROSSBOWCLAN
-    Value: 4
-  - Name: JUMPINGCLAN
-    Value: 5
-
-Footer:
-  Imports:
-  - Path: db/import/const.yml
--- a/db/create_arrow_db.txt
+++ b/db/create_arrow_db.txt
@@ -0,0 +1,289 @@
+// Arrow Crafting Database
+//
+// Structure of Database:
+// SourceID,MakeID1,MakeAmount1,...,MakeID5,MakeAmount5
+//
+// 01. SourceID     ID of the item, that is consumed by Arrow Crafting.
+// 02. MakeID       ID of the item received from Arrow Crafting.
+// 03. MakeAmount   Amount of MakeID item received from Arrow Crafting.
+// ...
+//
+// NOTE:
+// - Up to MAX_ARROW_RESULT (typically 5) ID/Amount pairs can be specified.
+// - To remove entry by importing, put 0 on 'MakeID'
+
+// Old Blue Box --> 50 Sharp Arrows, 50 Sleep Arrows
+603,1764,50,1768,50
+// Dead Branch --> 40 Mute Arrows
+604,1769,40
+// Amulet --> 40 Cursed Arrows
+609,1761,40
+// Empty Bottle --> 2 Iron Arrows
+713,1770,2
+// Emperium --> 600 Immaterial Arrows, 600 Mute Arrows, 600 Oridecon Arrows
+714,1757,600,1769,600,1765,600
+// Yellow Gemstone --> 30 Stone Arrows, 1 Sleep Arrow
+715,1756,30,1768,1
+// Red Gemstone --> 10 Rusty Arrows, 1 Poison Arrow, 1 Cursed Arrow
+716,1762,10,1763,1,1761,1
+// Blue Gemstone --> 30 Crystal Arrows, 1 Frozen Arrow
+717,1754,30,1759,1
+// Cursed Ruby --> 50 Cursed Arrows, 10 Sleep Arrows
+724,1761,50,1768,10
+// Cracked Diamond --> 50 Sharp Arrows
+733,1764,50
+// Rough Oridecon --> 50 Oridecon Arrows
+756,1765,50
+// Rough Elunium --> 200 Steel Arrows, 5 Stun Arrows
+757,1753,200,1758,5
+// Tree Root --> 7 Arrows
+902,1750,7
+// Scorpion Tail --> 3 Rusty Arrows
+904,1762,3
+// Jellopy --> 4 Arrows
+909,1750,4
+// Garlet --> 12 Iron Arrows
+910,1770,12
+// Scell --> 8 Steel Arrows
+911,1753,8
+// Zargon --> 50 Silver Arrows
+912,1751,50
+// Tooth of Bat --> 1 Shadow Arrow
+913,1767,1
+// Wolf Claw --> 15 Iron Arrows
+920,1770,15
+// Orc's Fang --> 30 Iron Arrows, 5 Steel Arrows, 10 Stone Arrows
+922,1770,30,1753,5,1756,10
+// Evil Horn --> 20 Shadow Arrows, 10 Flash Arrows, 5 Stun Arrows
+923,1767,20,1760,10,1758,5
+// Venom Canine --> 1 Poison Arrow
+937,1763,1
+// Bee Sting --> 1 Rusty Arrow
+939,1762,1
+// Horn --> 35 Iron Arrows
+947,1770,35
+// Cactus Needle --> 50 Arrows
+952,1750,50
+// Gill --> 80 Iron Arrows, 150 Crystal Arrows
+956,1770,80,1754,150
+// Decayed Nail --> 1 Rusty Arrow, 1 Shadow Arrow
+957,1762,1,1767,1
+// Horrendous Mouth --> 5 Shadow Arrows
+958,1767,5
+// Stinky Scale --> 1 Poison Arrow
+959,1763,1
+// Heroic Emblem --> 1 Oridecon Arrow, 5 Stun Arrows
+968,1765,1,1758,5
+// Gold --> 50 Flash Arrows, 50 Oridecon Arrows
+969,1760,50,1765,50
+// Oridecon --> 250 Oridecon Arrows
+984,1765,250
+// Elunium --> 1000 Steel Arrows, 50 Stun Arrows
+985,1753,1000,1758,50
+// Red Blood --> 600 Fire Arrows
+990,1752,600
+// Crystal Blue --> 150 Crystal Arrows
+991,1754,150
+// Wind of Verdure --> 150 Arrows of Wind
+992,1755,150
+// Green Live --> 150 Stone Arrows
+993,1756,150
+// Flame Heart --> 1800 Fire Arrows, 5 Mute Arrows
+994,1752,1800,1769,5
+// Mystic Frozen --> 450 Crystal Arrows, 5 Frozen Arrows
+995,1754,450,1759,5
+// Rough Wind --> 450 Arrows of Wind, 5 Sleep Arrows
+996,1755,450,1768,5
+// Great Nature --> 450 Stone Arrows, 5 Flash Arrows
+997,1756,450,1760,5
+// Iron --> 100 Iron Arrows
+998,1770,100
+// Steel --> 100 Steel Arrows
+999,1753,100
+// Star Crumb --> 30 Flash Arrows
+1000,1760,30
+// Star Dust --> 10 Flash Arrows
+1001,1760,10
+// Iron Ore --> 50 Iron Arrows
+1002,1770,50
+// Coal --> 8 Shadow Arrows
+1003,1767,8
+// Phracon --> 50 Iron Arrows
+1010,1770,50
+// Emveretarcon --> 200 Iron Arrows, 40 Silver Arrows
+1011,1770,200,1751,40
+// Mole Claw --> 50 Iron Arrows, 60 Stone Arrows
+1018,1770,50,1756,60
+// Trunk --> 40 Arrows
+1019,1750,40
+// Dokebi Horn --> 40 Iron Arrows, 2 Shadow Arrows
+1021,1770,40,1767,2
+// Porcupine Quill --> 70 Arrows, 30 Stone Arrows
+1027,1750,70,1756,30
+// Mantis Scythe --> 1 Sharp Arrow
+1031,1764,1
+// Dragon Canine --> 1 Oridecon Arrow, 50 Iron Arrows
+1035,1765,1,1770,50
+// Little Evil Horn --> 2 Cursed Arrows, 50 Iron Arrows
+1038,1761,2,1770,50
+// Lantern --> 80 Iron Arrows
+1041,1770,80
+// Orc Claw --> 10 Steel Arrows
+1043,1753,10
+// Zenorc's Fang --> 5 Rusty Arrows
+1044,1762,5
+// Ancient Tooth --> 20 Steel Arrows, 300 Crystal Arrows
+1053,1753,20,1754,300
+// Fang --> 2 Sharp Arrows, 40 Silver Arrows
+1063,1764,2,1751,40
+// Reins --> 100 Iron Arrows, 50 Steel Arrows
+1064,1770,100,1753,50
+// Fine-grained Trunk --> 20 Arrows
+1066,1750,20
+// Solid Trunk --> 20 Arrows
+1067,1750,20
+// Barren Trunk --> 20 Arrows
+1068,1750,20
+// Clock Hand --> 5 Sleep Arrows, 100 Arrows
+1095,1768,5,1750,100
+// Manacles --> 50 Steel Arrows
+1098,1753,50
+// Unicorn Horn --> 1000 Silver Arrows
+2257,1751,1000
+// Opera Masque --> 200 Steel Arrows, 40 Mute Arrows
+2281,1753,200,1769,40
+// Mr. Scream --> 200 Sharp Arrows, 300 Steel Arrows
+2288,1764,200,1753,300
+// Welding Mask --> 200 Steel Arrows, 40 Stun Arrows
+2292,1753,200,1758,40
+// Glittering Jacket --> 1000 Flash Arrows
+2319,1760,1000
+// Wooden Mail --> 700 Arrows, 500 Iron Arrows
+2328,1750,700,1770,500
+// Wooden Mail (Slotted) --> 1000 Arrows, 700 Iron Arrows
+2329,1750,1000,1770,700
+// Silver Robe --> 700 Silver Arrows
+2332,1751,700
+// Silver Robe (Slotted) --> 1000 Silver Arrows, 10 Immaterial Arrows
+2333,1751,1000,1757,10
+// Shackles --> 700 Iron Arrows, 50 Steel Arrows
+2408,1770,700,1753,50
+// Matyr's Leash --> 150 Arrows of Wind, 100 Steel Arrows, 10 Sharp Arrows
+2618,1755,150,1753,100,1764,10
+// Fin Helm --> 600 Crystal Arrows, 200 Steel Arrows
+5014,1754,600,1753,200
+// Ogre Tooth --> 30 Steel Arrows, 5 Rusty Arrows
+7002,1753,30,1762,5
+// Stiff Horn --> 2 Stun Arrows
+7008,1758,2
+// Tail of Steel Scorpion --> 250 Steel Arrows, 1 Poison Arrow
+7010,1753,250,1763,1
+// Young Twig --> 1000 Mute Arrows
+7018,1769,1000
+// Loki's Whispers --> 1000 Shadow Arrows
+7019,1767,1000
+// Mother's Nightmare --> 1000 Cursed Arrows
+7020,1761,1000
+// Foolishness of the Blind --> 200 Flash Arrows
+7021,1760,200
+// Old Hilt --> 1000 Oridecon Arrows
+7022,1765,1000
+// Blade of Darkness --> 600 Sharp Arrows, 200 Shadow Arrows
+7023,1764,600,1767,200
+// Bloody Edge --> 600 Sharp Arrows, 200 Cursed Arrows
+7024,1764,600,1761,200
+// Lucifer's Lament --> 800 Stun Arrows, 400 Mute Arrows, 800 Sleep Arrows
+7025,1758,800,1769,400,1768,800
+// Key of the Clock Tower --> 50 Oridecon Arrows
+7026,1765,50
+// Key of the Underground --> 100 Shadow Arrows
+7027,1767,100
+// Matchstick --> 3000 Fire Arrows
+7035,1752,3000
+// Fang of Garm --> 300 Crystal Arrows
+7036,1754,300
+
+//New Ingredients
+
+// Ice Cubic --> 100 Crystal Arrows
+7066,1754,100
+// Stone Fragment --> 50 Stone Arrows, 30 Stun Arrows
+7067,1756,50,1758,30
+// Burnt Tree --> 250 Fire Arrows
+7068,1752,250
+// Destroyed Armor --> 150 Steel Arrows
+7069,1753,150
+// Burning Heart --> 150 Fire Arrows
+7097,1752,150
+// Live Coal --> 100 Fire Arrows
+7098,1752,100
+// Sharp Leaf --> 30 Sharp Arrows
+7100,1764,30
+// Piece of Shield --> 100 Steel Arrows, 100 Oridecon Arrows, 300 Immaterial Arrows
+7108,1753,100,1765,100,1757,300
+// Shining Spear Blade --> 100 Oridecon Arrows
+7109,1765,100
+// Burning Horseshoe --> 100 Steel Arrows
+7120,1753,100
+// Dragon Skin --> 10 Steel Arrows, 50 Cursed Arrows, 50 Mute Arrows
+7123,1753,10,1761,50,1769,50
+// Piece of Bamboo --> 100 Arrows
+7150,1750,100
+// Poisonous Toad Skin --> 20 Poison Arrows
+7155,1763,20
+// Hard Feeler --> 20 Sharp Arrows
+7163,1764,20
+// Solid Peach --> 30 Stun Arrows
+7164,1758,30
+// Leopard Claw --> 10 Sharp Arrows
+7172,1764,10
+// Armor Piece of Dullahan --> 150 Shadow Arrows
+7210,1767,150
+// Tangled Chains --> 50 Steel Arrows, 50 Shadow Arrows
+7221,1753,50,1767,50
+// Cat's Eye --> 200 Arrows of Wind
+7263,1755,200
+// Dark Crystal Fragment --> 30 Cursed Arrows, 50 Shadow Arrows
+7315,1761,30,1767,50
+// Insect Leg --> 10 Sharp Arrows, 50 Poison Arrows
+7316,1764,10,1763,50
+// Old Pick --> 100 Rusty Arrows, 50 Steel Arrows
+7318,1762,100,1753,50
+// Used Iron Plate --> 100 Rusty Arrows, 100 Steel Arrows
+7319,1762,100,1753,100
+// Crystal Fragment --> 10 Flash Arrows, 30 Sleep Arrows
+7321,1760,10,1768,30
+// Battered Kettle --> 50 Steel Arrows
+7323,1753,50
+// Will of the Darkness --> 30 Cursed Arrows, 30 Poison Arrows, 50 Shadow Arrows
+7340,1761,30,1763,30,1767,50
+// Golden Ornament --> 200 Silver Arrows, 300 Holy Arrows
+7435,1751,200,1772,300
+// Cursed Seal --> 50 Cursed Arrows, 50 Mute Arrows
+7442,1761,50,1769,50
+// Green Bijou --> 100 Stone Arrows, 80 Poison Arrows
+7445,1756,100,1763,80
+// Blue Bijou --> 50 Arrows of Wind, 50 Crystal Arrows, 80 Frozen Arrows
+7446,1755,50,1754,50,1759,80
+// Red Bijou --> 100 Fire Arrows, 80 Flash Arrows
+7447,1752,100,1760,80
+// Yellow Bijou --> 50 Silver Arrows, 50 Immaterial Arrows, 80 Sleep Arrows
+7448,1751,50,1757,50,1768,80
+// Skeletal Armor Piece --> 500 Immaterial Arrows, 200 Shadow Arrows, 100 Oridecon Arrows
+7450,1757,500,1767,200,1765,100
+// Fire Dragon Scale --> 300 Fire Arrows, 300 Stun Arrows
+7451,1752,300,1758,300
+// Valhalla's Flower --> 600 Immaterial Arrows, 600 Holy Arrows, 600 Sharp Arrows
+7510,1757,600,1772,600,1764,600
+// Darkness Rune --> 300 Shadow Arrows, 150 Flash Arrows
+7511,1767,300,1760,150
+// Ice Heart --> 50 Crystal Arrows, 50 Frozen Arrows
+7561,1754,50,1759,50
+// Ice Scale --> 150 Crystal Arrows, 400 Frozen Arrows, 200 Mute Arrows
+7562,1754,150,1759,400,1769,200
+// Will of Red Darkness --> 200 Cursed Arrows, 200 Poison Arrows, 100 Shadow Arrows
+7566,1761,200,1763,200,1767,100
+// Clattering Skull --> 50 Shadow Arrows, 50 Cursed Arrows
+7752,1767,50,1761,50
+// Broken Farm Tools --> 50 Rusty Arrows, 10 Iron Arrows, 20 Cursed Arrows
+7753,1762,50,1770,10,1761,20
--- a/db/create_arrow_db.yml
+++ b/db/create_arrow_db.yml
@@ -1,749 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Arrow Crafting Database
-###########################################################################
-#
-# Arrow Crafting Settings
-#
-###########################################################################
-# - Source              AegisName of the item that is consumed.
-#   Make:               List of item(s) received by the player.
-#     - Item            AegisName of the item received.
-#       Amount          Amount of Item received. (Use 0 to remove the Item on import)
-###########################################################################
-
-Header:
-  Type: CREATE_ARROW_DB
-  Version: 1
-
-Body:
-  - Source: Old_Blue_Box
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 50
-      - Item: Sleep_Arrow
-        Amount: 50
-  - Source: Branch_Of_Dead_Tree
-    Make:
-      - Item: Silence_Arrow
-        Amount: 40
-  - Source: Amulet
-    Make:
-      - Item: Curse_Arrow
-        Amount: 40
-  - Source: Empty_Bottle
-    Make:
-      - Item: Iron_Arrow
-        Amount: 2
-  - Source: Emperium
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 600
-      - Item: Oridecon_Arrow
-        Amount: 600
-      - Item: Silence_Arrow
-        Amount: 600
-  - Source: Yellow_Gemstone
-    Make:
-      - Item: Sleep_Arrow
-        Amount: 1
-      - Item: Stone_Arrow
-        Amount: 30
-  - Source: Red_Gemstone
-    Make:
-      - Item: Curse_Arrow
-        Amount: 1
-      - Item: Poison_Arrow
-        Amount: 1
-      - Item: Rusty_Arrow
-        Amount: 10
-  - Source: Blue_Gemstone
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 30
-      - Item: Freezing_Arrow
-        Amount: 1
-  - Source: Cardinal_Jewel_
-    Make:
-      - Item: Curse_Arrow
-        Amount: 50
-      - Item: Sleep_Arrow
-        Amount: 10
-  - Source: Crystal_Jewel___
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 50
-  - Source: Oridecon_Stone
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 50
-  - Source: Elunium_Stone
-    Make:
-      - Item: Steel_Arrow
-        Amount: 200
-      - Item: Stun_Arrow
-        Amount: 5
-  - Source: Tree_Root
-    Make:
-      - Item: Arrow
-        Amount: 7
-  - Source: Scorpion's_Tail
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 3
-  - Source: Jellopy
-    Make:
-      - Item: Arrow
-        Amount: 4
-  - Source: Garlet
-    Make:
-      - Item: Iron_Arrow
-        Amount: 12
-  - Source: Scell
-    Make:
-      - Item: Steel_Arrow
-        Amount: 8
-  - Source: Zargon
-    Make:
-      - Item: Silver_Arrow
-        Amount: 50
-  - Source: Tooth_Of_Bat
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 1
-  - Source: Claw_Of_Wolves
-    Make:
-      - Item: Iron_Arrow
-        Amount: 15
-  - Source: Orcish_Cuspid
-    Make:
-      - Item: Iron_Arrow
-        Amount: 30
-      - Item: Steel_Arrow
-        Amount: 5
-      - Item: Stone_Arrow
-        Amount: 10
-  - Source: Evil_Horn
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 20
-      - Item: Flash_Arrow
-        Amount: 10
-      - Item: Stun_Arrow
-        Amount: 5
-  - Source: Posionous_Canine
-    Make:
-      - Item: Poison_Arrow
-        Amount: 1
-  - Source: Bee_Sting
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 1
-  - Source: Horn
-    Make:
-      - Item: Iron_Arrow
-        Amount: 35
-  - Source: Cactus_Needle
-    Make:
-      - Item: Arrow
-        Amount: 50
-  - Source: Gill
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 150
-      - Item: Iron_Arrow
-        Amount: 80
-  - Source: Decayed_Nail
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 1
-      - Item: Rusty_Arrow
-        Amount: 1
-  - Source: Horrendous_Mouth
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 5
-  - Source: Rotten_Scale
-    Make:
-      - Item: Poison_Arrow
-        Amount: 1
-  - Source: Voucher_Of_Orcish_Hero
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 1
-      - Item: Stun_Arrow
-        Amount: 5
-  - Source: Gold
-    Make:
-      - Item: Flash_Arrow
-        Amount: 50
-      - Item: Oridecon_Arrow
-        Amount: 50
-  - Source: Oridecon
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 250
-  - Source: Elunium
-    Make:
-      - Item: Steel_Arrow
-        Amount: 1000
-      - Item: Stun_Arrow
-        Amount: 50
-  - Source: Boody_Red
-    Make:
-      - Item: Fire_Arrow
-        Amount: 600
-  - Source: Crystal_Blue
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 150
-  - Source: Wind_Of_Verdure
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 150
-  - Source: Yellow_Live
-    Make:
-      - Item: Stone_Arrow
-        Amount: 150
-  - Source: Flame_Heart
-    Make:
-      - Item: Fire_Arrow
-        Amount: 1800
-      - Item: Silence_Arrow
-        Amount: 5
-  - Source: Mistic_Frozen
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 450
-      - Item: Freezing_Arrow
-        Amount: 5
-  - Source: Rough_Wind
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 450
-      - Item: Sleep_Arrow
-        Amount: 5
-  - Source: Great_Nature
-    Make:
-      - Item: Flash_Arrow
-        Amount: 5
-      - Item: Stone_Arrow
-        Amount: 450
-  - Source: Iron
-    Make:
-      - Item: Iron_Arrow
-        Amount: 100
-  - Source: Steel
-    Make:
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Star_Crumb
-    Make:
-      - Item: Flash_Arrow
-        Amount: 30
-  - Source: Sparkling_Dust
-    Make:
-      - Item: Flash_Arrow
-        Amount: 10
-  - Source: Iron_Ore
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-  - Source: Coal
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 8
-  - Source: Phracon
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-  - Source: Emveretarcon
-    Make:
-      - Item: Iron_Arrow
-        Amount: 200
-      - Item: Silver_Arrow
-        Amount: 40
-  - Source: Nail_Of_Mole
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-      - Item: Stone_Arrow
-        Amount: 60
-  - Source: Wooden_Block
-    Make:
-      - Item: Arrow
-        Amount: 40
-  - Source: Dokkaebi_Horn
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 2
-      - Item: Iron_Arrow
-        Amount: 40
-  - Source: Porcupine_Spike
-    Make:
-      - Item: Arrow
-        Amount: 70
-      - Item: Stone_Arrow
-        Amount: 30
-  - Source: Limb_Of_Mantis
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 1
-  - Source: Dragon_Canine
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-      - Item: Oridecon_Arrow
-        Amount: 1
-  - Source: Petite_DiablOfs_Horn
-    Make:
-      - Item: Curse_Arrow
-        Amount: 2
-      - Item: Iron_Arrow
-        Amount: 50
-  - Source: Lantern
-    Make:
-      - Item: Iron_Arrow
-        Amount: 80
-  - Source: Nail_Of_Orc
-    Make:
-      - Item: Steel_Arrow
-        Amount: 10
-  - Source: Tooth_Of_
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 5
-  - Source: Tooth_Of_Ancient_Fish
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 300
-      - Item: Steel_Arrow
-        Amount: 20
-  - Source: Sharpened_Cuspid
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 2
-      - Item: Silver_Arrow
-        Amount: 40
-  - Source: Reins
-    Make:
-      - Item: Iron_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Tree_Of_Archer_1
-    Make:
-      - Item: Arrow
-        Amount: 20
-  - Source: Tree_Of_Archer_2
-    Make:
-      - Item: Arrow
-        Amount: 20
-  - Source: Tree_Of_Archer_3
-    Make:
-      - Item: Arrow
-        Amount: 20
-  - Source: Needle_Of_Alarm
-    Make:
-      - Item: Arrow
-        Amount: 100
-      - Item: Sleep_Arrow
-        Amount: 5
-  - Source: Manacles
-    Make:
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Snowy_Horn
-    Make:
-      - Item: Silver_Arrow
-        Amount: 1000
-  - Source: Phantom_Of_Opera
-    Make:
-      - Item: Silence_Arrow
-        Amount: 40
-      - Item: Steel_Arrow
-        Amount: 200
-  - Source: Mr_Scream
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 200
-      - Item: Steel_Arrow
-        Amount: 300
-  - Source: Welding_Mask
-    Make:
-      - Item: Steel_Arrow
-        Amount: 200
-      - Item: Stun_Arrow
-        Amount: 40
-  - Source: Glittering_Clothes
-    Make:
-      - Item: Flash_Arrow
-        Amount: 1000
-  - Source: Wooden_Mail
-    Make:
-      - Item: Arrow
-        Amount: 700
-      - Item: Iron_Arrow
-        Amount: 500
-  - Source: Wooden_Mail_
-    Make:
-      - Item: Arrow
-        Amount: 1000
-      - Item: Iron_Arrow
-        Amount: 700
-  - Source: Silver_Robe
-    Make:
-      - Item: Silver_Arrow
-        Amount: 700
-  - Source: Silver_Robe_
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 10
-      - Item: Silver_Arrow
-        Amount: 1000
-  - Source: Cuffs
-    Make:
-      - Item: Iron_Arrow
-        Amount: 700
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Matyr's_Flea_Guard
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 150
-      - Item: Incisive_Arrow
-        Amount: 10
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Fin_Helm
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 600
-      - Item: Steel_Arrow
-        Amount: 200
-  - Source: Ogre_Tooth
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 5
-      - Item: Steel_Arrow
-        Amount: 30
-  - Source: Stiff_Horn
-    Make:
-      - Item: Stun_Arrow
-        Amount: 2
-  - Source: Tail_Of_Steel_Scorpion
-    Make:
-      - Item: Poison_Arrow
-        Amount: 1
-      - Item: Steel_Arrow
-        Amount: 250
-  - Source: Young_Twig
-    Make:
-      - Item: Silence_Arrow
-        Amount: 1000
-  - Source: Loki's_Whispers
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 1000
-  - Source: Mother's_Nightmare
-    Make:
-      - Item: Curse_Arrow
-        Amount: 1000
-  - Source: Foolishness_Of_Blind
-    Make:
-      - Item: Flash_Arrow
-        Amount: 200
-  - Source: Old_Hilt
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 1000
-  - Source: Blade_Lost_In_Darkness
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 200
-      - Item: Incisive_Arrow
-        Amount: 600
-  - Source: Bloody_Edge
-    Make:
-      - Item: Curse_Arrow
-        Amount: 200
-      - Item: Incisive_Arrow
-        Amount: 600
-  - Source: Lucifer's_Lament
-    Make:
-      - Item: Silence_Arrow
-        Amount: 400
-      - Item: Sleep_Arrow
-        Amount: 800
-      - Item: Stun_Arrow
-        Amount: 800
-  - Source: Key_Of_Clock_Tower
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 50
-  - Source: Underground_Key
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 100
-  - Source: Matchstick
-    Make:
-      - Item: Fire_Arrow
-        Amount: 3000
-  - Source: Fang_Of_Garm
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 300
-  - Source: Ice_Piece
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 100
-  - Source: Stone_Piece
-    Make:
-      - Item: Stone_Arrow
-        Amount: 50
-      - Item: Stun_Arrow
-        Amount: 30
-  - Source: Burn_Tree
-    Make:
-      - Item: Fire_Arrow
-        Amount: 250
-  - Source: Broken_Armor_Piece
-    Make:
-      - Item: Steel_Arrow
-        Amount: 150
-  - Source: Burning_Heart
-    Make:
-      - Item: Fire_Arrow
-        Amount: 150
-  - Source: Live_Coal
-    Make:
-      - Item: Fire_Arrow
-        Amount: 100
-  - Source: Sharp_Leaf
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 30
-  - Source: Boroken_Shiled_Piece
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 300
-      - Item: Oridecon_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Shine_Spear_Blade
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 100
-  - Source: Burning_Horse_Shoe
-    Make:
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Dragon's_Skin
-    Make:
-      - Item: Curse_Arrow
-        Amount: 50
-      - Item: Silence_Arrow
-        Amount: 50
-      - Item: Steel_Arrow
-        Amount: 10
-  - Source: Bamboo_Cut
-    Make:
-      - Item: Arrow
-        Amount: 100
-  - Source: Poison_Toad's_Skin
-    Make:
-      - Item: Poison_Arrow
-        Amount: 20
-  - Source: Sharp_Feeler
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 20
-  - Source: Hard_Peach
-    Make:
-      - Item: Stun_Arrow
-        Amount: 30
-  - Source: Leopard_Talon
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 10
-  - Source: Dullahan_Armor
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 150
-  - Source: Tangled_Chain
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Cat_Eyed_Stone
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 200
-  - Source: Dark_Crystal_Fragment
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Curse_Arrow
-        Amount: 30
-  - Source: Long_Limb
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 10
-      - Item: Poison_Arrow
-        Amount: 50
-  - Source: Old_Pick
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Old_Steel_Plate
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Fragment_Of_Crystal
-    Make:
-      - Item: Flash_Arrow
-        Amount: 10
-      - Item: Sleep_Arrow
-        Amount: 30
-  - Source: Battered_Kettle
-    Make:
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Will_Of_Darkness
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Curse_Arrow
-        Amount: 30
-      - Item: Poison_Arrow
-        Amount: 30
-  - Source: Golden_Bracelet
-    Make:
-      - Item: Holy_Arrow
-        Amount: 300
-      - Item: Silver_Arrow
-        Amount: 200
-  - Source: Cursed_Seal
-    Make:
-      - Item: Curse_Arrow
-        Amount: 50
-      - Item: Silence_Arrow
-        Amount: 50
-  - Source: Dragonball_Green
-    Make:
-      - Item: Poison_Arrow
-        Amount: 80
-      - Item: Stone_Arrow
-        Amount: 100
-  - Source: Dragonball_Blue
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 50
-      - Item: Crystal_Arrow
-        Amount: 50
-      - Item: Freezing_Arrow
-        Amount: 80
-  - Source: Dragonball_Red
-    Make:
-      - Item: Fire_Arrow
-        Amount: 100
-      - Item: Flash_Arrow
-        Amount: 80
-  - Source: Dragonball_Yellow
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 50
-      - Item: Silver_Arrow
-        Amount: 50
-      - Item: Sleep_Arrow
-        Amount: 80
-  - Source: Piece_Of_Bone_Armor
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 200
-      - Item: Immatrial_Arrow
-        Amount: 500
-      - Item: Oridecon_Arrow
-        Amount: 100
-  - Source: Scale_Of_Red_Dragon
-    Make:
-      - Item: Fire_Arrow
-        Amount: 300
-      - Item: Stun_Arrow
-        Amount: 300
-  - Source: Valhalla_Flower
-    Make:
-      - Item: Holy_Arrow
-        Amount: 600
-      - Item: Immatrial_Arrow
-        Amount: 600
-      - Item: Incisive_Arrow
-        Amount: 600
-  - Source: Rune_Of_Darkness
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 300
-      - Item: Flash_Arrow
-        Amount: 150
-  - Source: Ice_Heart
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 50
-      - Item: Freezing_Arrow
-        Amount: 50
-  - Source: Ice_Scale
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 150
-      - Item: Freezing_Arrow
-        Amount: 400
-      - Item: Silence_Arrow
-        Amount: 200
-  - Source: Will_Of_Darkness_
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 100
-      - Item: Curse_Arrow
-        Amount: 200
-      - Item: Poison_Arrow
-        Amount: 200
-  - Source: Clattering_Skull
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Curse_Arrow
-        Amount: 50
-  - Source: Broken_Farming_Utensil
-    Make:
-      - Item: Curse_Arrow
-        Amount: 20
-      - Item: Iron_Arrow
-        Amount: 10
-      - Item: Rusty_Arrow
-        Amount: 50
-
-Footer:
-  Imports:
-  - Path: db/import/create_arrow_db.yml
--- a/db/elemental_db.txt
+++ b/db/elemental_db.txt
@@ -0,0 +1,25 @@
+// Elemental Summons Database
+//
+// Structure of Database:
+// ID,Sprite_Name,Name,LV,HP,SP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Speed,aDelay,aMotion,dMotion
+//
+// Notes:
+// Summoned Elemental’s STATs are affected by the Caster’s Base Level and STATs.
+// In other words, all values specified will be added to (and will not override) the calculated STATs of the summoned elemental.
+
+// Monster Elementals
+2114,EL_AGNI_S,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,83,200,504,1020,360
+2115,EL_AGNI_M,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,83,200,504,1020,360
+2116,EL_AGNI_L,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,83,200,504,1020,360
+
+2117,EL_AQUA_S,Aqua,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,81,200,504,1020,360
+2118,EL_AQUA_M,Aqua,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,81,200,504,1020,360
+2119,EL_AQUA_L,Aqua,100,0,1,1,0,0,0,0,1,1,1,1,1,1,5,12,2,0,81,200,504,1020,360
+
+2120,EL_VENTUS_S,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,84,200,504,1020,360
+2121,EL_VENTUS_M,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,84,200,504,1020,360
+2122,EL_VENTUS_L,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,84,200,504,1020,360
+
+2123,EL_TERA_S,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,82,200,504,1020,360
+2124,EL_TERA_M,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,82,200,504,1020,360
+2125,EL_TERA_L,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,82,200,504,1020,360
--- a/db/elemental_db.yml
+++ b/db/elemental_db.yml
@@ -1,66 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Elemental Summons Database
-###########################################################################
-#
-# Elemental Summons Settings
-#
-###########################################################################
-# - Id                      Elemental ID.
-#   AegisName               Server name to reference the elemental in scripts and lookups, should use no spaces.
-#   Name                    Name in English.
-#   Level                   Level.
-#   Hp                      Additional HP. Base HP depends on caster HP. (Default: 0)
-#   Sp                      Additional SP. Base SP depends on caster SP. (Default: 1)
-#   Attack                  Additional minimum attack. Base attack depends on caster attack. (Default: 0)
-#   Attack2                 Additional maximum attack. Base attack depends on caster attack. (Default: 0)
-#   Defense                 Physical defense of the elemental, reduces melee and ranged physical attack/skill damage. Base defense depends on the caster defense. (Default: 0)
-#   MagicDefense            Magic defense of the elemental, reduces magical skill damage. Base magic defense depends on the caster magic defense. (Default: 0)
-#   Str                     Strength which affects attack. (Default: 0)
-#   Agi                     Agility which affects flee. (Default: 0)
-#   Vit                     Vitality which affects defense. (Default: 0)
-#   Int                     Intelligence which affects magic attack. (Default: 0)
-#   Dex                     Dexterity which affects hit rate. (Default: 0)
-#   Luk                     Luck which affects perfect dodge/lucky flee/perfect flee/lucky dodge rate. (Default: 0)
-#   AttackRange             Attack range. (Default: 1)
-#   SkillRange              Skill cast range. (Default: 5)
-#   ChaseRange              Chase range. (Default: 12)
-#   Size                    Size.
-#   Race                    Race. (Default: Formless)
-#   Element                 Element.
-#   ElementLevel            Level of element.
-#   WalkSpeed               Walk speed. (Default: 200)
-#   AttackDelay             Attack speed. (Default: 504)
-#   AttackMotion            Attack animation speed. Base AttackMotion depends on the caster AttackMotion. (Default: 1020)
-#   DamageMotion            Damage animation speed. (Default: 360)
-#   Mode:                   List of elemental skills by mode. (Optional)
-#     <mode>:               Mode name to define the skill available. Available modes are Passive, Assist, and Aggressive.
-#       Skill               Skill name.
-#       Level               Skill level. (Default: 1)
-###########################################################################
-
-Header:
-  Type: ELEMENTAL_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/re/elemental_db.yml
-    Mode: Renewal
-  - Path: db/import/elemental_db.yml
--- a/db/elemental_skill_db.txt
+++ b/db/elemental_skill_db.txt
@@ -0,0 +1,56 @@
+// Elemental Summons Skill Database
+//
+// Structure of Database:
+// ElementalID,SkillID,SkillLevel,ReqMode
+//
+// Spirit Modes:
+//	1 = Passive, 2 = Defensive, 4 = Aggressive
+
+// EL_AGNI_S
+2114,8413,1,1	//EL_PYROTECHNIC,Pyrotechnic
+2114,8401,1,2	//EL_CIRCLE_OF_FIRE,Circle of Fire
+2114,8425,1,4	//EL_FIRE_ARROW,Fire Arrow
+// EL_AGNI_M
+2115,8414,1,1	//EL_HEATER,Heater
+2115,8402,1,2	//EL_FIRE_CLOAK,Fire Cloak
+2115,8426,1,4	//EL_FIRE_BOMB,Fire Bomb
+// EL_AGNI_L
+2116,8415,1,1	//EL_TROPIC,Tropic
+2116,8403,1,2	//EL_FIRE_MANTLE,Fire Mantle
+2116,8428,1,4	//EL_FIRE_WAVE,Fire Wave
+// EL_AQUA_S
+2117,8416,1,1	//EL_AQUAPLAY,Aqua Play
+2117,8404,1,2	//EL_WATER_SCREEN,Water Screen
+2117,8430,1,4	//EL_ICE_NEEDLE,Ice Needle
+// EL_AQUA_M
+2118,8417,1,1	//EL_COOLER,Cooler
+2118,8405,1,2	//EL_WATER_DROP,Water Drop
+2118,8431,1,4	//EL_WATER_SCREW,Water Screw
+// EL_AQUA_L
+2119,8418,1,1	//EL_CHILLY_AIR,Cool Air
+2119,8406,1,2	//EL_WATER_BARRIER,Water Barrier
+2119,8433,1,4	//EL_TIDAL_WEAPON,Tidal Weapon
+// EL_VENTUS_S
+2120,8419,1,1	//EL_GUST,Gust
+2120,8407,1,2	//EL_WIND_STEP,Wind Step
+2120,8434,1,4	//EL_WIND_SLASH,Wind Slasher
+// EL_VENTUS_M
+2121,8420,1,1	//EL_BLAST,Blast
+2121,8408,1,2	//EL_WIND_CURTAIN,Wind Curtain
+2121,8435,1,4	//EL_HURRICANE,Hurricane Rage
+// EL_VENTUS_L
+2122,8421,1,1	//EL_WILD_STORM,Wild Storm
+2122,8409,1,2	//EL_ZEPHYR,Zephyr
+2122,8437,1,4	//EL_TYPOON_MIS,Typhoon Missile
+// EL_TERA_S
+2123,8422,1,1	//EL_PETROLOGY,Petrology
+2123,8410,1,2	//EL_SOLID_SKIN,Solid Skin
+2123,8439,1,4	//EL_STONE_HAMMER,Stone Hammer
+// EL_TERA_M
+2124,8423,1,1	//EL_CURSED_SOIL,Cursed Soil
+2124,8411,1,2	//EL_STONE_SHIELD,Stone Shield
+2124,8440,1,4	//EL_ROCK_CRUSHER,Rock Launcher
+// EL_TERA_L
+2125,8424,1,1	//EL_UPHEAVAL,Upheaval
+2125,8412,1,2	//EL_POWER_OF_GAIA,Power of Gaia
+2125,8442,1,4	//EL_STONE_RAIN,Stone Rain
--- a/db/exp_guild.yml
+++ b/db/exp_guild.yml
@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Guild Experience Database
-###########################################################################
-#
-# Guild Experience Settings
-#
-###########################################################################
-# - Level                Level required.
-#   Exp                  Experience required to level up.
-###########################################################################
-
-Header:
-  Type: GUILD_EXP_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/exp_guild.yml
-    Mode: Prerenewal
-  - Path: db/re/exp_guild.yml
-    Mode: Renewal
-  - Path: db/import/exp_guild.yml
--- a/db/exp_homun.yml
+++ b/db/exp_homun.yml
@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Homunculus Experience Database
-###########################################################################
-#
-# Homunculus Experience Settings
-#
-###########################################################################
-# - Level   Level required.
-#   Exp     Experience required for the next level.
-###########################################################################
-
-Header:
-  Type: HOMUN_EXP_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/exp_homun.yml
-    Mode: Prerenewal
-  - Path: db/re/exp_homun.yml
-    Mode: Renewal
-  - Path: db/import/exp_homun.yml
--- a/db/guild_skill_tree.yml
+++ b/db/guild_skill_tree.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/import-tmpl/abra_db.yml
+++ b/db/import-tmpl/abra_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/import-tmpl/achievement_db.yml
+++ b/db/import-tmpl/achievement_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2017 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -16,31 +16,67 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 ###########################################################################
-# Achievement Database
+# Custom Achievement Database
 ###########################################################################
 #
 # Achievement Settings
 #
 ###########################################################################
-# - Id                  Achievement ID.
-#   Group               Achievement group type. (Defaut: None)
-#   Name                Achievement name.
-#   Targets:            List of targets the achievement requires. (Default: null)
-#     - Id              Index value used for import methods.
-#       Mob             Target mob. (Default: 0)
-#       Count           Target count. (Default: 1)
-#   Condition           Conditional statement that must be met for the achievement to be considered complete. (Default: null)
-#   Map                 Map name that is used for the AG_CHATTING type. (Default: -1)
-#   Dependents:         List of achievements that need to be completed before this achievement is considered complete. (Default: null)
-#     - Id: <bool>      Achievement ID pre-requisite.
-#   Rewards:            List of rewards that are given on completion. (Default: null)
-#     Item              Item name.
-#     Amount            Amount of item. (Default: 1)
-#     Script            Bonus Script. (Default: null)
-#     TitleId           Title ID. (Default: 0)
-#   Score               Achievement points that are given on completion. (Default: 0)
+# ID - Unique achievement ID.
+###########################################################################
+# Group - Achievement group type. Each achievement type calls a specific
+# objective check.
+# Valid groups:
+#  AG_ADD_FRIEND
+#  AG_ADVENTURE
+#  AG_BABY
+#  AG_BATTLE
+#  AG_CHATTING
+#  AG_CHATTING_COUNT
+#  AG_CHATTING_CREATE
+#  AG_CHATTING_DYING
+#  AG_EAT
+#  AG_GET_ITEM
+#  AG_GET_ZENY
+#  AG_GOAL_ACHIEVE
+#  AG_GOAL_LEVEL
+#  AG_GOAL_STATUS
+#  AG_HEAR
+#  AG_JOB_CHANGE
+#  AG_MARRY
+#  AG_PARTY
+#  AG_ENCHANT_FAIL
+#  AG_ENCHANT_SUCCESS
+#  AG_SEE
+#  AG_SPEND_ZENY
+#  AG_TAMING
+###########################################################################
+# Name - Achievement name. Used when sending rewards through RODEX.
+###########################################################################
+# Target - A list of monster ID and count values that the achievement
+# requires. The target count can also be used for achievements that keep
+# a counter while not being related to monster kills.
+# Capped at MAX_ACHIEVEMENT_OBJECTIVES.
+###########################################################################
+# Condition - A conditional statement that must be met for the achievement
+# to be considered complete.
+###########################################################################
+# Map - A map name that is used for the AG_CHATTING type which increments
+# the counter based on the player's map.
+###########################################################################
+# Dependent: - A list of achievement IDs that need to be completed before
+# this achievement is considered complete.
+###########################################################################
+# Reward - A list of rewards that are given on completion. All fields are
+# optional.
+#   ItemID: Item ID
+#   Amount:  Amount of Item ID (default 1)
+#   Script: Bonus Script
+#   TitleID: Title ID
+###########################################################################
+# Score - Achievement points that are given on completion.
 ###########################################################################

 Header:
  Type: ACHIEVEMENT_DB
-  Version: 2
+  Version: 1
--- a/db/import-tmpl/achievement_level_db.yml
+++ b/db/import-tmpl/achievement_level_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -16,14 +16,15 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 ###########################################################################
-# Achievement Level Database
+# Import Achievement Level Database
 ###########################################################################
 #
 # Achievement Level Settings
 #
 ###########################################################################
-# - Level     Achievement Level.
-#   Points    Required total scoring points to reach this level.
+# Level - Achievement Level
+###########################################################################
+# Points - Required total scoring points to reach this level.
 ###########################################################################

 Header:
--- a/db/import-tmpl/attendance.yml
+++ b/db/import-tmpl/attendance.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/import-tmpl/attr_fix.txt
+++ b/db/import-tmpl/attr_fix.txt
@@ -0,0 +1,6 @@
+// Elemental Attribute Damage Adjustment Tables
+//
+// Structure of Database:
+// Columns - attacker's weapon element
+// Rows    - target's defense element
+
--- a/db/import-tmpl/attr_fix.yml
+++ b/db/import-tmpl/attr_fix.yml
@@ -1,32 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2019 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/>.
-#
-###########################################################################
-# Elemental Attribute Damage Adjustment Tables
-###########################################################################
-#
-# Elemental Attribute Damage Adjustment Settings
-#
-###########################################################################
-# - Level                        Level of the Attribute.
-#   <element>:                   Attacker's weapon element.
-#       <element>: <value>       Target's defense element. <value> in %, default 100. Value accepted from -100 to 200.
-###########################################################################
-
-Header:
-  Type: ATTRIBUTE_DB
-  Version: 1
--- a/db/import-tmpl/battleground_db.yml
+++ b/db/import-tmpl/battleground_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/import-tmpl/castle_db.txt
+++ b/db/import-tmpl/castle_db.txt
@@ -0,0 +1,11 @@
+// Guild Castles Database
+//
+// Structure of Database:
+// CastleID,MapName,CastleName,OnGuildBreakEventName,Flag
+//
+// 01. CastleID                 Unique ID of the castle. Must remain unique across all map-servers.
+// 02. MapName                  Map name to be considered as the castle map.
+// 03. CastleName               Name of the castle (used by scripts and guardian name tags).
+// 04. OnGuildBreakEventName    NPC unique name to invoke ::OnGuildBreak on, when a occupied
+//                              castle is abandoned during guild break.
+// 05. Flag                     Switch flag (reserved as of athena-dev mod0796~0801, not used by server).
--- a/db/import-tmpl/castle_db.yml
+++ b/db/import-tmpl/castle_db.yml
@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Guild Castles Database
-###########################################################################
-#
-# Guild Castles Settings
-#
-###########################################################################
-# - Id                Unique ID of the castle.
-#   Map               Map name to be considered as the castle map.
-#   Name              Name of the castle (used by scripts and guardian name tags).
-#   Npc               NPC unique name to invoke ::OnGuildBreak on, when a occupied castle is abandoned during guild break.
-###########################################################################
-
-Header:
-  Type: CASTLE_DB
-  Version: 1
--- a/db/import-tmpl/const.txt
+++ b/db/import-tmpl/const.txt
@@ -0,0 +1,15 @@
+// Script Constant Database
+//
+// Structure of Database:
+// Identifier	Value[	Type]
+//
+// Alternatively:
+// Identifier,Value[,Type]
+//
+// 01. Identifier   Unique name for the constant, must not have same name as script commands, functions or variables.
+// 02. Value        Value assigned to the constant. This value cannot be changed during the runtime of the server.
+// 03. Type         Specifies whether the identifier is a constant (0) or a parameter (1) (optional, defaults to 0).
+//
+// NOTE:            Parameters are special in that they retrieve certain runtime values depending on the specified ID
+//                  in field Value. Depending on the implementation values assigned by scripts to parameters will affect
+//                  runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
--- a/db/import-tmpl/const.yml
+++ b/db/import-tmpl/const.yml
@@ -1,35 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Script Constant Database
-###########################################################################
-#
-# Script Constant Settings
-#
-###########################################################################
-# - Name             Unique name for the constant. Must not have same name as script commands, functions, or variables.
-#   Value            Value assigned to the constant. This value cannot be changed during the runtime of the server.
-#   Parameter        Specifies whether the identifier is a parameter. (Default: false)
-#                    Note: Parameters are special in that they retrieve certain runtime values depending on the specified ID
-#                    in field Value. Depending on the implementation values assigned by scripts the parameters will affect
-#                    runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
-###########################################################################
-
-Header:
-  Type: CONSTANT_DB
-  Version: 1
--- a/db/import-tmpl/create_arrow_db.txt
+++ b/db/import-tmpl/create_arrow_db.txt
@@ -0,0 +1,14 @@
+// Arrow Crafting Database
+//
+// Structure of Database:
+// SourceID,MakeID1,MakeAmount1,...,MakeID5,MakeAmount5
+//
+// 01. SourceID     ID of the item, that is consumed by Arrow Crafting.
+// 02. MakeID       ID of the item received from Arrow Crafting.
+// 03. MakeAmount   Amount of MakeID item received from Arrow Crafting.
+// ...
+//
+// NOTE:
+// - Up to MAX_ARROW_RESULT (typically 5) ID/Amount pairs can be specified.
+// - To remove entry by importing, put 0 on 'MakeID'
+
--- a/db/import-tmpl/create_arrow_db.yml
+++ b/db/import-tmpl/create_arrow_db.yml
@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Arrow Crafting Database
-###########################################################################
-#
-# Arrow Crafting Settings
-#
-###########################################################################
-# - Source              AegisName of the item that is consumed.
-#   Make:               List of item(s) received by the player.
-#     - Item            AegisName of the item received.
-#       Amount          Amount of Item received. (Use 0 to remove the Item on import)
-###########################################################################
-
-Header:
-  Type: CREATE_ARROW_DB
-  Version: 1
--- a/db/import-tmpl/elemental_db.txt
+++ b/db/import-tmpl/elemental_db.txt
@@ -0,0 +1,9 @@
+// Elemental Summons Database
+//
+// Structure of Database:
+// ID,Sprite_Name,Name,LV,HP,SP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Speed,aDelay,aMotion,dMotion
+//
+// Notes:
+// Summoned Elemental’s STATs are affected by the Caster’s Base Level and STATs.
+// In other words, all values specified will be added to (and will not override) the calculated STATs of the summoned elemental.
+
--- a/db/import-tmpl/elemental_db.yml
+++ b/db/import-tmpl/elemental_db.yml
@@ -1,43 +0,0 @@
-###########################################################################
-# Elemental Summons Database
-###########################################################################
-#
-# Elemental Summons Settings
-#
-###########################################################################
-# - Id                      Elemental ID.
-#   AegisName               Server name to reference the elemental in scripts and lookups, should use no spaces.
-#   Name                    Name in English.
-#   Level                   Level.
-#   Hp                      Additional HP. Base HP depends on caster HP. (Default: 0)
-#   Sp                      Additional SP. Base SP depends on caster SP. (Default: 1)
-#   Attack                  Additional minimum attack. Base attack depends on caster attack. (Default: 0)
-#   Attack2                 Additional maximum attack. Base attack depend on caster attack. (Default: 0)
-#   Defense                 Physical defense of the elemental, reduces melee and ranged physical attack/skill damage. Base defense depends on the caster defense. (Default: 0)
-#   MagicDefense            Magic defense of the elemental, reduces magical skill damage. Base magic defense depends on the caster magic defense. (Default: 0)
-#   Str                     Strength which affects attack. (Default: 0)
-#   Agi                     Agility which affects flee. (Default: 0)
-#   Vit                     Vitality which affects defense. (Default: 0)
-#   Int                     Intelligence which affects magic attack. (Default: 0)
-#   Dex                     Dexterity which affects hit rate. (Default: 0)
-#   Luk                     Luck which affects perfect dodge/lucky flee/perfect flee/lucky dodge rate. (Default: 0)
-#   AttackRange             Attack range. (Default: 1)
-#   SkillRange              Skill cast range. (Default: 5)
-#   ChaseRange              Chase range. (Default: 12)
-#   Size                    Size.
-#   Race                    Race. (Default: Formless)
-#   Element                 Element.
-#   ElementLevel            Level of element.
-#   WalkSpeed               Walk speed. (Default: 200)
-#   AttackDelay             Attack speed. (Default: 504)
-#   AttackMotion            Attack animation speed. Base AttackMotion depends on the caster AttackMotion. (Default: 1020)
-#   DamageMotion            Damage animation speed. (Default: 360)
-#   Mode:                   List of elemental skills by mode. (Optional)
-#     <mode>:               Mode name to define the skill available. Available modes are Passive, Assist, and Aggressive.
-#       Skill               Skill name.
-#       Level               Skill level. (Default: 1)
-###########################################################################
-
-Header:
-  Type: ELEMENTAL_DB
-  Version: 1
--- a/db/import-tmpl/elemental_skill_db.txt
+++ b/db/import-tmpl/elemental_skill_db.txt
@@ -0,0 +1,7 @@
+// Elemental Summons Skill Database
+//
+// Structure of Database:
+// ElementalID,SkillID,SkillLevel,ReqMode
+//
+// Spirit Modes:
+//	1 = Passive, 2 = Defensive, 4 = Aggressive
--- a/db/import-tmpl/exp_guild.txt
+++ b/db/import-tmpl/exp_guild.txt
@@ -0,0 +1,2 @@
+// Guild Experience Tables
+
--- a/db/import-tmpl/exp_guild.yml
+++ b/db/import-tmpl/exp_guild.yml
@@ -1,31 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# 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/>.
-#
-###########################################################################
-# Guild Experience Database
-###########################################################################
-#
-# Guild Experience Settings
-#
-###########################################################################
-# - Level                Level required.
-#   Exp                  Experience required to level up.
-###########################################################################
-
-Header:
-  Type: GUILD_EXP_DB
-  Version: 1
--- a/db/import-tmpl/exp_homun.txt
+++ b/db/import-tmpl/exp_homun.txt
@@ -0,0 +1 @@
+// Homunculus Experience Tables
--- a/db/import-tmpl/guild_skill_tree.yml
+++ b/db/import-tmpl/guild_skill_tree.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/import-tmpl/instance_db.yml
+++ b/db/import-tmpl/instance_db.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2019 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/db/import-tmpl/item_avail.txt
+++ b/db/import-tmpl/item_avail.txt
@@ -0,0 +1,12 @@
+// Item Availability and Alias Database
+//
+// Structure of Database:
+// ItemID,SpriteID
+//
+// 01. ItemID       Item ID to change.
+// 02. SpriteID     Item ID which will be sent to the client instead of ItemID.
+//                  If 0, the item becomes unavailable for use. If item_check is enabled and a player owns such an item, it will be removed upon next login/teleport.
+//
+// NOTE: Replaces an item client-side while keeping them separate server-side.
+// Think of it as a way to disguise items.
+// Don't sell the item in same shop with the source. Example, don't put 2240 & 2241 in same place!
--- a/db/import-tmpl/item_bluebox.txt
+++ b/db/import-tmpl/item_bluebox.txt
@@ -0,0 +1,4 @@
+// Old Blue Box Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate
--- a/db/import-tmpl/item_buyingstore.txt
+++ b/db/import-tmpl/item_buyingstore.txt
@@ -0,0 +1,10 @@
+// Buying Store Item List
+// List of items that can be sold to buying stores.
+//
+// Structure of Database:
+// ItemID
+//
+// Note:
+//  Items are in same order as data\buyingstoreitemlist.txt, which
+//  must be edited as well for the client to accept added items.
+
--- a/db/import-tmpl/item_cardalbum.txt
+++ b/db/import-tmpl/item_cardalbum.txt
@@ -0,0 +1,4 @@
+// Old Card Album Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate
--- a/db/import-tmpl/item_db.txt
+++ b/db/import-tmpl/item_db.txt
@@ -0,0 +1,68 @@
+// Items Additional Database
+//
+// Structure of Database:
+// ID,Name,Name,Type,Price,Sell,Weight,ATK[:MATK],DEF,Range,Slot,Job,Class,Gender,Loc,wLV,eLV[:maxLevel],Refineable,View,{ Script },{ OnEquip_Script },{ OnUnequip_Script }
+//
+// THQ Quest Items
+//=============================================================
+//7950,THG_Membership,THG Membership,3,,10,10,,,,,,,,,,,,,{},{},{}
+//7951,Token_Bag,Token Bag,3,,10,10,,,,,,,,,,,,,{},{},{}
+//1998,Jeramiah's_Jur,Jeramiah's Jur,3,,10,10,,,,,,,,,,,,,{},{},{}
+//1999,Zed's_Staff,Zed's Staff,3,,10,10,,,,,,,,,,,,,{},{},{}
+
+// Official Event Items that had their Effects removed after the event was completed
+//585,Wurst,Brusti,11,2,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(15,20),0; itemskill "PR_MAGNIFICAT",3; },{},{}
+//679,Gold_Pill,Pilule,0,5000,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 50,50; },{},{}
+
+//2681,Republic_Ring,Republic Anniversary Ring,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAllStats,3; },{},{}
+
+//5134,Pumpkin_Hat,Pumpkin-Head,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus2 bSubRace,RC_Demon,5; },{},{}
+//5136,Santa's_Hat_,Louise's Santa Hat,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,0,1,20,{ bonus bMdef,1; bonus bLuk,1; bonus3 bAutoSpellWhenHit,"AL_HEAL",3,50; bonus3 bAutoSpellWhenHit,"AL_BLESSING",10,50; },{},{}
+//5145,Carnival_Joker_Jester,Carnival Jester,4,10,,100,,0,,0,0xFFFFFFFF,63,2,256,,0,1,89,{ bonus bAllStats,3; },{},{}
+//5147,Baseball_Cap,Baseball Cap,4,0,,200,,3,,0,0xFFFFFFFF,63,2,256,,0,1,216,{ bonus2 bExpAddRace,RC_Boss,50; bonus2 bExpAddRace,RC_NonBoss,50; },{},{}
+//5201,Party_Hat_B,2nd Anniversary Party Hat,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,0,1,144,{ bonus bAllStats,3; },{},{}
+//5202,Pumpkin_Hat_,Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500; },{},{}
+//5204,Event_Pierrot_Nose,Rudolf's Red Nose,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,49,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bAddMonsterDropItem,12130,30; },{},{}
+//5264,Aussie_Flag_Hat,Australian Flag Hat,4,20,,500,,4,,0,0xFFFFFFFF,63,2,256,,0,1,304,{ bonus bAllStats,2; },{},{}
+//5356,Pumpkin_Hat_H,Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus2 bMagicAddRace,RC_Demon,5; },{},{}
+//5384,Santa_Hat_1,Twin Pompom By JB,4,20,,200,,2,,1,0xFFFFFFFF,63,2,256,,20,1,390,{ bonus bLuk,3; bonus2 bResEff,Eff_Curse,2000; bonus bVariableCastrate,-2; bonus bAspdRate,4; bonus2 bAddMonsterDropItem,539,100; bonus2 bAddMonsterDropItem,529,200; bonus2 bAddMonsterDropItem,530,200; autobonus "{ bonus bCritical,10; }",10,5000; },{},{}
+//5811,Santa_Beard,Santa Beard,4,20,,100,,5,,0,0xFFFFFFFF,63,2,1,,0,0,25,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Player_Doram,5; },{},{}
+
+//11702,Moon_Cookie,Moon Cookie,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_HALLUCINATION; itemskill "AL_BLESSING",7; },{},{}
+//12131,Lucky_Potion,Lucky Potion,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LUKFOOD,180000,15; },{},{}
+//12143,Red_Can,Red Can,2,50000,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 25,25; },{},{}
+//Event effect: Summon monster? Probably Rice_Cake. x_x
+//12199,Rice_Scroll,Rice Scroll,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+//12200,Event_Cake,Event Cake,2,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "PR_MAGNIFICAT",3; },{},{}
+//12238,New_Year_Rice_Cake_1,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 20,15; sc_start SC_STRFOOD,1200000,3; sc_start SC_INTFOOD,1200000,3; sc_start SC_LUKFOOD,1200000,3; sc_start SC_SPEEDUP1,5000,0; },{},{}
+//12239,New_Year_Rice_Cake_2,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 20,15; sc_start SC_DEXFOOD,1200000,3; sc_start SC_AGIFOOD,1200000,3; sc_start SC_VITFOOD,1200000,3; sc_start SC_SPEEDUP1,5000,0; },{},{}
+
+// iRO St. Patrick's Day Event 2008
+//=============================================================
+//12715,Black_Treasure_Chest,Black Treasure Chest,2,0,,200,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_08stpattyseventbox"; },{},{}
+
+// iRO Valentine's Day Event 2009
+//=============================================================
+//12742,Valentine_Gift_Box_M,Valentine Gift Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7946,1; },{},{}
+//12743,Valentine_Gift_Box_F,Valentine Gift Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7947,1; },{},{}
+//12744,Chocolate_Box,Chocolate Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 558,1; },{},{}
+//14466,Valentine's_Emblem_Box,Valentine's Emblem Box,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5817,1; },{},{}
+//7946,Gold_Ring_Of_Valentine,Gold Ring Of Valentine,3,10,,0,,,,,,,,,,,,,{},{},{}
+//7947,Silver_Ring_Of_Valentine,Silver Ring Of Valentine,3,10,,0,,,,,,,,,,,,,{},{},{}
+//7948,Box,Box,3,10,,10,,,,,,,,,,,,,{},{},{}
+//5817,Valentine's_Emblem,Valentine's Emblem,4,10,,0,,3,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAtkRate,3; bonus bMatkRate,3; bonus bAllStats,2; bonus bFlee,10; bonus bAspd,1; bonus bMdef,3; bonus2 bSkillAtk,"AL_HEAL",10; bonus2 bSkillHeal,"AL_HEAL",10; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bAddItemGroupHealRate,IG_Potion,10; },{},{}
+
+// iRO Halloween Event 2009
+//=============================================================
+//5668,Weird_Pumpkin_Hat,Weird Pumpkin Hat,4,20,,0,,5,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus bMdef,5; bonus2 bAddMonsterDropItem,12192,2500; },{},{}
+//6298,Crushed_Pumpkin,Crushed Pumpkin,3,0,,0,,,,,,,,,,,,,{},{},{}
+//6299,Worn_Fabric,Worn Fabric,3,0,,0,,,,,,,,,,,,,{},{},{}
+
+// Old Tuxedo and Wedding Dress, will display the outfit when worn.
+//==================================================================
+//2338,Wedding_Dress,Wedding Dress,4,43000,,500,,0,,0,0xFFFFFFFE,63,0,16,,0,1,0,{},{ sc_start SC_WEDDING,INFINITE_TICK,0; },{ sc_end SC_WEDDING; }
+//7170,Tuxedo,Tuxedo,4,43000,,10,,0,,0,0xFFFFFFFE,63,1,16,,0,1,0,{},{ sc_start SC_WEDDING,INFINITE_TICK,0; },{ sc_end SC_WEDDING; }
+
+// Non-kRO Eden Group Mark effect
+//=============================================================
+//22508,Para_Team_Mark_,Eden Group Mark,11,0,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ unitskilluseid getcharid(3),"AL_TELEPORT",3; },{},{}
--- a/db/import-tmpl/item_db.yml
+++ b/db/import-tmpl/item_db.yml
@@ -1,546 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Database
-###########################################################################
-#
-# Item Settings
-#
-###########################################################################
-# - Id                      Item ID.
-#   AegisName               Server name to reference the item in scripts and lookups, should use no spaces.
-#   Name                    Name in English for displaying as output.
-#   Type                    Item type. (Default: Etc)
-#   SubType                 Weapon, Ammo or Card type. (Default: 0)
-#   Buy                     Buying price. When not specified, becomes double the sell price. (Default: 0)
-#   Sell                    Selling price. When not specified, becomes half the buy price. (Default: 0)
-#   Weight                  Item weight. Each 10 is 1 weight. (Default: 0)
-#   Attack                  Weapon's attack. (Default: 0)
-#   MagicAttack             Weapon's magic attack. (Default: 0)
-#   Defense                 Armor's defense. (Default: 0)
-#   Range                   Weapon's attack range. (Default: 0)
-#   Slots                   Available slots in item. (Default: 0)
-#   Jobs                    Jobs that can equip the item. (Map default is 'All: true')
-#   Classes                 Upper class types that can equip the item. (Map default is 'All: true')
-#   Gender                  Gender that can equip the item. (Default: Both)
-#   Locations               Equipment's placement. (Default: None)
-#   WeaponLevel             Weapon level. (Default: 1 for Weapons)
-#   ArmorLevel              Armor level. (Default: 1 for Armors)
-#   EquipLevelMin           Minimum required level to equip. (Default: 0)
-#   EquipLevelMax           Maximum level that can equip. (Default: 0)
-#   Refineable              If the item can be refined. (Default: false)
-#   View                    View sprite of an item. (Default: 0)
-#   AliasName               Another item's AegisName that will be sent to the client instead of this item's AegisName. (Default: null)
-#   Flags:                  Item flags. (Default: null)
-#     BuyingStore           If the item is available for Buyingstores. (Default: false)
-#     DeadBranch            If the item is a Dead Branch. (Default: false)
-#     Container             If the item is part of a container. (Default: false)
-#     UniqueId              If the item is a unique stack. (Default: false)
-#     BindOnEquip           If the item is bound to the character upon equipping. (Default: false)
-#     DropAnnounce          If the item has a special announcement to self on drop. (Default: false)
-#     NoConsume             If the item is consumed on use. (Default: false)
-#     DropEffect            If the item has a special effect on the ground when dropped by a monster. (Default: None)
-#   Delay:                  Item use delay. (Default: null)
-#     Duration              Duration of delay in seconds.
-#     Status                Status Change used to track delay. (Default: None)
-#   Stack:                  Item stack amount. (Default: null)
-#     Amount                Maximum amount that can be stacked.
-#     Inventory             If the stack is applied to player's inventory. (Default: true)
-#     Cart                  If the stack is applied to the player's cart. (Default: false)
-#     Storage               If the stack is applied to the player's storage. (Default: false)
-#     GuildStorage          If the stack is applied to the player's guild storage. (Default: false)
-#   NoUse:                  Conditions when the item is unusable. (Default: null)
-#     Override              Group level to override these conditions.
-#     Sitting               If the item can not be used while sitting. (Default: false)
-#   Trade:                  Trade restrictions. (Default: null)
-#     Override              Group level to override these conditions.
-#     NoDrop                If the item can not be dropped. (Default: false)
-#     NoTrade               If the item can not be traded. (Default: false)
-#     TradePartner          If the item can not be traded to the player's partner. (Default: false)
-#     NoSell                If the item can not be sold. (Default: false)
-#     NoCart                If the item can not be put in a cart. (Default: false)
-#     NoStorage             If the item can not be put in a storage. (Default: false)
-#     NoGuildStorage        If the item can not be put in a guild storage. (Default: false)
-#     NoMail                If the item can not be put in a mail. (Default: false)
-#     NoAuction             If the item can not be put in an auction. (Default: false)
-#   Script                  Script to execute when the item is used/equipped. (Default: null)
-#   EquipScript             Script to execute when the item is equipped. (Default: null)
-#   UnEquipScript           Script to execute when the item is unequipped or when a rental item expires. (Default: null)
-###########################################################################
-
-Header:
-  Type: ITEM_DB
-  Version: 2
-
-#Body:
-# THQ Quest Items
-#=============================================================
-#  - Id: 1998
-#    AegisName: Jeramiah's_Jur
-#    Name: Jeramiah's Jur
-#    Type: Etc
-#    Sell: 10
-#    Weight: 10
-#    AliasName: Jur
-#  - Id: 1999
-#    AegisName: Zed's_Staff
-#    Name: Zed's Staff
-#    Type: Etc
-#    Sell: 10
-#    Weight: 10
-#    AliasName: Staff_Of_Soul
-#  - Id: 7950
-#    AegisName: THG_Membership
-#    Name: THG Membership
-#    Type: Etc
-#    Sell: 10
-#    Weight: 10
-#    AliasName: Foolishness_Of_Blind
-#  - Id: 7951
-#    AegisName: Gold_Tulip
-#    Name: Token Bag
-#    Type: Etc
-#    Sell: 10
-#    Weight: 10
-#    AliasName: Leather_Bag_Of_Infinity
-
-# Official Event Items that had their Effects removed after the event was completed
-#=============================================================
-#  - Id: 585
-#    AegisName: Wurst
-#    Name: Brusti
-#    Type: Delayconsume
-#    Buy: 2
-#    Weight: 40
-#    Script: |
-#      itemheal rand(15,20),0; itemskill "PR_MAGNIFICAT",3;
-#  - Id: 679
-#    AegisName: Gold_Pill
-#    Name: Pilule
-#    Type: Healing
-#    Buy: 5000
-#    Weight: 300
-#    Script: |
-#      percentheal 50,50;
-#  - Id: 2681
-#    AegisName: Republic_Ring
-#    Name: Republic Anniversary Ring
-#    Type: Armor
-#    Buy: 20
-#    Weight: 100
-#    Locations:
-#      Right_Accessory: true
-#      Left_Accessory: true
-#    Script: |
-#      bonus bAllStats,3;
-#  - Id: 5134
-#    AegisName: Pumpkin_Hat
-#    Name: Pumpkin-Head
-#    Type: Armor
-#    Buy: 20
-#    Weight: 200
-#    Defense: 2
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 206
-#    Script: |
-#      bonus2 bSubRace,RC_Demon,5;
-#  - Id: 5136
-#    AegisName: Santa's_Hat_
-#    Name: Louise's Santa Hat
-#    Type: Armor
-#    Buy: 20
-#    Weight: 100
-#    Defense: 3
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 20
-#    Script: |
-#      bonus bMdef,1; bonus bLuk,1; bonus3 bAutoSpellWhenHit,"AL_HEAL",3,50; bonus3 bAutoSpellWhenHit,"AL_BLESSING",10,50;
-#  - Id: 5145
-#    AegisName: Carnival_Joker_Jester
-#    Name: Carnival Jester
-#    Type: Armor
-#    Buy: 10
-#    Weight: 100
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 89
-#    Script: |
-#      bonus bAllStats,3;
-#  - Id: 5147
-#    AegisName: Baseball_Cap
-#    Name: Baseball Cap
-#    Type: Armor
-#    Weight: 200
-#    Defense: 3
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 216
-#    Script: |
-#      bonus2 bExpAddRace,RC_Boss,50; bonus2 bExpAddRace,RC_NonBoss,50;
-#  - Id: 5201
-#    AegisName: Party_Hat_B
-#    Name: 2nd Anniversary Party Hat
-#    Type: Armor
-#    Buy: 20
-#    Weight: 300
-#    Defense: 3
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 144
-#    Script: |
-#      bonus bAllStats,3;
-#  - Id: 5202
-#    AegisName: Pumpkin_Hat_
-#    Name: Pumpkin Hat
-#    Type: Armor
-#    Buy: 20
-#    Weight: 200
-#    Defense: 2
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 206
-#    Script: |
-#      bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,1500;
-#  - Id: 5204
-#    AegisName: Event_Pierrot_Nose
-#    Name: Rudolf's Red Nose
-#    Type: Armor
-#    Buy: 20
-#    Weight: 100
-#    Locations:
-#      Head_Low: true
-#    View: 49
-#    Script: |
-#      bonus2 bResEff,Eff_Blind,3000; bonus2 bAddMonsterDropItem,12130,30;
-#  - Id: 5264
-#    AegisName: Aussie_Flag_Hat
-#    Name: Australian Flag Hat
-#    Type: Armor
-#    Buy: 20
-#    Weight: 500
-#    Defense: 4
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 304
-#    Script: |
-#      bonus bAllStats,2;
-#  - Id: 5356
-#    AegisName: Pumpkin_Hat_H
-#    Name: Pumpkin Hat
-#    Type: Armor
-#    Buy: 20
-#    Weight: 200
-#    Defense: 2
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 206
-#    Script: |
-#      bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus2 bMagicAddRace,RC_Demon,5;
-#  - Id: 5384
-#    AegisName: Santa_Hat_1
-#    Name: Twin Pompom By JB
-#    Type: Armor
-#    Buy: 20
-#    Weight: 200
-#    Defense: 2
-#    Slots: 1
-#    Locations:
-#      Head_Top: true
-#    EquipLevelMin: 20
-#    Refineable: true
-#    View: 390
-#    Script: |
-#      bonus bLuk,3; bonus2 bResEff,Eff_Curse,2000; bonus bVariableCastrate,-2; bonus bAspdRate,4; bonus2 bAddMonsterDropItem,539,100; bonus2 bAddMonsterDropItem,529,200; bonus2 bAddMonsterDropItem,530,200; autobonus "{ bonus bCritical,10; }",10,5000;
-#  - Id: 5811
-#    AegisName: Santa_Beard
-#    Name: Santa Beard
-#    Type: Armor
-#    Buy: 20
-#    Weight: 100
-#    Defense: 5
-#    Locations:
-#      Head_Low: true
-#    View: 25
-#    Script: |
-#      bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Player_Doram,5;
-#  - Id: 11702
-#    AegisName: Moon_Cookie
-#    Name: Moon Cookie
-#    Type: Delayconsume
-#    Weight: 10
-#    Script: |
-#      sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_HALLUCINATION; itemskill "AL_BLESSING",7;
-#  - Id: 12131
-#    AegisName: Lucky_Potion
-#    Name: Lucky Potion
-#    Type: Healing
-#    Buy: 2
-#    Weight: 100
-#    Script: |
-#      sc_start SC_LUKFOOD,180000,15;
-#  - Id: 12143
-#    AegisName: Red_Can
-#    Name: Red Can
-#    Type: Usable
-#    Buy: 50000
-#    Weight: 300
-#    Script: |
-#      percentheal 25,25;
-
-# Event effect: Summon monster? Probably Rice_Cake. x_x
-#=============================================================
-#  - Id: 12199
-#    AegisName: Rice_Scroll
-#    Name: Rice Scroll
-#    Type: Usable
-#  - Id: 12200
-#    AegisName: Event_Cake
-#    Name: Event Cake
-#    Type: Usable
-#    Buy: 20
-#    Weight: 50
-#    Script: |
-#      itemskill "PR_MAGNIFICAT",3;
-#  - Id: 12238
-#    AegisName: New_Year_Rice_Cake_1
-#    Name: New Year Rice Cake
-#    Type: Healing
-#    Buy: 20
-#    Weight: 100
-#    Script: |
-#      percentheal 20,15; sc_start SC_STRFOOD,1200000,3; sc_start SC_INTFOOD,1200000,3; sc_start SC_LUKFOOD,1200000,3; sc_start SC_SPEEDUP1,5000,0;
-#  - Id: 12239
-#    AegisName: New_Year_Rice_Cake_2
-#    Name: New Year Rice Cake
-#    Type: Healing
-#    Buy: 20
-#    Weight: 100
-#    Script: |
-#      percentheal 20,15; sc_start SC_DEXFOOD,1200000,3; sc_start SC_AGIFOOD,1200000,3; sc_start SC_VITFOOD,1200000,3; sc_start SC_SPEEDUP1,5000,0;
-
-# iRO St. Patrick's Day Event 2008
-#=============================================================
-#  - Id: 7915
-#    AegisName: Copper_Coin_
-#    Name: Bronze Coin
-#    Type: Etc
-#    Weight: 10
-#    AliasName: Copper_Coin
-#  - Id: 7916
-#    AegisName: Silver_Coin_
-#    Name: Silver Coin
-#    Type: Etc
-#    Weight: 10
-#    AliasName: Silver_Coin
-#  - Id: 12715
-#    AegisName: Black_Treasure_Box
-#    Name: Black Treasure Chest
-#    Type: Usable
-#    Weight: 200
-#    AliasName: Treasure_Box_
-#    Script: |
-#      callfunc "F_08stpattyseventbox";
-
-# iRO Valentine's Day Event 2009
-#=============================================================
-#  - Id: 5817
-#    AegisName: Valentine_Pledge
-#    Name: Valentine's Emblem
-#    Type: Armor
-#    Buy: 10
-#    Defense: 3
-#    Locations:
-#      Right_Accessory: true
-#      Left_Accessory: true
-#    Script: |
-#      bonus bAtkRate,3; bonus bMatkRate,3; bonus bAllStats,2; bonus bFlee,10; bonus bAspd,1; bonus bMdef,3; bonus2 bSkillAtk,"AL_HEAL",10; bonus2 bSkillHeal,"AL_HEAL",10; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bAddItemGroupHealRate,IG_Potion,10;
-#  - Id: 7946
-#    AegisName: Gold_Ring_Of_Valentine
-#    Name: Gold Ring Of Valentine
-#    Type: Etc
-#    Buy: 10
-#  - Id: 7947
-#    AegisName: Silver_Ring_Of_Valentine
-#    Name: Silver Ring Of Valentine
-#    Type: Etc
-#    Buy: 10
-#  - Id: 7948
-#    AegisName: Box
-#    Name: Box
-#    Type: Etc
-#    Buy: 10
-#    Weight: 10
-#  - Id: 12742
-#    AegisName: Valentine_Gift_Box_M
-#    Name: Valentine Gift Box
-#    Type: Usable
-#    Buy: 10
-#    Script: |
-#      getitem 7946,1;
-#  - Id: 12743
-#    AegisName: Valentine_Gift_Box_F
-#    Name: Valentine Gift Box
-#    Type: Usable
-#    Buy: 10
-#    Script: |
-#      getitem 7947,1;
-#  - Id: 12744
-#    AegisName: Chocolate_Box
-#    Name: Chocolate Box
-#    Type: Usable
-#    Buy: 10
-#    Script: |
-#      getitem 558,1;
-#  - Id: 14466
-#    AegisName: Valentine's_Emblem_Box
-#    Name: Valentine's Emblem Box
-#    Type: Usable
-#    Buy: 10
-#    Script: |
-#      getitem 5817,1;
-
-# iRO Halloween Event 2009
-#=============================================================
-#  - Id: 5668
-#    AegisName: Weird_Pumpkin_Hat
-#    Name: Weird Pumpkin Hat
-#    Type: Armor
-#    Buy: 20
-#    Defense: 5
-#    Locations:
-#      Head_Top: true
-#    Refineable: true
-#    View: 206
-#    Script: |
-#      bonus bMdef,5; bonus2 bAddMonsterDropItem,12192,2500;
-#  - Id: 6298
-#    AegisName: Pumpkin_Head_Crushed
-#    Name: Crushed Pumpkin
-#    Type: Etc
-#  - Id: 6299
-#    AegisName: Worn_Cloth_Piece
-#    Name: Worn Fabric
-#    Type: Etc
-
-# Old Tuxedo and Wedding Dress, will display the outfit when worn.
-#==================================================================
-#  - Id: 2338
-#    AegisName: Wedding_Dress
-#    Name: Wedding Dress
-#    Type: Armor
-#    Buy: 43000
-#    Weight: 500
-#    Jobs:
-#      All: true
-#      Novice: false
-#    Gender: Female
-#    Locations:
-#      Armor: true
-#    Refineable: true
-#    EquipScript: |
-#      sc_start SC_WEDDING,INFINITE_TICK,0;
-#    UnEquipScript: |
-#      sc_end SC_WEDDING;
-#  - Id: 7170
-#    AegisName: Tuxedo
-#    Name: Tuxedo
-#    Type: Armor
-#    Buy: 43000
-#    Weight: 10
-#    Jobs:
-#      All: true
-#      Novice: false
-#    Gender: Male
-#    Locations:
-#      Armor: true
-#    ArmorLevel: 1
-#    Refineable: true
-#    EquipScript: |
-#      sc_start SC_WEDDING,INFINITE_TICK,0;
-#    UnEquipScript: |
-#      sc_end SC_WEDDING;
-
-# Non-kRO Eden Group Mark effect
-#=============================================================
-#  - Id: 22508
-#    AegisName: Para_Team_Mark_
-#    Name: Eden Group Mark
-#    Type: Delayconsume
-#    Script: |
-#      unitskilluseid getcharid(3),"AL_TELEPORT",3;
-
-# Gender restrictions that were removed on official servers
-#=============================================================
-#  - Id: 2206
-#    Gender: Female
-#  - Id: 2208
-#    Gender: Female
-#  - Id: 2209
-#    Gender: Female
-#  - Id: 2234
-#    Gender: Female
-#  - Id: 2235
-#    Gender: Male
-#  - Id: 2407
-#    Gender: Female
-#  - Id: 2415
-#    Gender: Female
-#  - Id: 2494
-#    Gender: Female
-#  - Id: 5143
-#    Gender: Male
-#  - Id: 5164
-#    Gender: Female
-#  - Id: 5165
-#    Gender: Male
-#  - Id: 5191
-#    Gender: Female
-#  - Id: 5192
-#    Gender: Female
-#  - Id: 5193
-#    Gender: Female
-#  - Id: 5194
-#    Gender: Female
-#  - Id: 5195
-#    Gender: Female
-#  - Id: 5196
-#    Gender: Female
-#  - Id: 5197
-#    Gender: Female
-#  - Id: 5221
-#    Gender: Female
-#  - Id: 5354
-#    Gender: Male
-#  - Id: 5355
-#    Gender: Female
-#  - Id: 5400
-#    Gender: Female
-#  - Id: 5681
-#    Gender: Female
-#  - Id: 5735
-#    Gender: Female
--- a/db/import-tmpl/item_delay.txt
+++ b/db/import-tmpl/item_delay.txt
@@ -0,0 +1,8 @@
+// Item Delay Database
+//
+// Structure of Database:
+// Item ID,Delay in Milliseconds
+//
+// NOTE:
+// There is a max concurrent number of entries set in src/map/itemdb.h as MAX_ITEMDELAYS.
+
--- a/db/import-tmpl/item_findingore.txt
+++ b/db/import-tmpl/item_findingore.txt
@@ -0,0 +1,4 @@
+// Ore Discovery Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate
--- a/db/import-tmpl/item_flag.txt
+++ b/db/import-tmpl/item_flag.txt
@@ -0,0 +1,17 @@
+// Flagged Items
+// <ItemID>,<Flag>
+//
+// <Flag>:
+//  1 - As Dead Branch item (will be logged at `branchlog` table and cannot be used at 'nobranch' mapflag)
+//  2 - As item group container, check player's inventory and weight before consumed
+//  4 - GUID item, cannot be stacked even same or stackable item
+//  8 - Item will be bound item when equipped
+// 16 - Special Broadcast: When item dropped by monster and player loot it, will be broadcasted!
+// 32 - Item will not be removed on consumption. Also supports 'itemskill'
+// 64 - Item will be displayed with a client side defined drop
+// 128 - Item will be displayed with a white pillar drop effect
+// 256 - Item will be displayed with a blue pillar drop effect
+// 512 - Item will be displayed with a yellow pillar drop effect
+// 1024 - Item will be displayed with a purple pillar drop effect
+// 2048 - Item will be displayed with a orange pillar drop effect
+// NOTE: For removing flag by import file, use "-" to remove the flag. Example, 604,-1 will removes flag 1 from Branch_Of_Dead_Tree
--- a/db/import-tmpl/item_giftbox.txt
+++ b/db/import-tmpl/item_giftbox.txt
@@ -0,0 +1,4 @@
+// Gift Box Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate
--- a/db/import-tmpl/item_group_db.txt
+++ b/db/import-tmpl/item_group_db.txt
@@ -0,0 +1,4 @@
+// Item Group Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate{,Amount,Random,isAnnounced,Duration,GUID,isBound,isNamed}
--- a/db/import-tmpl/item_group_db.yml
+++ b/db/import-tmpl/item_group_db.yml
@@ -1,44 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Group Database
-###########################################################################
-#
-# Item Group Settings
-#
-###########################################################################
-# - Group                      Group name of the item.
-#   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.
-#        - Item                AegisName of item that will be obtained from this item group.
-#          Rate                Probability to get the item. See doc/item_group.txt for more information. (Default: 0)
-#          Amount              Amount of item that will be obtained. (Default: 1)
-#          Duration            Makes the item a rental item which will expire within the given amount in minutes. Not intended for use with stackable items. (Default: 0)
-#          Announced           If player obtains this item it will be broadcasted to the server. (Default: false)
-#          UniqueId            Makes the given item(s) have a Unique ID. (Default: UniqueId from item_db)
-#          Stacked             Whether stackable items are given stacked or not. (Default: true)
-#          Named               Inscribes the item with the obtainer's name. (Default: false)
-#          Bound               Binds the obtained item. (Default: None)
-#          Clear               Remove the given item. (Optional)
-#       Clear                  Remove the given SubGroup. (Optional)
-###########################################################################
-
-Header:
-  Type: ITEM_GROUP_DB
-  Version: 1
--- a/db/import-tmpl/item_misc.txt
+++ b/db/import-tmpl/item_misc.txt
@@ -0,0 +1,4 @@
+//
+// Structure of Database:
+// GroupID,ItemID,Rate
+//
--- a/db/import-tmpl/item_nouse.txt
+++ b/db/import-tmpl/item_nouse.txt
@@ -0,0 +1,13 @@
+// Item Usage Restriction Configuration File
+// Defines if an item cannot be used under special circumstances.
+//
+// Structure of Database:
+// ItemID,Flag,Group ID Override
+//
+// Flag:
+//	1 = Cannot use item while sitting
+//	... [more to come]
+//
+// Group ID Override:
+//	Group ID necessary to override this setting.
+
--- a/db/import-tmpl/item_package.txt
+++ b/db/import-tmpl/item_package.txt
@@ -0,0 +1,4 @@
+// Item Package Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate{,Amount,Random,isAnnounced,Duration,GUID,isBound,isNamed}
--- a/db/import-tmpl/item_randomopt_db.txt
+++ b/db/import-tmpl/item_randomopt_db.txt
@@ -0,0 +1,4 @@
+// Items Random Option Database	
+//
+// Structure of Database:
+// ID,{ Bonus Script }
--- a/db/import-tmpl/item_randomopt_db.yml
+++ b/db/import-tmpl/item_randomopt_db.yml
@@ -1,32 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Random Option Database
-###########################################################################
-#
-# Item Random Option Settings
-#
-###########################################################################
-# - Id          Item Random Option ID matching the ID defined in enumvar.lub in the client.
-#   Option      Item Random Option constant.
-#   Script      Bonus script used for option.
-###########################################################################
-
-Header:
-  Type: RANDOM_OPTION_DB
-  Version: 1
--- a/db/import-tmpl/item_randomopt_group.txt
+++ b/db/import-tmpl/item_randomopt_group.txt
@@ -0,0 +1 @@
+// <randopt_groupid>,<rate>,<randopt_id1>,<randopt_value1>,<randopt_param1>{,<randopt_id2>,<randopt_value2>,<randopt_param2>,<randopt_id3>,<randopt_value3>,<randopt_param3>,<randopt_id4>,<randopt_value4>,<randopt_param4>,<randopt_id5>,<randopt_value5>,<randopt_param5>}
--- a/db/import-tmpl/item_randomopt_group.yml
+++ b/db/import-tmpl/item_randomopt_group.yml
@@ -1,46 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Item Random Option Group Database
-###########################################################################
-#
-# Item Random Option Group Settings
-#
-###########################################################################
-# - Id                  Item Random Option Group ID.
-#   Group               Item Random Option Group constant.
-#   Slots:              Slot in which an Item Random Option is guaranteed to be applied. Max of MAX_ITEM_RDM_OPT.
-#     - Slot            Slot number.
-#       Options:        List of possible Item Random Options for slot.
-#         - Option      Item Random Option constant.
-#           MinValue    Minimum value. (Default: 0)
-#           MaxValue    Maximum value. (Default: 0)
-#           Param       Parameter value. (Default: 0)
-#           Chance      Chance applied specifically to this Item Random Option (1 = 0.01%, 10000 = 100%). (Default: 0)
-#   MaxRandom           Maximum amount of random options applied. These options are not guaranteed to be applied. Max of (MAX_ITEM_RDM_OPT - Total 'Slots'). (Default: 0)
-#   Random:             List of possible Item Random Options for remaining slots. (Optional)
-#     - Option          Item Random Option constant.
-#       MinValue        Minimum value. (Default: 0)
-#       MaxValue        Maximum value. (Default: 0)
-#       Param           Parameter value. (Default: 0)
-#       Chance          Chance applied specifically to this Item Random Option (1 = 0.01%, 10000 = 100%). (Default: 0)
-###########################################################################
-
-Header:
-  Type: RANDOM_OPTION_GROUP
-  Version: 1
--- a/db/import-tmpl/item_stack.txt
+++ b/db/import-tmpl/item_stack.txt
@@ -0,0 +1,19 @@
+// Item Stacking Restriction File
+// Prevents an item to be stacked more than x times in given
+// inventory types. Generally used by 3rd class related skill items.
+//
+// Structure of Database:
+// ItemID,MaxStackAmount,Type
+//
+// MaxStackAmount:
+//	Stack limit for the item. Use 0 to disable a restriction.
+//
+// Type mask values:
+//	&1: Character inventory restriction
+//	&2: Character cart restriction
+//	&4: Account storage restriction
+//	&8: Guild storage restriction
+//
+// Example:
+// 512,4,12  // Will not allow more than 4 Apples in storages.
+
--- a/db/import-tmpl/item_trade.txt
+++ b/db/import-tmpl/item_trade.txt
@@ -0,0 +1,22 @@
+// Item Trade Restrictions Database
+// Defines special trade rules for individual items.
+//
+// Structure of Database:
+// Item ID, TradeMask,Group Level Override
+//
+// 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
+//
+// Example:
+// 1161,67,50
+//	Balmung cannot be dropped, traded, or placed in Guild Storage (1+2+64).
+//	Only groups of group-level 50 and up can override this setting.
+
--- a/db/import-tmpl/item_violetbox.txt
+++ b/db/import-tmpl/item_violetbox.txt
@@ -0,0 +1,4 @@
+// Old Violet Box Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate
--- a/db/import-tmpl/job_basehpsp_db.txt
+++ b/db/import-tmpl/job_basehpsp_db.txt
@@ -0,0 +1,14 @@
+// Base HP/SP Tables
+// Supports up to base level 500.
+//
+// Structure of Database:
+// StartLevel,EndLevel,JobID,Type,Base value for Lv 1,2,...,Base value for 'Max level'
+//
+// Type:
+//	0 = BaseHP, 1 = BaseSP
+
+//===============================
+// Base HP Table
+// According to base HP calculation on http://irowiki.org/wiki/Max_HP
+//===============================
+
--- a/db/import-tmpl/job_db1.txt
+++ b/db/import-tmpl/job_db1.txt
@@ -0,0 +1,5 @@
+// Job-specific Values Database
+//
+// Structure of Database:
+// JobID,Weight,HPFactor,HPMultiplicator,SPFactor,Unarmed,Dagger,1HSword,2HSword,1HSpear,2HSpear,1HAxe,2HAxe,1HMace,2HMace(unused),Rod,Bow,Knuckle,Instrument,Whip,Book,Katar,Revolver,Rifle,Gatling Gun,Shotgun,Grenade Launcher,Fuuma Shuriken,2HStaff,Shield
+//
--- a/db/import-tmpl/job_db2.txt
+++ b/db/import-tmpl/job_db2.txt
@@ -0,0 +1,14 @@
+// Job-specific Stat Bonuses Database
+//
+// Structure of Database:
+// JobID,JobLv1,JobLv2,JobLv3,...
+//
+// Legend for 'JobLvN' fields:
+//  0 = No stat bonus at this job level
+//  1 = STR increased by 1 at this job level
+//  2 = AGI increased by 1 at this job level
+//  3 = VIT increased by 1 at this job level
+//  4 = INT increased by 1 at this job level
+//  5 = DEX increased by 1 at this job level
+//  6 = LUK increased by 1 at this job level
+
--- a/db/import-tmpl/job_exp.txt
+++ b/db/import-tmpl/job_exp.txt
--- a/db/import-tmpl/job_param_db.txt
+++ b/db/import-tmpl/job_param_db.txt
@@ -0,0 +1,16 @@
+// Max Parameter Database
+// Sets maximum stat parameters for specific jobs.
+//
+// Structure of Database:
+// JobID,MaxParam
+//	OR
+// JobID,MaxStr,MaxAgi,MaxVit,MaxInt,MaxDex,MaxLuk
+//
+// JobID: Job constants in 'db/const.txt'
+// MaxParams: Value between 10 ~ 32767 (SHRT_MAX)
+//
+// Examples:
+// Job_Novice,60
+//	Normally, Novice's max. param uses 'max_parameter' in 'conf/battle/player.conf'.
+//	With this config, Novice's max. param will be 60 (for all stats).
+
--- a/db/import-tmpl/job_stats.yml
+++ b/db/import-tmpl/job_stats.yml
--- a/db/import-tmpl/level_penalty.txt
+++ b/db/import-tmpl/level_penalty.txt
@@ -0,0 +1,14 @@
+// Experience & Drop Rate Modifier Database
+//
+// Structure of Database:
+// Type,Class,Level difference,Rate
+//
+// TYPE:
+//   1=experience, 2=item drop
+// CLASS:
+//   0=Normal monsters, 1=Boss monsters, 2=Guardians
+//
+// Note: RENEWAL_DROP and/or RENEWAL_EXP must be enabled.
+
+// EXP modifiers due to level difference
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aleos	0afc77f91b	Merge branch 'master' into feature/blocking_play	2020-09-10 08:26:20 -04:00
aleos	039645edfe	Small cleanup	2020-08-13 11:24:20 -04:00
Aleos	55cef01a39	Merge branch 'master' into feature/blocking_play	2020-08-13 11:19:44 -04:00
aleos	9776c668a3	Minor cleanups	2020-08-05 11:42:45 -04:00
Aleos	9d99e07c7b	Merge branch 'master' into feature/blocking_play	2020-08-05 11:18:59 -04:00
aleos	428e0c3744	Merge branch 'master' into feature/blocking_play	2020-06-22 10:30:31 -04:00
Aleos	d1d1a196ea	Adds a warping state check Thanks to @Lemongrass3110!	2020-04-30 08:54:20 -04:00
Aleos	506cf4fbdd	Merge branch 'master' into feature/blocking_play	2020-04-30 08:51:56 -04:00
Aleos	063d8503ee	Merge branch 'master' into feature/blocking_play	2018-11-16 08:46:32 -05:00
Lemongrass3110	3409709718	Added missing SC definition	2018-10-31 09:55:30 +01:00
aleos89	3b1824fef5	Implemented Blocking Play feature * Adds the SC_BLOCKING_PLAY status that keeps players from moving, using/picking/dropping items, using skills, chatting, and swapping equipment while changing maps. * Disables the ability for players to pre-cast skills when changing maps to avoid cast times. Thanks to @mrjnumber1!	2018-10-30 14:14:19 -04:00
				`@@ -0,0 +1 @@`
				`// <randopt_groupid>,<rate>,<randopt_id1>,<randopt_value1>,<randopt_param1>{,<randopt_id2>,<randopt_value2>,<randopt_param2>,<randopt_id3>,<randopt_value3>,<randopt_param3>,<randopt_id4>,<randopt_value4>,<randopt_param4>,<randopt_id5>,<randopt_value5>,<randopt_param5>}`