Implemented NPC_VENOMIMPRESS

* The skill is a copy of GC_VENOMIMPRESS without the sp requirement and the global delay

.editorconfig

@@ -6,15 +6,9 @@ root = true
 
 # Add a blank newline to the end of every file after saving
 # Trim trailing whitespace
-# Adjust character set
 [*]
 insert_final_newline = true
 trim_trailing_whitespace = true
-charset = utf-8
-
-# Use tabs in source
-[*.{cpp,c,hpp,h}]
-indent_style = tab
 
 # YAML does not support hard tabs.
 [*.{yml,yaml}]

.gitattributes

@@ -1,6 +1,6 @@
 *        text=auto
 *.cpp diff=cpp
-*.yml diff text eol=lf
+*.yml diff
 *.sln    merge=union
 *.vcproj merge=union
 *.vcxproj merge=union

.gitignore

@@ -124,6 +124,3 @@ Thumbs.db
 /libmysql.dll
 /pcre8.dll
 /zlib.dll
-
-# CMakeFiles
-/CMakeFiles/

README.md

@@ -1,72 +1,205 @@
-<img src="branding/logo.png" align="right" height="90" />
+rAthena
+=======
 
-# 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)
-> rAthena is a collaborative software development project revolving around the creation of a robust massively multiplayer online role playing game (MMORPG) server package. Written in C, the program is very versatile and provides NPCs, warps and modifications. The project is jointly managed by a group of volunteers located around the world as well as a tremendous community providing QA and support. rAthena is a continuation of the eAthena project.
+Build Status: [![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)
 
-[Forum](https://rathena.org/board)|[Discord](https://rathena.org/discord)|[Wiki](https://github.com/rathena/rathena/wiki)|[FluxCP](https://github.com/rathena/FluxCP)|[Crowdfunding](https://rathena.org/board/crowdfunding/)|[Fork and Pull Request Q&A](https://rathena.org/board/topic/86913-pull-request-qa/)
---------|--------|--------|--------|--------|--------
+Table of Contents
+---------
+1. What is rAthena?
+2. Prerequisites
+3. Installation
+4. Troubleshooting
+5. Helpful Links
+6. More Documentation
+7. How to Contribute
 
-### Table of Contents
-1. [Prerequisites](#1-prerequisites)
-2. [Installation](#2-installation)
-3. [Troubleshooting](#3-troubleshooting)
-4. [More Documentation](#4-more-documentation)
-5. [How to Contribute](#5-how-to-contribute)
-6. [License](#6-license)
+1. What is rAthena?
+---------
+rAthena is a collaborative software development project revolving around the
+creation of a robust massively multiplayer online role playing game (MMORPG)
+server package. Written in C, the program is very versatile and provides NPCs,
+warps and modifications. The project is jointly managed by a group of volunteers
+located around the world as well as a tremendous community providing QA and
+support. rAthena is a continuation of the eAthena project.
 
-## 1. Prerequisites
-Before installing rAthena there are certain tools and applications you will need which
-differs between the varying operating systems available.
+2. Prerequisites
+---------
+Before installing rAthena there are certain tools and applications you will need.
+This differs between the varying operating systems available, so the following
+is broken down into Windows and Linux prerequisites.
 
-### Hardware
-Hardware Type | Minimum | Recommended
-------|------|------
-CPU | 1 Core | 2 Cores
-RAM | 1 GB | 2 GB
-Disk Space | 300 MB | 500 MB
+* Windows
+	* MySQL ( http://www.mysql.com/downloads/mysql/ )
+	* MySQL Workbench ( http://www.mysql.com/downloads/workbench/ )
+	* MS Visual Studio ( https://www.visualstudio.com/downloads/ )
+	* TortoiseGIT ( http://code.google.com/p/tortoisegit/ )
+	* git for Windows ( https://gitforwindows.org/ )
 
-### Operating System & Preferred Compiler
-Operating System | Compiler
-------|------
-Linux  | [gcc-5 or newer](https://www.gnu.org/software/gcc/gcc-5/) / [Make](https://www.gnu.org/software/make/)
-Windows | [MS Visual Studio 2013, 2015, 2017](https://www.visualstudio.com/downloads/)
+* Linux (names of packages may require specific version numbers on certain distributions)
+	* gcc
+	* g++
+	* make
+	* mysql
+	* mysql-devel
+	* mysql-server
+	* pcre-devel
+	* zlib-devel
+	* git
 
-### Required Applications
-Application | Name
-------|------
-Database | [MySQL 5 or newer](https://www.mysql.com/downloads/) / [MariaDB 5 or newer](https://downloads.mariadb.org/)
-Git | [Windows](https://gitforwindows.org/) / [Linux](https://git-scm.com/download/linux)
+3. Installation 
+---------
+This section is a very brief set of installation instructions. For more concise guides
+relevant to your Operation System, please refer to the Wiki (links at the end of this file).
 
-### Optional Applications
-Application | Name
-------|------
-Database | [MySQL Workbench 5 or newer](http://www.mysql.com/downloads/workbench/)
+* Windows
+	* Install prerequisites
+	* Create a folder to download rAthena into (e.g. C:\rAthena)
+	* Right click this folder and select "Git Clone"
+	* Paste the GitHub URL into the box:
 
-## 2. Installation 
+				https://github.com/rathena/rathena.git
+				
+	* Open MySQL Workbench and create an instance to connect to your MySQL Server
+	* Create a database (rathena), a user (rathena), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE)
+		and then login using the new user
+	* Use MySQL Workbench to run the .sql files in /sql-files/ on the new rathena database
 
-### Full Installation Instructions
-  * [Windows](https://github.com/rathena/rathena/wiki/Install-on-Windows)
-  * [CentOS](https://github.com/rathena/rathena/wiki/Install-on-Centos)
-  * [Debian](https://github.com/rathena/rathena/wiki/Install-on-Debian)
-  * [FreeBSD](https://github.com/rathena/rathena/wiki/Install-on-FreeBSD)
+* Linux
+	* Type:
+		* (For CentOS)
 
-## 3. Troubleshooting
+				yum install gcc g++ make mysql mysql-devel mysql-server pcre-devel zlib-devel git
+		* (For Debian)
 
+				apt-get install git make gcc g++ libmysqlclient-dev zlib1g-dev libpcre3-dev
+	* Type:
+
+				mysql_secure_installation
+	* Start your MySQL server
+	* Setup a MySQL user:
+
+				CREATE USER 'rathena'@'localhost' IDENTIFIED BY 'password';
+	* Assign permissions:
+
+				GRANT SELECT,INSERT,UPDATE,DELETE ON `rathena\_rag`.* TO 'rathena'@'localhost';
+	* Clone a GIT repository:
+
+				git clone https://github.com/rathena/rathena.git ~/rathena
+	* Insert SQL files:
+
+				mysql --user=root -p rathena_rag < trunk/sql-files/main.sql (and others)
+	* Configure and compile:
+
+				./configure && make clean && make server
+	* Configure and compile (for Centos 64 bit with Maria DB):
+
+				./configure --enable-64bit --with-MYSQL_LIBS=/usr/lib64/libmysqlclient.so && make clean && make server
+	* When you're ready, start the servers:
+
+				./athena-start start
+
+* Optional
+	* If you want to have your own forked version but still get updates from the main rAthena repository
+		* Fork this repository to your GitHub account
+		* List the current configured remote repository for your fork:
+		
+				git remote -v
+
+		* Specify a new remote upstream repository that will be synced with your fork:
+		
+				git remote add upstream https://github.com/rathena/rathena.git
+				
+		* Verify the new upstream repository you've specified for your fork:
+		
+				git remote -v
+				
+		* You should see the main rAthena repository as well as your forked repository
+		* Now, when you want to get updates from rAthena, simply do:
+		
+				git pull upstream master
+
+	* Remember that rAthena falls under [GNU GPLv3](https://github.com/rathena/rathena/blob/master/LICENSE).
+
+4. Troubleshooting
+---------
 If you're having problems with starting your server, the first thing you should
 do is check what's happening on your consoles. More often that not, all support issues
-can be solved simply by looking at the error messages given. Check out the [wiki](https://github.com/rathena/rathena/wiki)
-or [forums](https://rathena.org/forum) if you need more support on troubleshooting.
+can be solved simply by looking at the error messages given.
 
-## 4. More Documentation
+Examples:
+
+* You get an error on your map-server that looks something like this:
+
+			[Error]: npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in 
+				file 'npc/custom/jobmaster.txt', line '17'. Skipping line...
+				* w1=prontera,153,193,6 script
+				* w2=Job Master
+				* w3=123,{
+				* w4=
+
+    If you look at the error, it's telling you that you're missing (or have an extra) TAB.
+		This is easily fixed by looking at this part of the error:
+
+				* w1=prontera,153,193,6 script
+
+	If there was a TAB where it's supposed to be, that line would have prontera,153,193,6 at w1
+		and 'script' at w2. As there's a space instead of a TAB, the two sections are read as a
+		single parameter.
+
+* You have a default user/password warning similar to the following:
+
+			[Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED.
+			[Notice]: Please edit your 'login' table to create a proper inter-server user/pa
+			ssword (gender 'S')
+			[Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo
+			rt/map_conf.txt)
+
+    Relax. This is just indicating that you're using the default username and password. To
+		fix this, check over the part in the installation instructions relevant to the `login` table.
+	
+* Your map-server outputs the following:
+
+			[Error]: make_connection: connect failed (socket #2, error 10061: No connection
+			could be made because the target machine actively refused it.
+			)!
+
+    If this shows up on the map server, it generally means that there is no Char Server available
+		to accept the connection.
+
+
+
+5. Helpful Links
+---------
+* rAthena Forums
+	* https://rathena.org/
+
+* GIT Repository
+	* https://github.com/rathena/rathena
+
+* Full Installation Instructions
+	* [Windows](https://github.com/rathena/rathena/wiki/Install-on-Windows)
+	* [CentOS](https://github.com/rathena/rathena/wiki/Install-on-Centos)
+	* [Debian](https://github.com/rathena/rathena/wiki/Install-on-Debian)
+	* [FreeBSD](https://github.com/rathena/rathena/wiki/Install-on-FreeBSD)
+
+* rAthena Discord Chat
+	https://rathena.org/discord
+
+* rAthena Wiki
+	https://github.com/rathena/rathena/wiki
+
+* Fork and Pull Request Q&A
+	https://rathena.org/board/topic/86913-pull-request-qa/
+
+
+6. More Documentation
+---------
 rAthena has a large collection of help files and sample NPC scripts located in the /doc/
 directory. These include detailed explanations of NPC script commands, atcommands (@),
 group permissions, item bonuses, and packet structures, among many other topics. We
 recommend that all users take the time to look over this directory before asking for
 assistance elsewhere.
 
-## 5. How to Contribute
+7. How to Contribute
+---------
 Details on how to contribute to rAthena can be found in [CONTRIBUTING.md](https://github.com/rathena/rathena/blob/master/.github/CONTRIBUTING.md)!
-
-## 6. License
-Copyright (c) rAthena Development Team - Licensed under [GNU General Public License v3.0](https://github.com/rathena/rathena/blob/master/LICENSE)

appveyor.yml

@@ -1,4 +1,4 @@
-image: Visual Studio 2015
+image: Visual Studio 2013
 # This is the default location, but we put it here for safety reasons, since we use it in our test script
 clone_folder: c:\projects\rathena
 # We do not need the git history for our integration tests
@@ -8,8 +8,10 @@ pull_requests:
   do_not_increment_build_number: true
 environment:
   matrix:
-  - Defines: "\"BUILDBOT\""
-  - Defines: "\"BUILDBOT;PRERE\""
+  - VisualStudioVersion: 14.0
+    Defines: "\"BUILDBOT\""
+  - VisualStudioVersion: 14.0
+    Defines: "\"BUILDBOT;PRERE\""
 platform:
   - Win32
   - x64
@@ -24,12 +26,8 @@ build_script:
 services: mysql
 test_script:
 - cmd: >-
-    rem ========================================================================
-    
     rem Set up the environment variables we need
     
-    rem ========================================================================
-    
     set DB_HOST=127.0.0.1
     
     set DB_ROOT=root
@@ -46,28 +44,53 @@ test_script:
     
     cd C:\projects\rathena
     
-    rem ========================================================================
-    
+    rem TODO should be replace with tools\ci\sql.bat as soon as possible
     rem MySQL database setup
     
-    rem ========================================================================
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;"
     
-    call tools\ci\sql.bat
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\main.sql"
     
-    rem ========================================================================
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\logs.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db2_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_db2_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\mob_skill_db2_re.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\roulette_default_data.sql"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "GRANT SELECT,INSERT,UPDATE,DELETE ON %DB_NAME%.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';"
     
     rem Activate all custom and test scripts
     
-    rem ========================================================================
-    
     start /d tools\ci npc.bat
     
-    rem ========================================================================
-    
     rem Start the map server
     
-    rem ========================================================================
-    
     login-server.exe --run-once
     
     char-server.exe --run-once

conf/atcommand_athena.conf

@@ -0,0 +1,73 @@
+/* Atcommands and charcommands configuration file */
+
+/* The symbol that will be used to recognize commands.
+You can set any one character except:
+ - control-characters (0x00-0x1f),
+ - '%' (party chat symbol)
+ - '$' (guild chat symbol)
+ - '/' (client commands symbol)
+atcommand_symbol represents @commands used locally.
+charcommand_symbol represents #commands used on other players.
+*/
+
+atcommand_symbol : "@"
+charcommand_symbol: "#"
+
+/* Command aliases
+You can define aliases for any command. Aliases work just like original
+command.
+Format is
+	<commandname>: ["<alias>", ...]
+*/
+
+aliases: {
+	mobinfo: ["monsterinfo", "mi"]
+	iteminfo: ["ii"]
+	time: ["date", "serverdate", "servertime"]
+	autotrade: ["at"]
+	help: ["h"]
+	jumpto: ["goto", "warpto"]
+	mount: ["mountpeco"]
+	who: ["whois"]
+	npctalk: ["npctalkc"]
+	gvgon: ["gpvpon"]
+	gvgoff: ["gpvpoff"]
+	jobchange: ["job"]
+	load: ["return"]
+	warp: ["rura", "mapmove"]
+	dye: ["ccolor"]
+	hairstyle: ["hstyle"]
+	haircolor: ["hcolor"]
+	monster: ["spawn"]
+	blvl: ["lvup", "blevel", "baselvl", "baselvup", "baselevel", "baselvlup"]
+	jlvl: ["jlevel", "joblvl", "joblvup", "joblevel", "joblvlup"]
+	glvl: ["glevel", "guildlvl", "guildlvup", "guildlevel", "guildlvlup"]
+	resetstat: ["streset"]
+	resetskill: ["skreset"]
+	allskill: ["allskills", "skillall", "skillsall"]
+	allstats: ["allstat", "statall", "statsall"]
+	ban: ["banish"]
+	unban: ["unbanish"]
+	unjail: ["discharge"]
+	homlevel: ["hlvl", "hlevel", "homlvl", "homlvup"]
+	homevolution: ["homevolve"]
+	mutearea: ["stfu"]
+	monsterignore: ["battleignore"]
+	raise: ["revive"]
+	kill: ["die"]
+	guildstorage: ["gstorage"]
+	accinfo: ["accountinfo"]
+	itemreset: ["clearinventory"]
+	channel: ["main"]
+	autoloottype: ["aloottype"]
+	cloneequip: ["eqclone"]
+	clonestat: ["stclone"]
+	reloadnpcfile: ["reloadnpc"]
+	changedress: ["nocosplay"]
+	camerainfo: ["viewpointvalue", "setcamera"]
+}
+
+/* Commands help file */
+help: {
+	@include "conf/help.txt"
+}

conf/atcommands.yml

@@ -1,970 +0,0 @@
-# This file is a part of rAthena.
-#   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
-# 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/>.
-#
-###########################################################################
-# Atcommand Database
-###########################################################################
-#
-# Atcommand Settings
-#
-###########################################################################
-# - Command                  Command name.
-#   Aliases:                 Aliases for the command. (Optional)
-#     - <AliasName>
-#   Help                     Help message for the command. (Optional)
-###########################################################################
-
-Header:
-  Type: ATCOMMAND_DB
-  Version: 1
-
-Body:
-  - Command: help
-    Aliases:
-      - h
-    Help: |
-      Params: <command>
-      Shows help for specified command.
-  - Command: noask
-    Help: |
-      Auto rejects deals/invites.
-  - Command: gmotd
-    Help: |
-      Broadcasts the Message of The Day to all players.
-  - Command: me
-    Help: |
-      Params: <message>
-      Displays normal text as a message in this format: *name message* (like /me in mIRC).
-  - Command: fakename
-    Help: |
-      Params: <name>
-      Changes your name to your choice temporarily.
-  - Command: npctalk
-    Aliases:
-      - npctalkc
-    Help: |
-      Params: <NPC name> <message>
-      Forces a NPC to display a message in normal chat.
-  - Command: broadcast
-    Help: |
-      Params: <message>
-      Broadcasts a message with your name (in yellow).
-  - Command: kami
-    Help: |
-      Params: <message>
-      Broadcasts a message without your name (in yellow).
-  - Command: kamib
-    Help: |
-      Params: <message>
-      Broadcasts a message without your name (in blue).
-  - Command: localbroadcast
-    Help: |
-      Params: <message>
-      Broadcasts a message with your name (in yellow) only on your map.
-  - Command: commands
-    Help: |
-      Displays a list of commands that you can use.
-  - Command: rates
-    Help: |
-      Displays the server's current rates.
-  - Command: uptime
-    Help: |
-      Displays how long the server has been online.
-  - Command: showdelay
-    Help: |
-      Shows/hides the "There is a delay after this skill" message.
-  - Command: exp
-    Help: |
-      Displays current levels and % progress.
-  - Command: mobinfo
-    Aliases:
-      - monsterinfo
-      - mi
-    Help: |
-      Params: <monster name|ID>
-      Shows monster info (stats, exp, drops etc).
-  - Command: iteminfo
-    Aliases:
-      - ii
-    Help: |
-      Params: <item name|ID>
-      Shows item info (type, price etc).
-  - Command: whodrops
-    Help: |
-      Params: <item name|ID>
-      Shows who drops an item (monster with highest drop rates).
-  - Command: version
-    Help: |
-      Displays SVN version of the server.
-  - Command: email
-    Help: |
-      Params: <current email> <new email>
-      Changes your account e-mail address.
-  - Command: where
-    Help: |
-      Params: <char name>
-      Tells you the location of a character.
-  - Command: time
-    Aliases:
-      - date
-      - serverdate
-      - servertime
-    Help: |
-      Shows the date and time of the server.
-  - Command: showexp
-    Help: |
-      Displays/hides experience gained.
-  - Command: showzeny
-    Help: |
-      Displays/hides Zeny gained.
-  - Command: mobsearch
-    Help: |
-      Params: <monster name|ID>
-      Shows the location of a certain mob on the current map.
-  - Command: who
-    Aliases:
-      - whois
-    Help: |
-      Params: [<name>]
-      Shows a list of online players and their party and guild.
-  - Command: who2
-    Help: |
-      Params: [<name>]
-      Shows a list of online players and their job.
-  - Command: who3
-    Help: |
-      Params: [<name>]
-      Shows a list of online players and their location.
-  - Command: whomap
-    Help: |
-      @whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specified map.
-  - Command: whogm
-    Help: |
-      Params: [match_text] - Like @who+@who2+who3, but only for GM.
-  - Command: guildspy
-    Help: |
-      Params: <guild name|id> - You will receive all messages of the guild channel (Chat logging must be enabled)
-  - Command: partyspy
-    Help: |
-      @partyspy <party name|id> - You will receive all messages of the party channel (Chat logging must be enabled)
-  - Command: mapinfo
-    Help: |
-      Params: [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: chatrooms).
-  - Command: go
-    Help: |
-      Params: <city name|number>
-      Warps you to a city.
-      -3: (Memo point 2)  14: louyang         31: mora
-      -2: (Memo point 1)  15: start point     32: dewata
-      -1: (Memo point 0)  16: prison/jail     33: malangdo island
-       0: prontera              17: jawaii             34: malaya port
-       1: morocc                18: ayothaya       35: eclage
-       2: geffen                  19: einbroch       36: lasagna
-       3: payon                  20: lighthalzen
-       4: alberta                 21: einbech
-       5: izlude                   22: hugel
-       6: aldebaran           23: rachel
-       7: xmas (lutie)        24: veins
-       8: comodo               25: moscovia
-       9: yuno                     26: midgard camp
-      10: amatsu               27: manuk
-      11: gonryun              28: splendide
-      12: umbala               29: brasilis
-      13: niflheim              30: el dicastes
-  - Command: jumpto
-    Aliases:
-      - goto
-      - warpto
-    Help: |
-      Params: <char name>
-      Warps you to selected character.
-  - Command: follow
-    Help: |
-      Params: <char name>
-      Follow a player.
-  - Command: mount
-    Aliases:
-      - mountpeco
-    Help: |
-      Give/remove a job-based mount (class is required, but not the skill).
-  - Command: mount2
-    Help: |
-      Give/remove a cash mount.
-  - Command: disguise
-    Help: |
-      Params: <monster name|ID>
-      Change your appearence to other players to a mob.
-  - Command: undisguise
-    Help: |
-      Restore your normal appearance.
-  - Command: disguiseguild
-    Help: |
-      Disguises all online characters of a guild.
-  - Command: undisguiseguild
-    Help: |
-      Restore the normal appearance of all characters of a guild.
-  - Command: model
-    Help: |
-      Params:  <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence.
-  - Command: size
-    Help: |
-      Params:  <0-2> Changes your size (0-Normal 1-Small 2-Large)
-  - Command: sizeall
-    Help: |
-      Changes the size of all players.
-  - Command: sizeguild
-    Help: |
-      Changes the size of all online characters of a guild.
-  - Command: hide
-    Help: |
-      Makes you character invisible (GM invisibility). Type again to become visible.
-  - Command: save
-    Help: |
-      Sets respawn point to current spot.
-  - Command: load
-    Aliases:
-      - return
-    Help: |
-      Warps you to your save point.
-  - Command: warp
-    Aliases:
-      - rura
-      - mapmove
-    Help: |
-      Params: <mapname> [<x> <y>]
-      Warps you to the selected map and position.
-  - Command: jump
-    Help: |
-      Params: [<x> [<y>]]
-      Randomly warps you like a flywing.
-  - Command: jobchange
-    Aliases:
-      - job
-    Help: |
-      Params: <job name|ID>
-      Changes your job.
-      ----- Novice / 1st Class -----
-         0 Novice              1 Swordman            2 Magician            3 Archer
-         4 Acolyte              5 Merchant               6 Thief
-      ----- 2nd Class -----
-         7 Knight               8 Priest                     9 Wizard               10 Blacksmith
-        11 Hunter           12 Assassin            14 Crusader          15 Monk
-        16 Sage              17 Rogue                 18 Alchemist         19 Bard
-        20 Dancer
-      ----- High Novice / High 1st Class -----
-      4001 Novice High     4002 Swordman High    4003 Magician High    4004 Archer High
-      4005 Acolyte High     4006 Merchant High       4007 Thief High
-      ----- Transcendent 2nd Class -----
-      4008 Lord Knight      4009 High Priest             4010 High Wizard      4011 Whitesmith
-      4012 Sniper               4013 Assassin Cross   4015 Paladin              4016 Champion
-      4017 Professor         4018 Stalker                    4019 Creator               4020 Clown
-      4021 Gypsy
-      ----- 3rd Class (Regular) -----
-      4054 Rune Knight    4055 Warlock                 4056 Ranger            4057 Arch Bishop
-      4058 Mechanic         4059 Guillotine Cross  4066 Royal Guard   4067 Sorcerer
-      4068 Minstrel            4069 Wanderer              4070 Sura                 4071 Genetic
-      4072 Shadow Chaser
-      ----- 3rd Class (Transcendent) -----
-      4060 Rune Knight    4061 Warlock                 4062 Ranger             4063 Arch Bishop
-      4064 Mechanic         4065 Guillotine Cross  4073 Royal Guard    4074 Sorcerer
-      4075 Minstrel            4076 Wanderer              4077 Sura                  4078 Genetic
-      4079 Shadow Chaser
-      ----- 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
-      ----- 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
-      ---- Baby 2nd Class ----
-      4030 Baby Knight     4031 Baby Priest         4032 Baby Wizard         4033 Baby Blacksmith
-      4034 Baby Hunter    4035 Baby Assassin   4037 Baby Crusader    4038 Baby Monk
-      4039 Baby Sage       4040 Baby Rogue        4041 Baby Alchemist   4042 Baby Bard
-      4043 Baby Dancer
-      ---- Baby 3rd Class ----
-      4096 Baby Rune Knight  4097 Baby Warlock     4098 Baby Ranger           4099 Baby Arch Bishop
-      4100 Baby Mechanic       4101 Baby Glt. Cross  4102 Baby Royal Guard  4103 Baby Sorcerer
-      4104 Baby Minstrel          4105 Baby Wanderer   4106 Baby Sura             4107 Baby Genetic
-      4108 Baby Shadow Chaser
-      ---- Expanded Baby Class ----
-      4220 Baby Summoner        4222 Baby Ninja        4223 Baby Kagero         4224 Baby Oboro
-      4225 Baby Taekwon       4226 Baby Star Glad    4227 Baby Soul Linker    4228 Baby Gunslinger
-      4229 Baby Rebellion   4241 Baby Star Emperor    4242 Baby Soul Reaper
-      ---- Modes And Others ----
-       22 Wedding            26 Christmas          27 Summer           28 Hanbok
-       29 Oktoberfest       30 Summer 2
-       4048 Star Gladiator (Union)	    4238 Baby Star Glad (Union)
-  - Command: option
-    Help: |
-      Params: <param1> <param2>(stackable) <param3>(stackable)
-      Adds different visual effects on or around your character.
-       <param1>       <param2>        <param3>
-      01: Stone      01: Sight       01: Sight          512: Cart Lv. 4
-      02: Frozen     02: Curse       02: Hiding        1024: Cart Lv. 5
-      03: Stun       04: Silence     04: Cloaking      2048: Orc Head
-      04: Sleep      08: Signum      08: Cart Lv. 1    4096: Wedding
-      06: Petrify    16: Blind       16: Falcon        8192: Ruwach
-      07: Burning    32: Angelus     32: Riding       16384: Chasewalk
-      08: Imprison   64: Bleeding    64: Invisible
-      16: (Nothing) 128: D. Poison  128: Cart Lv. 2
-      32: (Nothing) 256: Fear       256: Cart Lv. 3
-  - Command: heal
-    Help: |
-      Params: [<HP> <SP>]
-      Heals the desired amount of HP and SP. No value specified will do a full heal.
-  - Command: dye
-    Aliases:
-      - ccolor
-    Help: |
-      Params: <clothes palette no.>
-      Changes your characters clothes color.
-  - Command: hairstyle
-    Aliases:
-      - hstyle
-    Help: |
-      Params: <hairstyle no.>
-      Changes your hair style.
-  - Command: haircolor
-    Aliases:
-      - hcolor
-    Help: |
-      Params <hair palette no.>
-      Changes your hair color.
-  - Command: speed
-    Help: |
-      Params: <1-1000>
-      Changes you walking speed. 1 being the fastest and 1000 the slowest. Default is 150.
-  - Command: effect
-    Help: |
-      Params: <effect id> [<flag>]
-      Give an effect to your character.
-  - Command: dropall
-    Help: |
-      Params: [<item type>]
-      Throws all your possession on the ground. No type specified will drop all items.
-  - Command: storeall
-    Help: |
-      Puts all your possessions in storage.
-  - Command: killable
-    Help: |
-      Make your character killable.
-  - Command: memo
-    Help: |
-      Params: [memo position]
-      Set/change a memo location (no position: display memo points).
-  - Command: spiritball
-    Help: |
-      Params: <1-100>
-      Gives you "spirit spheres" like from the skill "Call Spirits".
-  - Command: questskill
-    Help: |
-      Params: <#>
-      Gives you the specified quest skill
-      Novice = 142: First Aid, 143: Act Dead
-      Archer = 147: Create Arrow, 148: Charge Arrow
-      Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk
-      Acolyte = 156: Holy Light
-      Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone
-      Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store
-      Magician = 157: Energy Coat
-      Hunter = 1009: Phantasmic Arrow
-      Bard = 1010: Pang Voice
-      Dancer = 1011: Wink of Charm
-      Knight = 1001: Charge Attack
-      Crusader = 1002: Shrink
-      Priest = 1014: Redemptio
-      Monk = 1015: Ki Translation, 1016: Ki Explosio
-      Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife
-      Rogue = 1005: Close Confine
-      Blacksmith = 1012: Unfair Trick, 1013: Greed
-      Alchemist = 238: Basis of Life
-      Wizard = 1006: Sight Blaster
-      Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)
-  - Command: lostskill
-    Help: |
-      Params: <#>
-      Takes away the specified quest skill from you
-      Novice = 142: First Aid, 143: Act Dead
-      Archer = 147: Create Arrow, 148: Charge Arrow
-      Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk
-      Acolyte = 156: Holy Light
-      Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone
-      Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store
-      Magician = 157: Energy Coat
-      Hunter = 1009: Phantasmic Arrow
-      Bard = 1010: Pang Voice
-      Dancer = 1011: Wink of Charm
-      Knight = 1001: Charge Attack
-      Crusader = 1002: Shrink
-      Priest = 1014: Redemptio
-      Monk = 1015: Ki Translation, 1016: Ki Explosio
-      Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife
-      Rogue = 1005: Close Confine
-      Blacksmith = 1012: Unfair Trick, 1013: Greed
-      Alchemist = 238: Basis of Life
-      Wizard = 1006: Sight Blaster
-      Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)
-  - Command: skillid
-    Help: |
-      Params: <name>
-      Look up a skill by name
-  - Command: useskill
-    Help: |
-      Params: <skillid> <skillv> <target>
-      Use a skill on target
-  - Command: skilltree
-    Help: |
-      Params: <skillnum> <charname>
-      Prints the skill tree needed to get a skill for the target player.
-  - Command: marry
-    Help: |
-      Params: <player name>
-      Marry another player.
-  - Command: divorce
-    Help: |
-      Divorce player.
-  - Command: alive
-    Help: |
-      Revives yourself from death.
-  - Command: blvl
-    Aliases:
-      - lvup
-      - blevel
-      - baselvl
-      - baselvup
-      - baselevel
-      - baselvlup
-    Help: |
-      Params: <number of levels>
-      Raises your base level the desired number of levels.
-  - Command: jlvl
-    Aliases:
-      - jlevel
-      - joblvl
-      - joblvup
-      - joblevel
-      - joblvlup
-    Help: |
-      Params: <number of levels>
-      Raises your job level the desired number of levels.
-  - Command: allskill
-    Aliases:
-      - allskills
-      - skillall
-      - skillsall
-    Help: |
-      Give you all skills.
-  - Command: stpoint
-    Help: |
-      Params: <number of points> - Gives you the desired number of stat points.
-  - Command: skpoint
-    Help: |
-      Params: <number of points> - Gives you the desired number of skill points.
-  - Command: zeny
-    Help: |
-      Params: <amount> - Gives you desired amount of Zeny.
-  - Command: cash
-    Help: |
-      Params: <amount> - Gives you the specified amount of cash points.
-  - Command: points
-    Help: |
-      Params: <amount> - Gives you the specified amount of Kafra Points.
-  - Command: str
-    Help: |
-      Params: <amount>
-      Raises STR by given amount.
-  - Command: agi
-    Help: |
-      Params: <amount>
-      Raises AGI by given amount.
-  - Command: dex
-    Help: |
-      Params: <amount>
-      Raises DEX by given amount.
-  - Command: vit
-    Help: |
-      Params: <amount>
-      Raises VIT by given amount.
-  - Command: int
-    Help: |
-      Params: <amount>
-      Raises INT by given amount.
-  - Command: luk
-    Help: |
-      Params: <amount>
-      Raises LUK by given amount.
-  - Command: allstats
-    Aliases:
-      - allstat
-      - statall
-      - statsall
-    Help: |
-      Params: <value>
-      Adds value in all stats (maximum if no value).
-  - Command: addwarp
-    Help: |
-      Params: <map name> <x coord> <y coord> <NPC name>
-  - Command: killmonster2
-    Help: |
-      Kills all monsters of your map (without drops).
-  - Command: monster
-    Aliases:
-      - spawn
-    Help: |
-      Params: <monster name|ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]
-      @monster2 <desired_monster_name> <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]
-      @spawn/@monster/@summon/@monster2 "desired monster name" <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]
-      @spawn/@monster/@summon/@monster2 <monster name|ID> "desired monster name" [<number to spawn> [<x coord> [<y coord>]]]
-      Spawns the desired monster with any desired name.
-  - Command: monstersmall
-    Help: |
-      Params: <monster name|ID>
-      Spawns a smaller version of a monster.
-  - Command: monsterbig
-    Help: |
-      Params: <monster name|ID>
-      Spawns a larger version of a monster.
-  - Command: killmonster
-    Help: |
-      Params: <map>
-      Kill all monsters of the map (they drop)
-  - Command: autoloot
-    Help: |
-      Params: <on|off|#>
-      Makes items go straight into your inventory.
-  - Command: autotrade
-    Aliases:
-      - at
-    Help: |
-      Allows you to vend while you are offline.
-  - Command: changegm
-    Help: |
-      Params: <charname>
-      Changes the leader of your guild (You must be guild leader)
-  - Command: changeleader
-    Help: |
-      Params: <charname>
-      Changes the leader of your party (You must be party leader)
-  - Command: request
-    Help: |
-      Params: <message>
-      Sends a message to all connected GMs (via the gm whisper system)
-  - Command: sound
-    Help: |
-      Params: <path to file in data folder or GRF file>
-      Plays a sound from the data folder or GRF file located on the client.
-  - Command: clone
-    Help: |
-      Params: <charname>
-      Spawns a supportive clone of the given player.
-  - Command: slaveclone
-    Help: |
-      Params: <charname>
-      Spawns a supportive clone of the given player that follows the creator around.
-  - Command: evilclone
-    Help: |
-      Params: <charname>
-      Spawns an aggressive clone of the given player.
-  - Command: changesex
-    Help: |
-      Changes your gender.
-  - Command: duel
-    Help: |
-      Starts a duel.
-  - Command: invite
-    Help: |
-      Invites a player to a duel.
-  - Command: accept
-    Help: |
-      Accepts an invitation to a duel.
-  - Command: reject
-    Help: |
-      Rejects an invitation to a duel.
-  - Command: leave
-    Help: |
-      Leaves a duel.
-  - Command: mail
-    Help: |
-      Open mail box.
-  - Command: storage
-    Help: |
-      Opens storage.
-  - Command: itemreset
-    Aliases:
-      - clearinventory
-    Help: |
-      Remove all your items.
-  - Command: guildstorage
-    Aliases:
-      - gstorage
-    Help: |
-      Opens guild storage.
-  - Command: idsearch
-    Help: |
-      Params: <part_of_item_name>
-      Search all items that name have part_of_item_name
-  - Command: refine
-    Help: |
-      Params: <equip position> <+/- amount>
-  - Command: produce
-    Help: |
-      Params: <equip name or equip ID> <element> <# of very's>
-      Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind
-      You can add up to 3 Star Crumbs and 1 element
-  - Command: repairall
-    Help: |
-      Repair all items of your inventory
-  - Command: item
-    Help: |
-      Params: <item name or ID> <quantity>
-      Gives you the desired item.
-  - Command: item2
-    Help: |
-      Params: <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4>
-      Gives you the desired item.
-  - Command: pvpon
-    Help: |
-      Turns pvp on on the current map
-  - Command: pvpoff
-    Help: |
-      Turns pvp off on the current map
-  - Command: gvgon
-    Aliases:
-      - gpvpon
-    Help: |
-      Turns gvg on on the current map
-  - Command: gvgoff
-    Aliases:
-      - gpvpoff
-    Help: |
-      Turns gvg off on the current map
-  - Command: agitstart
-    Help: |
-      Starts War of Emperium
-  - Command: agitend
-    Help: |
-      End War of Emperium
-  - Command: party
-    Help: |
-      Params: <party_name>
-      Create a party.
-  - Command: guild
-    Help: |
-      Params: <guild_name>
-      Create a guild.
-  - Command: glvl
-    Aliases:
-      - glevel
-      - guildlvl
-      - guildlvup
-      - guildlevel
-      - guildlvlup
-    Help: |
-      Params: <# of levels>
-      Raise Guild by desired number of levels
-  - Command: guildrecall
-    Help: |
-      Params: <guild name|ID>
-      Warps all online characters of a guild to you.
-  - Command: partyrecall
-    Help: |
-      Params: <party name|ID>
-      Warps all online characters of a party to you.
-  - Command: petrename
-    Help: |
-      Re-enable pet rename
-  - Command: pettalk
-    Help: |
-      Params: <message>
-      Makes your pet say a message.
-  - Command: petfriendly
-    Help: |
-      Params: <#>
-      Set pet friendly amount (0-1000) 1000 = Max
-  - Command: pethungry
-    Help: |
-      Params: <#>
-      Set pet hungry amount (0-100) 100 = Max
-  - Command: hatch
-    Help: |
-      Create a pet from your inventory eggs list.
-  - Command: makeegg
-    Help: |
-      Params: <pet_id>
-      Gives pet egg for monster number in pet DB
-  - Command: kick
-    Help: |
-      Params: <char name>
-      Kicks specified character off the server
-  - Command: unjail
-    Aliases:
-      - discharge
-    Help: |
-      Params: <char name>
-      Discharges specified character/prisoner
-  - Command: kill
-    Aliases:
-      - die
-    Help: |
-      Kills player.
-  - Command: recall
-    Help: |
-      Params: <char name>
-      Warps target character to you.
-  - Command: raise
-    Aliases:
-      - revive
-    Help: |
-      Params: <char name>
-      Revives target character.
-  - Command: block
-    Help: |
-      Params: <char name>
-      Permanently blocks an account.
-  - Command: unblock
-    Help: |
-      Params: <char name>
-      Unblocks an account.
-  - Command: ban
-    Aliases:
-      - banish
-    Help: |
-      Params: <time> <name>\n" "Temporarily ban an account.
-      time usage: adjustment (+/- value) and element (y/a, m, d/j, h, mn, s)
-      Example: @ban +1m-2mn1s-6y testplayer
-  - Command: unban
-    Aliases:
-      - unbanish
-    Help: |
-      Params: <name> - Unban a account
-  - Command: jail
-    Help: |
-      Params: <char name> - Sends specified character in jails
-  - Command: trade
-    Help: |
-      Params: <char name> - Open a trade window with a another player
-  - Command: recallall
-    Help: |
-      Warps every character online to you.
-  - Command: doom
-    Help: |
-      Kills all NON GM chars on the server.
-  - Command: doommap
-    Help: |
-      Kills all non GM characters on the map.
-  - Command: raisemap
-    Help: |
-      Resurrects all characters on the map.
-  - Command: night
-    Help: |
-      Enables night mode on all maps, all characters are affected.
-  - Command: day
-    Help: |
-      Disables night mode and restores regular lighting, all characters are affected.
-  - Command: skillon
-    Help: |
-      Turn skills on for a map.
-  - Command: skilloff
-    Help: |
-      Turn skills off for a map.
-  - Command: snow
-    Help: |
-      Makes all maps to have the snow weather effect.
-  - Command: clouds
-    Help: |
-      Makes all maps to have the cloudy weather effect.
-  - Command: clouds2
-    Help: |
-      Makes all maps to have another cloudy weather effect.
-  - Command: fog
-    Help: |
-      Makes all maps to have the fog weather effect.
-  - Command: fireworks
-    Help: |
-      Makes all maps to have the fireworks weather effect.
-  - Command: sakura
-    Help: |
-      Makes all maps to have the sakura weather effect.
-  - Command: leaves
-    Help: |
-      Makes all maps to have the leaves weather effect.
-  - Command: shownpc
-    Help: |
-      Params: <NPC name>
-      Enable a NPC.
-  - Command: hidenpc
-    Help: |
-      Params: <NPC name>
-      Disable a NPC.
-  - Command: npcmove
-    Help: |
-      Params: <x coord> <y coord> <NPC name>
-      Move a NPC.
-  - Command: loadnpc
-    Help: |
-      Params: <path to script>
-      Load the specified script file path.
-  - Command: unloadnpc
-    Help: |
-      Params: <NPC name>
-      Unload the specified NPC according to name.
-  - Command: unloadnpcfile
-    Help: |
-      Params: <path>
-      Unload the specified script file path.
-  - Command: adjgroup
-    Help: |
-      Params: <level> <char name>
-      Do a temporary adjustment of the group level of a player.
-  - Command: addperm
-    Help: |
-      Params: <permission_name>
-      Temporarily add a permission to a player.
-  - Command: rmvperm
-    Help: |
-      Params: <permission_name>
-      Temporarily remove a permission from a player.
-  - Command: kickall
-    Help: |
-      Kick all characters off the server
-  - Command: mapexit
-    Help: |
-      Kick all players and shut down map-server.
-  - Command: gat
-    Help: |
-      For debugging (you inspect around gat)
-  - Command: send
-    Help: |
-      Params: <Hex Number> [<value>]
-      For debugging (packet variety)
-  - Command: nuke
-    Help: |
-      Params: <char name>
-      Blow somebody up, including those surrounding them.
-  - Command: reloadachievementdb
-    Help: |
-      Reload achievement database.
-  - Command: reloadatcommand
-    Help: |
-      Reload atcommand settings.
-  - Command: reloadattendancedb
-    Help: |
-      Reload attendance database.
-  - Command: reloadbattleconf
-    Help: |
-      Reload battle settings.
-  - Command: reloadinstancedb
-    Help: |
-      Reload instance database.
-  - Command: reloaditemdb
-    Help: |
-      Reload item database.
-  - Command: reloadmobdb
-    Help: |
-      Reload monster database.
-  - Command: reloadmotd
-    Help: |
-      Reload Message of the Day.
-  - Command: reloadmsgconf
-    Help: |
-      Reload message configuration.
-  - Command: reloadpcdb
-    Help: |
-      Reload player settings.
-  - Command: reloadquestdb
-    Help: |
-      Reload quest database.
-  - Command: reloadscript
-    Help: |
-      Reload all scripts.
-  - Command: reloadskilldb
-    Help: |
-      Reload skills definition database.
-  - Command: reloadstatusdb
-    Help: |
-      Reload status settings.
-  - Command: reload
-    Help: |
-      Params: <type>
-      Reload a database or configuration file.
-      itemdb                mobdb          skilldb
-      atcommand       battleconf     statusdb
-      pcdb                    motd             script
-      questdb              msgconf       packetdb
-  - Command: langtype
-    Help: |
-      Params: <language>
-      Changes your language setting.
-  - Command: limitedsale
-    Help: |
-      Opens the limited sale window.
-  - Command: changedress
-    Aliases:
-      - nocosplay
-    Help: |
-      Removes all character costumes.
-  - Command: camerainfo
-    Aliases:
-      - viewpointvalue
-      - setcamera
-    Help: |
-      Shows or updates the client's camera settings.
-  - Command: resetstat
-    Aliases:
-      - streset
-  - Command: resetskill
-    Aliases:
-      - skreset
-  - Command: homlevel
-    Aliases:
-      - hlvl
-      - hlevel
-      - homlvl
-      - homlvup
-  - Command: homevolution
-    Aliases:
-      - homevolve
-  - Command: mutearea
-    Aliases:
-      - stfu
-  - Command: monsterignore
-    Aliases:
-      - battleignore
-  - Command: accinfo
-    Aliases:
-      - accountinfo
-  - Command: channel
-    Aliases:
-      - main
-  - Command: autoloottype
-    Aliases:
-      - aloottype
-  - Command: cloneequip
-    Aliases:
-      - eqclone
-  - Command: clonestat
-    Aliases:
-      - stclone
-  - Command: reloadnpcfile
-    Aliases:
-      - reloadnpc
-
-Footer:
-  Imports:
-    - Path: conf/import/atcommands.yml

conf/battle/battle.conf

@@ -10,8 +10,7 @@
 //--------------------------------------------------------------
 
 // Who should have a baseatk value (makes str affect damage)? (Note 3)
-enable_baseatk: 0x9
-enable_baseatk_renewal: 0x29F
+enable_baseatk: 0x29F
 
 // Who can have perfect flee? (Note 3)
 enable_perfect_flee: 1

conf/battle/battleground.conf

@@ -30,7 +30,3 @@ bg_flee_penalty: 20
 
 // Interval before updating the bg-member map mini-dots (milliseconds)
 bg_update_interval: 1000
-
-// Before a player is warped into a Battleground from the Battleground Queue,
-// check to see if the player's current map has MF_NOWARP.
-bgqueue_nowarp_mapflag: no

conf/battle/client.conf

@@ -71,7 +71,9 @@ wedding_modifydisplay: no
 save_clothcolor: yes
 
 // Save body styles. (Note 1)
-save_body_style: yes
+// Note: Don't turn this on unless you know what you are doing.
+// Sprites are not released officially.
+save_body_style: no
 
 // Do not display cloth colors for the wedding class?
 // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled
@@ -138,14 +140,3 @@ spawn_direction: no
 // kRO removed the packet and this re-enables the message.
 // Official: Disabled.
 mvp_exp_reward_message: no
-
-// Send ping timer
-// Interval in seconds for each timer invoke.
-ping_timer_inverval: 30
-
-// Send packets timeout in seconds before ping packet can be sent.
-ping_time: 20
-
-// Show skill scale for clients 2015-12-23 and newer? (Note 1)
-// Official: yes
-show_skill_scale: yes

conf/battle/feature.conf

@@ -59,10 +59,6 @@ feature.autotrade_sit: 1
 // Delay in miliseconds to open vending/buyingsotre after player logged in.
 feature.autotrade_open_delay: 5000
 
-// Battlegrounds queue interface. Makes it possible to queue for a battleground anywhere using the battle menu.
-// Requires: 2012-04-10aRagexe or later
-feature.bgqueue: on
-
 // Roulette (Note 1)
 // Requires: 2014-10-22bRagexe or later
 feature.roulette: on

conf/battle/gm.conf

@@ -7,17 +7,6 @@
 // Note 2: Value is in percents (100 means 100%)
 //--------------------------------------------------------------
 
-// The symbol that will be used to recognize commands.
-// You can set any one character except:
-// - control-characters (0x00-0x1f),
-// - '%' (party chat symbol)
-// - '$' (guild chat symbol)
-// - '/' (client commands symbol)
-// atcommand_symbol represents @commands used locally.
-// charcommand_symbol represents #commands used on other players.
-atcommand_symbol: @
-charcommand_symbol: #
-
 // The maximum quantity of monsters that can be summoned per GM command (0 denotes an unlimited quantity)
 atcommand_spawn_quantity_limit: 100
 

conf/battle/guild.conf

@@ -20,6 +20,9 @@ guild_max_castles: 0
 // Official setting is 5 minutes (300000 ms), otherwise allow guild leaders to relog to cancel the 5 minute delay.
 guild_skill_relog_delay: 300000
 
+// Damage adjustments for WOE battles against defending Guild monsters (Note 2)
+castle_defense_rate: 100
+
 // Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
 gvg_short_attack_damage_rate: 80
 

conf/battle/homunc.conf

@@ -50,7 +50,7 @@ homunculus_auto_vapor: 80
 homunculus_max_level: 99
 
 // Max level for Homunculus S
-homunculus_S_max_level: 175
+homunculus_S_max_level: 150
 
 // Growth level for Homunculus S
 // This is the level at which homunculus S can use their growth tables
@@ -61,37 +61,3 @@ homunculus_S_growth_level: 99
 // Send auto-feed notice even if OFF (Note 1) 
 // Official: yes
 homunculus_autofeed_always: yes
-
-// Is getting exp/item from the homunculus 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 'homunculus_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.
-hom_idle_no_share: no
-
-// How the server should measure the homunculus master's idle time? (for homunculus exp share and autoloot ONLY) (Note 3)
-// (This will only work if 'hom_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 homunculus, separated from normal idle timer and 'idletime_option'.
-// It will only apply to homunculus-only kills and it will not affect normal autoloot and party share options.
-idletime_hom_option: 0x1F
-
-// The rate at which homunculus gain experience from kills. (Note 2)
-// Only applies to renewal mode.
-// Official: 10%
-homunculus_exp_gain: 10

conf/battle/items.conf

@@ -134,9 +134,6 @@ broadcast_hide_name: 2
 // Enable to sell rental item to NPC shop? (Note 1)
 rental_transaction: yes
 
-// Sell rental item for 0 to NPC shop regardless of the item value in item_db? (Note 1)
-rental_item_novalue: no
-
 // Minimum purchase price of items at a normal Shop
 // Officially items cannot be purchased for less than 1 Zeny
 min_shop_buy: 1

conf/battle/monster.conf

@@ -71,7 +71,6 @@ monster_chase_refresh: 3
 // 1: Enable mob-warping when standing on NPC-warps
 // 2: Enable mob-warping when standing on Priest Warp Portals
 // 4: Disable warping when the target map is a 'nobranch' map.
-// 8: Enable mob-warping when standing on Dimensional Door
 mob_warp: 0
 
 // If these are set above 0, they define the time (in ms) during which monsters
@@ -263,24 +262,3 @@ monster_hp_bars_info: yes
 // This can be legit gameplay (e.g. players keeping an MVP stuck inside icewall), but if you want to prevent any
 // exploits and be notified about them, you can set this to yes.
 monster_stuck_warning: no
-
-// Rate at which monsters use their idle skills when there are no players nearby (Note 2)
-// On official servers monsters use their idle skills if they have been spotted once, even if there are no players nearby anymore.
-// On small-medium sized servers this can cause all monsters like eggs and Fabre/Pupa to metamorph.
-// To switch it off, set it to 0.
-mob_nopc_idleskill_rate: 100
-boss_nopc_idleskill_rate: 100
-
-// Rate at which monsters move when there are no players nearby (Note 2)
-// On official servers monsters always move if they have been spotted once, even if there are no players nearby anymore.
-// To switch it off, set it to 0.
-mob_nopc_move_rate: 100
-boss_nopc_move_rate: 100
-
-// When killing a monster, do AG_BATTLE type achievements trigger for everyone in the same party within the area?
-// Area is limited to area_size battle config.
-achievement_mob_share: no
-
-// Should slaves teleport back to their master if they get too far during chase? (Note 1)
-// Default (Official): no
-slave_stick_with_master: no

conf/battle/pet.conf

@@ -22,7 +22,6 @@ pet_friendly_rate: 100
 pet_hungry_delay_rate: 100
 
 // Does the pet need its equipment before it does its skill? (Note 1)
-// These bonuses are unofficial and found in the import/pet_db.yml
 pet_equip_required: yes
 
 // When the master attacks a monster, whether or not the pet will also attack. (Note 1)

conf/battle/player.conf

@@ -244,11 +244,9 @@ fame_taekwon_mission: 1
 // Refined own forged weapon to +10
 fame_refine_lv1: 1
 fame_refine_lv2: 25
-fame_refine_lv3: 1000
+fame_refine_lv3: 10000
 // Success to forge a lv3 weapon with 3 additional ingredients
 fame_forge: 10
-// Refine threshold for giving point for refining forged weapon to +10
-blacksmith_fame_refine_threshold: 10
 // Success to prepare 'n' Condensed Potions in a row
 fame_pharmacy_3: 1
 fame_pharmacy_5: 3
@@ -272,7 +270,8 @@ fame_pharmacy_10: 50
 idletime_option: 0x1F
 
 // Adjust the summoner class' special traits.
-// - Summoners belong to brute race category. They have their own race RC_PLAYER_DORAM (11) to be differentiated from monster race RC_BRUTE (2).
-// - Summoners are small size (0) instead of medium (1)
-summoner_race: 11
-summoner_size: 0
+// 0: Summoners behave like other classes.
+// 1: Summoners belong to brute race instead of demi-human
+// 2: Summoners are small size instead of medium
+// 3: Both of the above (official value)
+summoner_trait: 3

conf/battle/skill.conf

@@ -85,7 +85,7 @@ clear_skills_on_warp: 15
 
 //Setting this to YES will override the target mode of ground-based skills with the flag 0x01 to "No Enemies"
 //The two skills affected by default are Pneuma and Safety Wall (if set to yes, those two skills will not protect everyone, but only allies)
-//See db/(pre-)re/skill_db.yml for more info.
+//See db/skill_unit_db.txt for more info.
 defunit_not_enemy: no
 
 // Should skills always do at least 'hits' damage when they don't miss/are blocked?
@@ -107,11 +107,11 @@ auto_counter_type: 15
 
 // Can ground skills be placed on top of each other? (Note 3)
 // By default, skills with UF_NOREITERATION set cannot be stacked on top of 
-// other skills, this setting will override that.
+// other skills, this setting will override that. (skill_unit_db)
 skill_reiteration: 0
 
 // Can ground skills NOT be placed underneath/near players/monsters? (Note 3)
-// If set, only skills with UF_NOFOOTSET set will be affected.
+// If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db)
 skill_nofootset: 1
 
 // Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 3)
@@ -196,14 +196,6 @@ devotion_rdamage: 0
 // But if the target is being devoted, it ONLY reflects the damage for melee skill. (Note 1)
 devotion_rdamage_skill_only: yes
 
-// On AEGIS there is a bug when the player who is under devotion is sitting and getting hit.
-// The player stands up on client side, but will still remain sitting on server side.
-// Because of this the player will not be able to walk anymore, until the player sat down/stood up again or used @refresh.
-// You can read more about it on https://github.com/rathena/rathena/issues/1927
-// Default: yes (because it is a recommended bug fix from our side)
-// Official: no
-devotion_standup_fix: yes
-
 // If no than you can use the ensemble skills alone. (Note 1)
 player_skill_partner_check: yes
 
@@ -343,7 +335,7 @@ stormgust_knockback: yes
 // For RENEWAL_CAST (Note 2)
 // 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 -1 in the skill_db.yml).
+// Put it 0 to disable default Fixed Casting Time (just like -1 is the skill_cast_db.txt).
 default_fixed_castrate: 20
 
 // On official servers, skills that hit all targets on a path (e.g. Focused Arrow Strike and First Wind) first
@@ -362,21 +354,6 @@ skill_eightpath_algorithm: yes
 // damage skills (previous behavior).
 can_damage_skill: 1
 
-// Land Protector behavior (Note 1)
-// On official servers, players standing on the border (outer cell) of the Land Protector can still be affected/hit
-// by AoE skills (if the skill has a splash effect, such as Storm Gust). The Athena behavior ignores AoE affects/hits
-// while players are standing on the border.
-// Official: 0
-// Legacy Athena: 1
-land_protector_behavior: 0
-
-// NPC EMOTION behavior (Note 1)
-// On official servers, certain mobs cast NPC EMOTION skill which displays an emoticon and change their mode from
-// Aggressive to Passive for a certain time. The Athena behavior does not change their mode to Passive.
-// Official: 0
-// Legacy Athena: 1
-npc_emotion_behavior: 0
-
 // Should Tarot Card of Fate have the same chance for each card to occur? (Note 1)
 // Official chances: 15%: LOVERS | 10%: FOOL, MAGICIAN, HIGH PRIESTESS, STRENGTH, SUN | 8%: TEMPERANCE
 // 7%: CHARIOT | 6%: THE HANGED MAN | 5%: DEATH, STAR | 2%: TOWER | 1%: WHEEL OF FORTUNE, DEVIL

conf/groups.conf

@@ -87,7 +87,6 @@ groups: (
 	inherit: ( /*empty list*/ )
 	commands: {
 		changedress: true
-		resurrect: true
 	}
 	permissions: {
 		/* without this basic permissions regular players could not 

conf/help.txt

@@ -0,0 +1,328 @@
+// This is help file that contains help messages for atcommands/charcommands.
+// Format:
+// <command>: "<help message>"
+// This file uses libconfig syntax.
+
+help: "Params: <command>\n" "Shows help for specified command."
+noask: "Auto rejects deals/invites."
+gmotd: "Broadcasts the Message of The Day to all players."
+me: "Params: <message>\n" "Displays normal text as a message in this format: *name message* (like /me in mIRC)."
+fakename: "Params: <name>\n" "Changes your name to your choice temporarily."
+npctalk: "Params: <NPC name> <message>\n" "Forces a NPC to display a message in normal chat."
+broadcast: "Params: <message>\n" "Broadcasts a message with your name (in yellow)."
+kami: "Params: <message>\n" "Broadcasts a message without your name (in yellow)."
+kamib: "Params: <message>\n" "Broadcasts a message without your name (in blue)."
+localbroadcast: "Params: <message>\n" "Broadcasts a message with your name (in yellow) only on your map."
+commands: "Displays a list of commands that you can use."
+rates: "Displays the server's current rates."
+uptime: "Displays how long the server has been online."
+showdelay: "Shows/hides the \"There is a delay after this skill\" message."
+exp: "Displays current levels and % progress."
+mobinfo: "Params: <monster name|ID>\n" "Shows monster info (stats, exp, drops etc)."
+iteminfo: "Params: <item name|ID>\n" "Shows item info (type, price etc)."
+whodrops: "Params: <item name|ID>\n" "Shows who drops an item (monster with highest drop rates)."
+version: "Displays SVN version of the server."
+email: "Params: <current email> <new email>\n" "Changes your account e-mail address."
+where: "Params: <char name>\n" "Tells you the location of a character."
+time: "Shows the date and time of the server."
+showexp: "Displays/hides experience gained."
+showzeny: "Displays/hides Zeny gained."
+mobsearch: "Params: <monster name|ID>\n" "Shows the location of a certain mob on the current map."
+who: "Params: [<name>]\n" "Shows a list of online players and their party and guild."
+who2: "Params: [<name>]\n" "Shows a list of online players and their job."
+who3: "Params: [<name>]\n" "Shows a list of online players and their location."
+whomap: "@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specified map."
+whogm: "Params: [match_text] - Like @who+@who2+who3, but only for GM."
+guildspy: "Params: <guild name|id> - You will receive all messages of the guild channel (Chat logging must be enabled)"
+partyspy: "@partyspy <party name|id> - You will receive all messages of the party channel (Chat logging must be enabled)"
+mapinfo: "Params: [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: chatrooms)."
+go: "Params: <city name|number>\n" "Warps you to a city.\n"
+	"  -3: (Memo point 2)  14: louyang         31: mora\n"
+	"  -2: (Memo point 1)  15: start point     32: dewata\n"
+	"  -1: (Memo point 0)  16: prison/jail     33: malangdo island\n"
+	"   0: prontera              17: jawaii             34: malaya port\n"
+	"   1: morocc                18: ayothaya       35: eclage\n"
+	"   2: geffen                  19: einbroch       36: lasagna\n"
+	"   3: payon                  20: lighthalzen\n"
+	"   4: alberta                 21: einbech\n"
+	"   5: izlude                   22: hugel\n"
+	"   6: aldebaran           23: rachel\n"
+	"   7: xmas (lutie)        24: veins\n"
+	"   8: comodo               25: moscovia\n"
+	"   9: yuno                     26: midgard camp\n"
+	"  10: amatsu               27: manuk\n"
+	"  11: gonryun              28: splendide\n"
+	"  12: umbala               29: brasilis\n"
+	"  13: niflheim              30: el dicastes\n"
+jumpto: "Params: <char name>\n" "Warps you to selected character."
+follow: "Params: <char name>\n" "Follow a player."
+mount: "Give/remove a job-based mount (class is required, but not the skill)."
+mount2: "Give/remove a cash mount."
+disguise: "Params: <monster name|ID>\n" "Change your appearence to other players to a mob."
+undisguise: "Restore your normal appearance."
+disguiseguild: "Disguises all online characters of a guild."
+undisguiseguild: "Restore the normal appearance of all characters of a guild."
+model: "Params:  <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence."
+size: "Params:  <0-2> Changes your size (0-Normal 1-Small 2-Large)"
+sizeall: "Changes the size of all players."
+sizeguild: "Changes the size of all online characters of a guild."
+hide: "Makes you character invisible (GM invisibility). Type again to become visible."
+save: "Sets respawn point to current spot."
+load: "Warps you to your save point."
+warp: "Params: <mapname> [<x> <y>]\n" "Warps you to the selected map and position."
+jump: "Params: [<x> [<y>]]\n" "Randomly warps you like a flywing."
+jobchange: "Params: <job name|ID>\n" "Changes your job.\n"
+	"----- Novice / 1st Class -----\n"
+	"   0 Novice              1 Swordman            2 Magician            3 Archer\n"
+	"   4 Acolyte              5 Merchant               6 Thief\n"
+	"----- 2nd Class -----\n"
+	"   7 Knight               8 Priest                     9 Wizard               10 Blacksmith\n"
+	"  11 Hunter           12 Assassin            14 Crusader          15 Monk\n"
+	"  16 Sage              17 Rogue                 18 Alchemist         19 Bard\n"
+	"  20 Dancer\n"
+	"----- High Novice / High 1st Class -----\n"
+	"4001 Novice High     4002 Swordman High    4003 Magician High    4004 Archer High\n"
+	"4005 Acolyte High     4006 Merchant High       4007 Thief High\n"
+	"----- Transcendent 2nd Class -----\n"
+	"4008 Lord Knight      4009 High Priest             4010 High Wizard      4011 Whitesmith\n"
+	"4012 Sniper               4013 Assassin Cross   4015 Paladin              4016 Champion\n"
+	"4017 Professor         4018 Stalker                    4019 Creator               4020 Clown\n"
+	"4021 Gypsy\n"
+	"----- 3rd Class (Regular) -----\n"
+	"4054 Rune Knight    4055 Warlock                 4056 Ranger            4057 Arch Bishop\n"
+	"4058 Mechanic         4059 Guillotine Cross  4066 Royal Guard   4067 Sorcerer\n"
+	"4068 Minstrel            4069 Wanderer              4070 Sura                 4071 Genetic\n"
+	"4072 Shadow Chaser\n"
+	"----- 3rd Class (Transcendent) -----\n"
+	"4060 Rune Knight    4061 Warlock                 4062 Ranger             4063 Arch Bishop\n"
+	"4064 Mechanic         4065 Guillotine Cross  4073 Royal Guard    4074 Sorcerer\n"
+	"4075 Minstrel            4076 Wanderer              4077 Sura                  4078 Genetic\n"
+	"4079 Shadow Chaser\n"
+	"----- Expanded Class -----\n"
+	"     23 Super Novice      24 Gunslinger              25 Ninja                 4045 Super Baby\n"
+	"4046 Taekwon           4047 Star Gladiator     4049 Soul Linker            4050 Gangsi\n"
+	"4051 Death Knight    4052 Dark Collector    4190 Ex. Super Novice  4191 Ex. Super Baby\n"
+	"4211 Kagerou            4212 Oboro             4215 Rebellion        4218 Summoner\n"
+	"4239 Star Emperor   4240 Soul Reaper\n"
+	"----- Baby Novice And Baby 1st Class -----\n"
+	"4023 Baby Novice      4024 Baby Swordman    4025 Baby Magician   4026 Baby Archer\n"
+	"4027 Baby Acolyte      4028 Baby Merchant       4029 Baby Thief\n"
+	"---- Baby 2nd Class ----\n"
+	"4030 Baby Knight     4031 Baby Priest         4032 Baby Wizard         4033 Baby Blacksmith\n"
+	"4034 Baby Hunter    4035 Baby Assassin   4037 Baby Crusader    4038 Baby Monk\n"
+	"4039 Baby Sage       4040 Baby Rogue        4041 Baby Alchemist   4042 Baby Bard\n"
+	"4043 Baby Dancer\n"
+	"---- Baby 3rd Class ----\n"
+	"4096 Baby Rune Knight  4097 Baby Warlock     4098 Baby Ranger           4099 Baby Arch Bishop\n"
+	"4100 Baby Mechanic       4101 Baby Glt. Cross  4102 Baby Royal Guard  4103 Baby Sorcerer\n"
+	"4104 Baby Minstrel          4105 Baby Wanderer   4106 Baby Sura             4107 Baby Genetic\n"
+	"4108 Baby Shadow Chaser\n"
+	"---- Expanded Baby Class ----\n"
+	"4220 Baby Summoner        4222 Baby Ninja        4223 Baby Kagero         4224 Baby Oboro\n"
+	"4225 Baby Taekwon       4226 Baby Star Glad    4227 Baby Soul Linker    4228 Baby Gunslinger\n"
+	"4229 Baby Rebellion   4241 Baby Star Emperor    4242 Baby Soul Reaper\n"
+	"---- Modes And Others ----\n"
+	" 22 Wedding            26 Christmas          27 Summer           28 Hanbok\n"
+	" 29 Oktoberfest       30 Summer 2\n"
+	" 4048 Star Gladiator (Union)	    4238 Baby Star Glad (Union)\n"
+option: "Params: <param1> <param2>(stackable) <param3>(stackable)\n" "Adds different visual effects on or around your character.\n"
+" <param1>       <param2>        <param3>\n"
+"01: Stone      01: Sight       01: Sight          512: Cart Lv. 4\n"
+"02: Frozen     02: Curse       02: Hiding        1024: Cart Lv. 5\n"
+"03: Stun       04: Silence     04: Cloaking      2048: Orc Head\n"
+"04: Sleep      08: Signum      08: Cart Lv. 1    4096: Wedding\n"
+"06: Petrify    16: Blind       16: Falcon        8192: Ruwach\n"
+"07: Burning    32: Angelus     32: Riding       16384: Chasewalk\n"
+"08: Imprison   64: Bleeding    64: Invisible\n"
+"16: (Nothing) 128: D. Poison  128: Cart Lv. 2\n"
+"32: (Nothing) 256: Fear       256: Cart Lv. 3"
+heal: "Params: [<HP> <SP>]\n" "Heals the desired amount of HP and SP. No value specified will do a full heal."
+dye: "Params: <clothes palette no.>\n" "Changes your characters clothes color."
+hairstyle: "Params: <hairstyle no.>\n" "Changes your hair style."
+haircolor: "Params <hair palette no.>\n" "Changes your hair color."
+speed: "Params: <1-1000>\n" "Changes you walking speed. 1 being the fastest and 1000 the slowest. Default is 150."
+effect: "Params: <effect id> [<flag>]\n" "Give an effect to your character."
+dropall: "Params: [<item type>]\n" "Throws all your possession on the ground. No type specified will drop all items."
+storeall: "Puts all your possessions in storage."
+killable: "Make your character killable."
+memo: "Params: [memo position]\n" "Set/change a memo location (no position: display memo points)."
+spiritball: "Params: <1-100>\n" "Gives you \"spirit spheres\" like from the skill \"Call Spirits\".\n"
+questskill: "Params: <#>\n" "Gives you the specified quest skill\n"
+"Novice = 142: First Aid, 143: Act Dead\n"
+"Archer = 147: Create Arrow, 148: Charge Arrow\n"
+"Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk\n"
+"Acolyte = 156: Holy Light\n"
+"Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone\n"
+"Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store\n"
+"Magician = 157: Energy Coat\n"
+"Hunter = 1009: Phantasmic Arrow\n"
+"Bard = 1010: Pang Voice\n"
+"Dancer = 1011: Wink of Charm\n"
+"Knight = 1001: Charge Attack\n"
+"Crusader = 1002: Shrink\n"
+"Priest = 1014: Redemptio\n"
+"Monk = 1015: Ki Translation, 1016: Ki Explosio\n"
+"Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife\n"
+"Rogue = 1005: Close Confine\n"
+"Blacksmith = 1012: Unfair Trick, 1013: Greed\n"
+"Alchemist = 238: Basis of Life\n"
+"Wizard = 1006: Sight Blaster\n"
+"Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)"
+lostskill: "Params: <#>\n" "Takes away the specified quest skill from you\n"
+"Novice = 142: First Aid, 143: Act Dead\n"
+"Archer = 147: Create Arrow, 148: Charge Arrow\n"
+"Swordman = 144: Moving HP Recovery, 145: Attack Weak Point, 146: Auto Berserk\n"
+"Acolyte = 156: Holy Light\n"
+"Thief = 149: Throw Sand, 150: Back Sliding, 151: Take Stone, 152: Throw Stone\n"
+"Merchant = 153: Cart Revolution, 154: Change Cart, 155: Crazy Uproar, 2535: Open Buying Store\n"
+"Magician = 157: Energy Coat\n"
+"Hunter = 1009: Phantasmic Arrow\n"
+"Bard = 1010: Pang Voice\n"
+"Dancer = 1011: Wink of Charm\n"
+"Knight = 1001: Charge Attack\n"
+"Crusader = 1002: Shrink\n"
+"Priest = 1014: Redemptio\n"
+"Monk = 1015: Ki Translation, 1016: Ki Explosio\n"
+"Assassin = 1003: Sonic Acceleration, 1004: Throw Venom Knife\n"
+"Rogue = 1005: Close Confine\n"
+"Blacksmith = 1012: Unfair Trick, 1013: Greed\n"
+"Alchemist = 238: Basis of Life\n"
+"Wizard = 1006: Sight Blaster\n"
+"Sage = 1007: Create Elemental Converter, 1008: Elemental Change (Water), 1017: Elemental Change (Earth), 1018: Elemental Change (Fire), 1019: Elemental Change (Wind)"
+skillid: "Params: <name>\n" "Look up a skill by name"
+useskill: "Params: <skillid> <skillv> <target>\n" "Use a skill on target"
+skilltree: "Params: <skillnum> <charname>\n" "Prints the skill tree needed to get a skill for the target player."
+marry: "Params: <player name>\n" "Marry another player."
+divorce: "Divorce player."
+alive: "Revives yourself from death."
+blvl: "Params: <number of levels>\n" "Raises your base level the desired number of levels."
+jlvl: "Params: <number of levels>\n" "Raises your job level the desired number of levels."
+allskill: "Give you all skills."
+stpoint: "Params: <number of points> - Gives you the desired number of stat points."
+skpoint: "Params: <number of points> - Gives you the desired number of skill points."
+zeny: "Params: <amount> - Gives you desired amount of Zeny."
+cash: "Params: <amount> - Gives you the specified amount of cash points."
+points: "Params: <amount> - Gives you the specified amount of Kafra Points."
+str: "Params: <amount>\n" "Raises STR by given amount."
+agi: "Params: <amount>\n" "Raises AGI by given amount."
+dex: "Params: <amount>\n" "Raises DEX by given amount."
+vit: "Params: <amount>\n" "Raises VIT by given amount."
+int: "Params: <amount>\n" "Raises INT by given amount."
+luk: "Params: <amount>\n" "Raises LUK by given amount."
+allstats: "Params: <value>\n" "Adds value in all stats (maximum if no value)."
+addwarp: "Params: <map name> <x coord> <y coord> <NPC name>\n"
+killmonster2: "Kills all monsters of your map (without drops)."
+monster: "Params: <monster name|ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]\n"
+ "@monster2 <desired_monster_name> <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
+"@spawn/@monster/@summon/@monster2 \"desired monster name\" <monster name|ID> [<number to spawn> [<x coord> [<y coord>]]]\n"
+"@spawn/@monster/@summon/@monster2 <monster name|ID> \"desired monster name\" [<number to spawn> [<x coord> [<y coord>]]]\n"
+"	Spawns the desired monster with any desired name."
+monstersmall: "Params: <monster name|ID>\n" "Spawns a smaller version of a monster."
+monsterbig: "Params: <monster name|ID>\n" "Spawns a larger version of a monster."
+killmonster: "Params: <map>\n" "Kill all monsters of the map (they drop)"
+autoloot: "Params: <on|off|#>\n" "Makes items go straight into your inventory."
+autotrade: "Allows you to vend while you are offline."
+changegm: "Params: <charname>\n" "Changes the leader of your guild (You must be guild leader)"
+changeleader: "Params: <charname>\n" "Changes the leader of your party (You must be party leader)"
+request: "Params: <message>\n" "Sends a message to all connected GMs (via the gm whisper system)"
+sound: "Params: <path to file in data folder or GRF file>\n" "Plays a sound from the data folder or GRF file located on the client."
+clone: "Params: <charname>\n" "Spawns a supportive clone of the given player."
+slaveclone: "Params: <charname>\n" "Spawns a supportive clone of the given player that follows the creator around."
+evilclone: "Params: <charname>\n" "Spawns an aggressive clone of the given player."
+changesex: "Changes your gender."
+duel: "Starts a duel."
+invite: "Invites a player to a duel."
+accept: "Accepts an invitation to a duel."
+reject: "Rejects an invitation to a duel."
+leave: "Leaves a duel."
+mail: "Open mail box."
+storage: "Opens storage."
+itemreset: "Remove all your items."
+guildstorage: "Opens guild storage."
+idsearch: "Params: <part_of_item_name>\n" "Search all items that name have part_of_item_name"
+refine: "Params: <equip position> <+/- amount>"
+produce: "Params: <equip name or equip ID> <element> <# of very's>\n"
+"	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind\n"
+"	You can add up to 3 Star Crumbs and 1 element\n"
+repairall: "Repair all items of your inventory"
+item: "Params: <item name or ID> <quantity>\n" "Gives you the desired item."
+item2: "Params: <item name or ID> <quantity> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4>\n" "Gives you the desired item."
+pvpon: "Turns pvp on on the current map"
+pvpoff: "Turns pvp off on the current map"
+gvgon: "Turns gvg on on the current map"
+gvgoff: "Turns gvg off on the current map"
+agitstart: "Starts War of Emperium"
+agitend: "End War of Emperium"
+party: "Params: <party_name>\n" "Create a party."
+guild: "Params: <guild_name>\n" "Create a guild."
+glvl: "Params: <# of levels>\n" "Raise Guild by desired number of levels"
+guildrecall: "Params: <guild name|ID>\n" "Warps all online characters of a guild to you."
+partyrecall: "Params: <party name|ID>\n" "Warps all online characters of a party to you."
+petrename: "Re-enable pet rename"
+pettalk: "Params: <message>\n" "Makes your pet say a message."
+petfriendly: "Params: <#>\n" "Set pet friendly amount (0-1000) 1000 = Max"
+pethungry: "Params: <#>\n" "Set pet hungry amount (0-100) 100 = Max"
+hatch: "Create a pet from your inventory eggs list."
+makeegg: "Params: <pet_id>\n" "Gives pet egg for monster number in pet DB"
+kick: "Params: <char name>\n" "Kicks specified character off the server"
+unjail: "Params: <char name>\n" "Discharges specified character/prisoner"
+kill: "Kills player."
+recall: "Params: <char name>\n" "Warps target character to you."
+raise: "Params: <char name>\n" "Revives target character."
+block: "Params: <char name>\n" "Permanently blocks an account."
+unblock: "Params: <char name>\n" "Unblocks an account."
+ban: "Params: <time> <name>\n" "Temporarily ban an account.\n"
+ "	time usage: adjustment (+/- value) and element (y/a, m, d/j, h, mn, s)\n"
+ "	Example: @ban +1m-2mn1s-6y testplayer\n"
+unban: "Params: <name> - Unban a account"
+jail: "Params: <char name> - Sends specified character in jails"
+trade: "Params: <char name> - Open a trade window with a another player"
+recallall: "Warps every character online to you."
+doom: "Kills all NON GM chars on the server."
+doommap: "Kills all non GM characters on the map."
+raisemap: "Resurrects all characters on the map."
+night: "Enables night mode on all maps, all characters are affected."
+day: "Disables night mode and restores regular lighting, all characters are affected."
+skillon: "Turn skills on for a map."
+skilloff: "Turn skills off for a map."
+snow: "Makes all maps to have the snow weather effect."
+clouds: "Makes all maps to have the cloudy weather effect."
+clouds2: "Makes all maps to have another cloudy weather effect."
+fog: "Makes all maps to have the fog weather effect."
+fireworks: "Makes all maps to have the fireworks weather effect."
+sakura: "Makes all maps to have the sakura weather effect."
+leaves: "Makes all maps to have the leaves weather effect."
+shownpc: "Params: <NPC name>\n" "Enable a NPC."
+hidenpc: "Params: <NPC name>\n" "Disable a NPC."
+npcmove: "Params: <x coord> <y coord> <NPC name>\n" "Move a NPC."
+loadnpc: "Params: <path to script>\n" "Load the specified script file path."
+unloadnpc: "Params: <NPC name>\n" "Unload the specified NPC according to name."
+unloadnpcfile: "Params: <path>\n" "Unload the specified script file path."
+adjgroup: "Params: <level> <char name>\n" "Do a temporary adjustment of the group level of a player."
+addperm: "Params: <permission_name>\n" "Temporarily add a permission to a player."
+rmvperm: "Params: <permission_name>\n" "Temporarily remove a permission from a player."
+kickall: "Kick all characters off the server"
+mapexit: "Kick all players and shut down map-server."
+gat: "For debugging (you inspect around gat)"
+send: "Params: <Hex Number> [<value>]\n" "For debugging (packet variety)"
+nuke: "Params: <char name>\n" "Blow somebody up, including those surrounding them."
+reloadatcommand: "Reload atcommand settings."
+reloadbattleconf: "Reload battle settings."
+reloaditemdb: "Reload item database."
+reloadmobdb: "Reload monster database."
+reloadmotd: "Reload Message of the Day."
+reloadmsgconf: "Reload message configuration."
+reloadpcdb: "Reload player settings."
+reloadquestdb: "Reload quest database."
+reloadscript: "Reload all scripts."
+reloadskilldb: "Reload skills definition database."
+reloadstatusdb: "Reload status settings."
+reload: "Params: <type>\n" "Reload a database or configuration file.\n"
+	"   itemdb                mobdb          skilldb\n"
+	"   atcommand       battleconf     statusdb\n"
+	"   pcdb                    motd             script\n"
+	"   questdb              msgconf       packetdb\n"
+langtype: "Params: <language>\n" "Changes your language setting."
+limitedsale: "Opens the limited sale window."
+changedress: "Removes all character costumes."
+camerainfo: "Shows or updates the client's camera settings."

conf/import-tmpl/atcommands.yml

@@ -1,33 +0,0 @@
-# This file is a part of rAthena.
-#   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
-# 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/>.
-#
-###########################################################################
-# Atcommand Database
-###########################################################################
-#
-# Atcommand Settings
-#
-###########################################################################
-# - Command                  Command name.
-#   Aliases:                 Aliases for the command. (Optional)
-#     - <AliasName>
-#   Help                     Help message for the command. (Optional)
-###########################################################################
-
-Header:
-  Type: ATCOMMAND_DB
-  Version: 1

conf/import-tmpl/inter_server.yml

@@ -1,37 +1,15 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2017 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
+# Config for Storages
 #
-# 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/>.
-#
-##########################################################################
-# Storage Database
-##########################################################################
-#
-# Storage Settings
-#
-##########################################################################
-#	- ID                       Storage ID.
-#	  Name                     Storage name that will be sent to the client to display on the title bar.
-#	  Table                    Name of SQL table where storage is saved. The table structure is the same as the default storage table.
-#	  Max                      Maximum number of items. (Default: MAX_STORAGE)
-###########################################################################
 # To access the premium storage, use script command 'openstorage2'.
-# If more premium storages are added, copy the structure of the storage table and match the table name in this config.
-# The 'Max' of premium storages are not adjusted by 'vip_storage_increase' config nor MIN_STORAGE.
-###########################################################################
-
+# If premium storages are added, copy the structure of the storage table and match the table name in this config.
+# The 'max' of premium storages are not adjusted by 'vip_storage_increase' config nor MIN_STORAGE.
+#
+# Structure:
+#	- ID: <storage_id>          // (int) Storage ID will be used for script command 'openstorage2'.
+#	  Name: "<storage name>"    // (string) Storage name will be sent to the client to display on the title bar.
+#	  Table: "<storage_table>"  // (string) Name of table where storage is saved. The table stucture is the same as the default storage table.
+#	  Max: <max_amount>         // (int) *optional* Maximum number of items in storage. MAX_STORAGE will be used if no value is defined.
+###############################################################################################################################################
 Header:
   Type: INTER_SERVER_DB
   Version: 1
@@ -39,5 +17,5 @@ Header:
 #Body:
 #   - ID: 1
 #     Name: "VIP Storage"
-#     Table: vip_storage
+#     Table: "vip_storage"
 #     Max: 300

conf/inter_athena.conf

@@ -81,6 +81,8 @@ mysql_reconnect_count: 1
 // Login Database Tables
 login_server_account_db: login
 ipban_table: ipbanlist
+
+// Shared
 global_acc_reg_num_table: global_acc_reg_num
 global_acc_reg_str_table: global_acc_reg_str
 
@@ -114,6 +116,7 @@ skill_homunculus_db: skill_homunculus
 mercenary_db: mercenary
 mercenary_owner_db: mercenary_owner
 elemental_db: elemental
+ragsrvinfo_db: ragsrvinfo
 skillcooldown_db: skillcooldown
 bonus_script_db: bonus_script
 acc_reg_num_table: acc_reg_num

conf/inter_server.yml

@@ -15,22 +15,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-##########################################################################
-# Storage Database
-##########################################################################
-#
-# Storage Settings
-#
-##########################################################################
-#	- ID                       Storage ID.
-#	  Name                     Storage name that will be sent to the client to display on the title bar.
-#	  Table                    Name of SQL table where storage is saved. The table structure is the same as the default storage table.
-#	  Max                      Maximum number of items. (Default: MAX_STORAGE)
 ###########################################################################
+# Config for Storages
+#
 # To access the premium storage, use script command 'openstorage2'.
-# If more premium storages are added, copy the structure of the storage table and match the table name in this config.
-# The 'Max' of premium storages are not adjusted by 'vip_storage_increase' config nor MIN_STORAGE.
-###########################################################################
+# If premium storages are added, copy the structure of the storage table and match the table name in this config.
+# The 'max' of premium storages are not adjusted by 'vip_storage_increase' config nor MIN_STORAGE.
+#
+# Structure:
+#	- ID: <storage_id>          // (int) Storage ID will be used for script command 'openstorage2'.
+#	  Name: "<storage name>"    // (string) Storage name will be sent to the client to display on the title bar.
+#	  Table: "<storage_table>"  // (string) Name of table where storage is saved. The table stucture is the same as the default storage table.
+#	  Max: <max_amount>         // (int) *optional* Maximum number of items in storage. MAX_STORAGE will be used if no value is defined.
 
 Header:
   Type: INTER_SERVER_DB
@@ -39,7 +35,7 @@ Header:
 Body:
   - ID: 0
     Name: "Storage"
-    Table: storage
+    Table: "storage"
 
 Footer:
   Imports:

conf/login_athena.conf

@@ -52,8 +52,7 @@ console_silent: 0
 console: off
 
 // Can you use _M/_F to make new accounts on the server?
-// Note: This only works if client side password encryption is not enabled.
-new_account: no
+new_account: yes
 
 //If new_account is enabled, minimum length to userid and passwords should be 4?
 //Must be 'Yes' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
@@ -163,10 +162,6 @@ dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net
 // Note: see 'doc/md5_hashcheck.txt' for more details.
 client_hash_check: off
 
-// Enable web authentication token system
-// This is required for new clients that get data via an additional API over HTTP
-use_web_auth_token: yes
-
 // Client MD5 hashes
 // The client with the specified hash can be used to log in by players with
 // a group_id equal to or greater than the given value.

conf/map_athena.conf

@@ -117,6 +117,8 @@ save_settings: 4095
 motd_txt: conf/motd.txt
 
 // When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
+help_txt: conf/help.txt
+help2_txt: conf/help2.txt
 charhelp_txt: conf/charhelp.txt
 
 // Load channel config from

conf/msg_conf/map_msg.conf

@@ -41,7 +41,7 @@
 24: Job level raised.
 25: Job level lowered.
 26: Help commands:
-//27: free
+27: Commands help is not available.
 28: No player found.
 29: 1 player found.
 30: %d players found.
@@ -353,12 +353,6 @@
 // 334: Thirty-Four Castles
 334: Total Domination
 
-// Battlegrounds Queue
-337: You can't apply to a battleground queue from this map.
-338: You can't apply to a battleground queue due to recently deserting a battleground. Time remaining: %d minutes and %d seconds.
-339: You can't apply to a battleground queue for %d seconds due to recently leaving one.
-340: Participants were unable to join. Delaying entry for more participants.
-
 // Templates for @who output
 343: Name: %s
 344: (%s)
@@ -865,10 +859,7 @@
 // pcblock command
 794: This action is currently blocked.
 
-// @reloadattendancedb
-795: Attendance database has been reloaded.
-
-//796-899 free
+//795-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1055,7 +1046,7 @@
 
 // @reloadatcommand
 1036: Error reading groups.conf, reload failed.
-//1037 free
+1037: Error reading atcommand_athena.conf, reload failed.
 
 // @mapinfo
 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
@@ -1534,7 +1525,7 @@
 1370: Usage: ex. "@set PoringCharVarSTR$" outputs its value, Super Duper String.
 1371: NPC variables may not be used with @set.
 1372: Instance variables may not be used with @set.
-1373: %s value is now: %lld
+1373: %s value is now: %d
 1374: %s value is now: %s
 1375: %s is blank.
 
@@ -1707,17 +1698,5 @@
 1503: You've entered a PK Zone.
 1504: You've entered a PK Zone (safe until level %d).
 
-// @setquest, @erasequest, @completequest
-1505: Usage: %s <quest ID>
-1506: Quest %d not found in DB.
-1507: Character already has quest %d.
-1508: Character doesn't have quest %d.
-
-// @checkquest
-1509: Checkquest value for quest %d
-1510: >    HAVEQUEST : %d
-1511: >    HUNTING   : %d
-1512: >    PLAYTIME  : %d
-
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt

conf/msg_conf/map_msg_chn.conf

@@ -45,7 +45,7 @@
 24: 職業等級 上升
 25: 職業等級 下降
 26: 求助指令:
-//27: free
+27: 找不到檔案: help.txt
 28: 沒有玩家
 29: 有 1 位玩家
 30: 有 %d 位玩家
@@ -867,7 +867,7 @@
 
 // @reloadatcommand
 1036: Error reading groups.conf, reload failed.
-//1037 free
+1037: Error reading atcommand_athena.conf, reload failed.
 
 // @mapinfo
 1038: 請至少輸入一個有效的列表數字 (使用方法: @mapinfo <0-3> [地圖名稱])
@@ -1341,8 +1341,8 @@
 1370: 用法: ex. "@set PoringCharVarSTR$" outputs its value, Super Duper String.
 1371: NPC variables may not be used with @set.
 1372: Instance variables may not be used with @set.
-1373: %s value is now: %lld
-1374: %s value is now: %s
+1373: %s value is now :%d
+1374: %s value is now :%s
 1375: %s is empty
 //1376: free
 

conf/msg_conf/map_msg_frn.conf

@@ -45,7 +45,7 @@
 24: Job level augmenté.
 25: Job level baissé.
 26: Commandes d'aide:
-//27: free
+27: Commandes d'aide non-disponible.
 28: Aucun Joueur trouvé.
 29: 1 Joueur trouvé.
 30: %d Joueurs trouvés.
@@ -879,7 +879,7 @@
 
 // @reloadatcommand
 1036: Erreur à la lecture de groups.conf, reload échoué.
-//1037 free
+1037: Erreur à la lecture de atcommand_athena.conf, reload échoué.
 
 // @mapinfo
 1038: Entrez un numéro de la liste (usage: @mapinfo <0-3> <map>).
@@ -1354,8 +1354,8 @@
 1370: Usage: ex. "@set PoringCharVarSTR$" affiche sa valeur actuelle, Super Duper String.
 1371: Les variables des NPC ne peuvent pas être utilisées/changées avec @set.
 1372: Les variables d'Instance ne peuvent pas être utilisées avec @set.
-1373: %s valeur est maintenant: %lld
-1374: %s valeur est maintenant: %s
+1373: %s valeur est maintenant :%d
+1374: %s valeur est maintenant :%s
 1375: %s est vide
 //1376: free
 

conf/msg_conf/map_msg_grm.conf

@@ -44,7 +44,7 @@
 24: Job Level erhöht.
 25: Job Level verringert.
 26: Hilfsbefehle:
-//27: free
+27: Der help-Befehl ist nicht verfügbar.
 28: Kein Spieler gefunden.
 29: 1 Spieler gefunden.
 30: %d Spieler gefunden.

conf/msg_conf/map_msg_idn.conf

@@ -41,7 +41,7 @@
 24: Job Level dinaikkan.
 25: Job Level diturunkan.
 26: Bantuan command:
-//27: free
+27: Bantuan command tidak tersedia.
 28: Pemain tidak ditemukan.
 29: 1 pemain ditemukan.
 30: %d pemain ditemukan.
@@ -969,7 +969,7 @@
 
 // @reloadatcommand
 1036: Terjadi kesalahan saat membaca groups.conf, tidak berhasil dimuat ulang.
-//1037 free
+1037: Terjadi kesalahan saat membaca atcommand_athena.conf, tidak berhasil dimuat ulang.
 
 // @mapinfo
 1038: Harap masukkan setidaknya 1 pilihan. (Penggunaan: @mapinfo <0-3> <map>).
@@ -1445,7 +1445,7 @@
 1370: Contoh penggunaan: \"@set PoringCharVarSTR$\" menampilkan nilainya, Super Duper String.
 1371: Variabel pada NPC tidak boleh digunakan dengan @set.
 1372: Variabel instansi tidak boleh digunakan dengan @set.
-1373: Nilai %s saat ini: %lld
+1373: Nilai %s saat ini: %d
 1374: Nilai %s saat ini: %s
 1375: %s kosong
 //1376: free

conf/msg_conf/map_msg_por.conf

@@ -51,7 +51,7 @@
 24: Nível de classe acrescido.
 25: Nível de classe decrescido.
 26: Comandos de ajuda:
-//27: free
+27: Comandos de ajuda não disponível.
 28: Nenhum jogador encontrado.
 29: 1 jogador encontrado.
 30: %d jogadores encontrados.
@@ -1048,7 +1048,7 @@
 
 // @reloadatcommand
 1036: Erro na leitura do grups.conf, recarregamento falhou.
-//1037 free
+1037: Erro na leitura do atcommand_athena.conf, recarregamento falhou.
 
 // @mapinfo
 1038: Digite pelo menos um número válido da lista (uso: @mapinfo <0-3> <mapa>).
@@ -1524,8 +1524,8 @@
 1370: Uso: ex. "@set PoringCharVarSTR$" exibe seu valor, Super Duper String.
 1371: Variáveis de NPC não podem ser usadas com @set.
 1372: Variáveis de instância não podem ser usadas com @set.
-1373: %s valor agora é: %lld
-1374: %s valor agora é: %s
+1373: %s valor agora é :%d
+1374: %s valor agora é :%s
 1375: %s é vazia
 //1376: free
 

conf/msg_conf/map_msg_rus.conf

@@ -43,7 +43,7 @@
 24: Уровень профессии повышен.
 25: Уровень профессии снижен.
 26: Подсказки для команд:
-//27: free
+27: Подсказки для команд не доступны.
 28: Игроки не найдены.
 29: Найден 1 игрок.
 30: Найдено %d игрока(ов).
@@ -880,7 +880,7 @@
 
 // @reloadatcommand
 1036: Ошибка чтения файла groups.conf, перезагрузка не удалась.
-//1037 free
+1037: Ошибка чтения файла atcommand_athena.conf, перезагрузка не удалась.
 
 // @mapinfo
 1038: Введите хотя бы один номер (Использование: @mapinfo <0-3> <локация>).
@@ -1354,8 +1354,8 @@
 1370: Использование: прим. "@set PoringCharVarSTR$" будет иметь значение "Super Duper String".
 1371: Переменные НИП не могут быть использованы командой @set.
 1372: Переменные групп не могут быть использованы командой @set.
-1373: %s значение: %lld
-1374: %s значение: %s
+1373: %s значение :%d
+1374: %s значение :%s
 1375: %s пусто
 //1376: free
 

conf/msg_conf/map_msg_spn.conf

@@ -41,7 +41,7 @@
 24: Has aumentado tu nivel de oficio.
 25: Has disminuido tu nivel de oficio.
 26: Ayuda sobre comandos:
-//27: free
+27: No hay ninguna ayuda disponible.
 28: No se ha encontrado ningún jugador.
 29: Se ha encontrado 1 jugador.
 30: Se han encontrado %d jugadores.
@@ -1017,7 +1017,7 @@
 
 // @reloadatcommand
 1036: Ha ocurrido un error al cargar el archivo groups.conf.
-//1037 free
+1037: Ha ocurrido un error al cargar el archivo atcommand_athena.conf.
 
 // @mapinfo
 1038: Introduce un número de la lista (instrucciones: @mapinfo <0-3> <mapa>).
@@ -1493,7 +1493,7 @@
 1370: Instrucciones: ej. "@set PoringCharVarSTR$" muestra su valor, cadena de texto.
 1371: Las variables de NPC no se pueden editar con @set.
 1372: Las variables de instancias no se pueden editar con @set.
-1373: El valor %s ahora es: %lld
+1373: El valor %s ahora es: %d
 1374: El valor %s ahora es: %s
 1375: %s está vacío
 

conf/msg_conf/map_msg_tha.conf

@@ -45,7 +45,7 @@
 24: Job level א¾<D790>ט<EFBFBD>¢<EFBFBD>י¹.
 25: Job level <20>´<EFBFBD>§.
 26: Help commands:
-//27: free
+27: ¤<EFBFBD><EFBFBD><EFBFBD>ט§ help ה<>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶ד×יה´י.
 28: ה<>ט¾÷¼<C3B7>יא<D799>ט¹.
 29: ¾÷¼<C3B7>יא<D799>ט¹ 1 ¤¹.
 30: ¾÷¼<C3B7>יא<D799>ט¹ %d ¤¹.
@@ -873,7 +873,7 @@
 
 // @reloadatcommand
 1036: א<><D790>´¢י<C2A2>¼<EFBFBD>´¾<C2B4><C2BE>´ד¹<D793><C2B9><EFBFBD>¼ט<C2BC>¹ה<C2B9><D794>ל groups.conf, <20><><EFBFBD>ג<EFBFBD><D792>´ד<C2B4><D793>ט<EFBFBD>י<EFBFBD>א<EFBFBD><D790><EFBFBD>.
-//1037 free
+1037: א<><D790>´¢י<C2A2>¼<EFBFBD>´¾<C2B4><C2BE>´ד¹<D793><C2B9><EFBFBD>¼ט<C2BC>¹ה<C2B9><D794>ל atcommand_athena.conf, <20><><EFBFBD>ג<EFBFBD><D792>´ד<C2B4><D793>ט<EFBFBD>י<EFBFBD>א<EFBFBD><D790><EFBFBD>.
 
 // @mapinfo
 1038: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>א<EFBFBD>¢<EFBFBD><C2A2>ט<EFBFBD>§<EFBFBD>¹ט<C2B9><D798><EFBFBD>¹<EFBFBD>ט§¤ט<C2A4>¨<EFBFBD><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>¸<EFBFBD>ד×י: @mapinfo <0-3> <map>).
@@ -1347,7 +1347,7 @@
 1370: <20><>¸<EFBFBD>ד×י: ex. "@set PoringCharVarSTR$" ¨<>ב<EFBFBD>´§¼<C2A7><C2BC><EFBFBD>¾¸לא»ח¹¤ט<C2A4>, Super Duper String.
 1371: µ<><C2B5>ב»<D791> NPC ה<>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶µ<C2B6>י§¤ט<C2A4>ה´י´י<C2B4><D799> @set ה´י.
 1372: µ<><C2B5>ב»<D791> Instance ה<>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶µ<C2B6>י§¤ט<C2A4>ה´י´י<C2B4><D799> @set ה´י.
-1373: %s <20><>¤ט<C2A4>: %lld
+1373: %s <20><>¤ט<C2A4>: %d
 1374: %s <20><>¤ט<C2A4>: %s
 1375: %s ה<>ט<EFBFBD><D798>¤ט<C2A4>ד´ז.
 //1376: free

db/abra_db.txt

@@ -0,0 +1,227 @@
+// Hocus-Pocus (Abracadabra) Castable Skills Database
+//
+// Structure of Database:
+// SkillID,DummyName,ProbabilityPerLvl
+//
+// 01. SkillID                  Skill ID to be casted by hocus pocus.
+// 02. DummyName                Name of the skill (informative, not used by server).
+// 03. ProbabilityPerLvl        Not a rate! Chance at which the skill is selected compared
+//                              with other entries probabilties
+//
+// NOTE:
+// - The skill is picked at random from the entire database and then tested for rate. If it
+//   does not succeed at that rate, another skill is picked and tested. This continues
+//   until a skill succeeds. Abracadabra-specific skills have a different chance to occur
+//   depending on skill level used. All other skills have an equal chance and appear from
+//   level 1 onward.
+// - To remove entry by importing, put "clear" (without quotes) in DummyName
+
+5,Bash,500
+6,Provoke,500
+7,Magnum Break,500
+8,Endure,500
+
+10,Sight,500
+11,Napalm Beat,500
+12,Safety Wall,500
+13,Soul Strike,500
+14,Cold Bolt,500
+15,Frost Diver,500
+16,Stone Curse,500
+17,Fire Ball,500
+18,Fire Wall,500
+19,Fire Bolt,500
+20,Lightning Bolt,500
+21,Thunder Storm,500
+
+24,Ruwach,500
+25,Pneuma,500
+26,Teleport,500
+27,Warp Portal,500
+28,Heal,500
+29,Increase AGI,500
+30,Decrease AGI,500
+31,Aqua Benedicta,500
+32,Signum Crucis,500
+33,Angelus,500
+34,Blessing,500
+35,Cure,500
+
+40,Item Appraisal,500
+41,Vending,500
+42,Mammonite,500
+
+45,Improve Concentration,500
+46,Double Strafe,500
+47,Arrow Shower,500
+
+50,Steal,500
+51,Hiding,500
+52,Envenom,500
+53,Detoxify,500
+
+54,Resurrection,500
+
+56,Pierce,500
+57,Brandish Spear,500
+58,Spear Stab,500
+59,Spear Boomerang,500
+60,TwoHand Quicken,500
+61,Counter Attack,500
+62,Bowling Bash,500
+
+66,Impositio Manus,500
+67,Suffragium,500
+68,Aspersio,500
+69,B.S Sacramenti,500
+70,Sanctuary,500
+71,Slow poison,500
+72,Status Recovery,500
+73,Kyrie Eleison,500
+74,Magnificat,500
+75,Gloria,500
+76,Lex Divina,500
+77,Turn Undead,500
+78,Lex Aeterna,500
+79,Magnus Exorcismus,500
+
+80,Fire Pillar,500
+81,Sightrasher,500
+//82,Fire Ivy,500
+83,Meteor Storm,500
+84,Jupitel Thunder,500
+85,Lord of Vermilion,500
+86,Water Ball,500
+87,Ice Wall,500
+88,Frost Nova,500
+89,Storm Gust,500
+90,Earth spike,500
+91,Heaven's Drive,500
+92,Quagmire,500
+93,Sense,500
+
+//108,Weapon Repair,500
+110,Hammer Fall,500
+111,Adrenaline Rush,500
+112,Weapon Perfection,500
+113,Power-Thrust,500
+114,Maximize Power,500
+
+115,Skid Trap,500
+116,Land Mine,500
+117,Ankle Snare,500
+118,Shockwave Trap,500
+119,Sandman,500
+120,Flasher,500
+121,Freezing Trap,500
+122,Blast Mine,500
+123,Claymore Trap,500
+124,Remove Trap,500
+125,Talkie box,500
+129,Blitz Beat,500
+130,Detect,500
+131,Spring Trap,500
+
+135,Cloaking,500
+136,Sonic Blow,500
+137,Grimtooth,500
+138,Enchant Poison,500
+139,Poison React,500
+140,Venom Dust,500
+141,Venom Splasher,500
+
+//---EP4.0 Skill---
+211,Mug,500
+212,Back Stab,500
+214,Sightless Raid,500
+215,Divest Weapon,500
+216,Divest Shield,500
+217,Divest Armor,500
+218,Divest Helm,500
+219,Snatch,500
+220,Scribble,500
+//221,Piece,500
+222,Remover,500
+
+249,Guard,500
+250,Smite,500
+251,Shield Boomerang,500
+252,Shield Reflect,500
+253,Holy Cross,500
+254,Grand Cross,500
+255,Sacrifice,500
+256,Resistant Souls,500
+257,Defending Aura,500
+258,Spear Quicken,500
+
+261,Summon Spirit Sphere,500
+262,Absorb Spirit Sphere,500
+264,Snap,500
+266,Occult Impact,500
+267,Throw Spirit Sphere,500
+268,Mental Strength,500
+269,Root,500
+270,Fury,500
+271,Asura Strike,500
+//272,Raging Quadruple Blow,500
+//273,Raging Thrust,500
+
+275,Cast Cancel,500
+276,Magic Rod,500
+277,Spell Break,500
+279,Hindsight,500
+280,Endow Blaze,500
+281,Endow Tsunami,500
+282,Endow Tornado,500
+283,Endow Quake,500
+285,Volcano,500
+286,Deluge,500
+287,Whirlwind,500
+288,Magnetic Earth,500
+289,Dispel,500
+
+// Abracadabra Derivation Skill
+291,Monocell,250:500:750:1000:1250:1200:1750:2000:2250:2500
+292,Class Change,0:0:0:0:10:10:20:20:30:30
+293,Summon Monster,100:200:300:400:500:600:700:800:900:1000
+294,Grampus Morph,0:0:0:0:0:0:0:10:50:100
+295,Grim Reaper,50:100:150:200:250:300:350:400:450:500
+//296,Gold Digger,50:100:150:200:250:300:350:400:450:500
+//297,Beastly Hypnosis,50:100:150:200:250:300:350:400:450:500
+298,Questioning,1000:800:600:400:200:0:0:0:0:0
+299,Gravity,0:0:0:0:0:0:0:20:50:100
+//300,Leveling,0:0:0:0:0:0:0:0:10:50
+301,Suicide,0:0:0:0:0:0:0:10:50:100
+302,Rejuvination,0:0:0:0:0:0:20:50:100:200
+303,Coma,0:0:0:0:100:200:300:400:500:600
+
+// Dancer / Bard commonness
+//304,Amp,500
+//305,Encore,500
+//306,Lullaby,500
+//307,Mental Sensing,500
+//308,Down Tempo,500
+//309,Battle Theme,500
+//310,Harmonic Lick,500
+//311,Classical Pluck,500
+//312,Power Chord,500
+//313,Acoustic Rhythm,500
+//314,Ragnarok,500
+
+// Bard skill
+316,Melody Strike,500
+//317,Unchained Serenade,500
+318,Unbarring Octave,500
+//319,Perfect Tablature,500
+//320,Impressive Riff,500
+//321,Magic Strings,500
+//322,Song of Lutie,500
+
+// Dancer skill
+324,Slinging Arrow,500
+//325,Hip Shaker,500
+326,Dazzler,500
+//327,Focus Ballet,500
+//328,Slow Grace,500
+//329,Lady Luck,500
+//330,Gypsy's Kiss,500

db/abra_db.yml

@@ -1,326 +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/>.
-#
-###########################################################################
-# Abracadabra Database
-###########################################################################
-#
-# Abracadabra Settings
-#
-###########################################################################
-# - Skill             Skill to be casted by Abracadabra.
-#   Probability:      Probability of skill compared to others in database (1 = 0.01%, 10000 = 100%). (Default: 500)
-#     - Level         Skill level.
-#       Probability   Probability at specific skill level (1 = 0.01%, 10000 = 100%). (Default: 0)
-###########################################################################
-
-Header:
-  Type: ABRA_DB
-  Version: 1
-
-Body:
-  - Skill: SM_BASH
-  - Skill: SM_PROVOKE
-  - Skill: SM_MAGNUM
-  - Skill: SM_ENDURE
-  - Skill: MG_SIGHT
-  - Skill: MG_NAPALMBEAT
-  - Skill: MG_SAFETYWALL
-  - Skill: MG_SOULSTRIKE
-  - Skill: MG_COLDBOLT
-  - Skill: MG_FROSTDIVER
-  - Skill: MG_STONECURSE
-  - Skill: MG_FIREBALL
-  - Skill: MG_FIREWALL
-  - Skill: MG_FIREBOLT
-  - Skill: MG_LIGHTNINGBOLT
-  - Skill: MG_THUNDERSTORM
-  - Skill: AL_RUWACH
-  - Skill: AL_PNEUMA
-  - Skill: AL_TELEPORT
-  - Skill: AL_WARP
-  - Skill: AL_HEAL
-  - Skill: AL_INCAGI
-  - Skill: AL_DECAGI
-  - Skill: AL_HOLYWATER
-  - Skill: AL_CRUCIS
-  - Skill: AL_ANGELUS
-  - Skill: AL_BLESSING
-  - Skill: AL_CURE
-  - Skill: MC_IDENTIFY
-  - Skill: MC_VENDING
-  - Skill: MC_MAMMONITE
-  - Skill: AC_CONCENTRATION
-  - Skill: AC_DOUBLE
-  - Skill: AC_SHOWER
-  - Skill: TF_STEAL
-  - Skill: TF_HIDING
-  - Skill: TF_POISON
-  - Skill: TF_DETOXIFY
-  - Skill: ALL_RESURRECTION
-  - Skill: KN_PIERCE
-  - Skill: KN_BRANDISHSPEAR
-  - Skill: KN_SPEARSTAB
-  - Skill: KN_SPEARBOOMERANG
-  - Skill: KN_TWOHANDQUICKEN
-  - Skill: KN_AUTOCOUNTER
-  - Skill: KN_BOWLINGBASH
-  - Skill: PR_IMPOSITIO
-  - Skill: PR_SUFFRAGIUM
-  - Skill: PR_ASPERSIO
-  - Skill: PR_BENEDICTIO
-  - Skill: PR_SANCTUARY
-  - Skill: PR_SLOWPOISON
-  - Skill: PR_STRECOVERY
-  - Skill: PR_KYRIE
-  - Skill: PR_MAGNIFICAT
-  - Skill: PR_GLORIA
-  - Skill: PR_LEXDIVINA
-  - Skill: PR_TURNUNDEAD
-  - Skill: PR_LEXAETERNA
-  - Skill: PR_MAGNUS
-  - Skill: WZ_FIREPILLAR
-  - Skill: WZ_SIGHTRASHER
-  - Skill: WZ_METEOR
-  - Skill: WZ_JUPITEL
-  - Skill: WZ_VERMILION
-  - Skill: WZ_WATERBALL
-  - Skill: WZ_ICEWALL
-  - Skill: WZ_FROSTNOVA
-  - Skill: WZ_STORMGUST
-  - Skill: WZ_EARTHSPIKE
-  - Skill: WZ_HEAVENDRIVE
-  - Skill: WZ_QUAGMIRE
-  - Skill: WZ_ESTIMATION
-  - Skill: BS_HAMMERFALL
-  - Skill: BS_ADRENALINE
-  - Skill: BS_WEAPONPERFECT
-  - Skill: BS_OVERTHRUST
-  - Skill: BS_MAXIMIZE
-  - Skill: HT_SKIDTRAP
-  - Skill: HT_LANDMINE
-  - Skill: HT_ANKLESNARE
-  - Skill: HT_SHOCKWAVE
-  - Skill: HT_SANDMAN
-  - Skill: HT_FLASHER
-  - Skill: HT_FREEZINGTRAP
-  - Skill: HT_BLASTMINE
-  - Skill: HT_CLAYMORETRAP
-  - Skill: HT_REMOVETRAP
-  - Skill: HT_TALKIEBOX
-  - Skill: HT_BLITZBEAT
-  - Skill: HT_DETECTING
-  - Skill: HT_SPRINGTRAP
-  - Skill: AS_CLOAKING
-  - Skill: AS_SONICBLOW
-  - Skill: AS_GRIMTOOTH
-  - Skill: AS_ENCHANTPOISON
-  - Skill: AS_POISONREACT
-  - Skill: AS_VENOMDUST
-  - Skill: AS_SPLASHER
-  - Skill: RG_STEALCOIN
-  - Skill: RG_BACKSTAP
-  - Skill: RG_RAID
-  - Skill: RG_STRIPWEAPON
-  - Skill: RG_STRIPSHIELD
-  - Skill: RG_STRIPARMOR
-  - Skill: RG_STRIPHELM
-  - Skill: RG_INTIMIDATE
-  - Skill: RG_GRAFFITI
-  - Skill: RG_CLEANER
-  - Skill: CR_AUTOGUARD
-  - Skill: CR_SHIELDCHARGE
-  - Skill: CR_SHIELDBOOMERANG
-  - Skill: CR_REFLECTSHIELD
-  - Skill: CR_HOLYCROSS
-  - Skill: CR_GRANDCROSS
-  - Skill: CR_DEVOTION
-  - Skill: CR_PROVIDENCE
-  - Skill: CR_DEFENDER
-  - Skill: CR_SPEARQUICKEN
-  - Skill: MO_CALLSPIRITS
-  - Skill: MO_ABSORBSPIRITS
-  - Skill: MO_BODYRELOCATION
-  - Skill: MO_INVESTIGATE
-  - Skill: MO_FINGEROFFENSIVE
-  - Skill: MO_STEELBODY
-  - Skill: MO_BLADESTOP
-  - Skill: MO_EXPLOSIONSPIRITS
-  - Skill: MO_EXTREMITYFIST
-  - Skill: SA_CASTCANCEL
-  - Skill: SA_MAGICROD
-  - Skill: SA_SPELLBREAKER
-  - Skill: SA_AUTOSPELL
-  - Skill: SA_FLAMELAUNCHER
-  - Skill: SA_FROSTWEAPON
-  - Skill: SA_LIGHTNINGLOADER
-  - Skill: SA_SEISMICWEAPON
-  - Skill: SA_VOLCANO
-  - Skill: SA_DELUGE
-  - Skill: SA_VIOLENTGALE
-  - Skill: SA_LANDPROTECTOR
-  - Skill: SA_DISPELL
-  - Skill: SA_MONOCELL
-    Probability:
-      - Level: 1
-        Probability: 250
-      - Level: 2
-        Probability: 500
-      - Level: 3
-        Probability: 750
-      - Level: 4
-        Probability: 1000
-      - Level: 5
-        Probability: 1250
-      - Level: 6
-        Probability: 1200
-      - Level: 7
-        Probability: 1750
-      - Level: 8
-        Probability: 2000
-      - Level: 9
-        Probability: 2250
-      - Level: 10
-        Probability: 2500
-  - Skill: SA_CLASSCHANGE
-    Probability:
-      - Level: 5
-        Probability: 10
-      - Level: 6
-        Probability: 10
-      - Level: 7
-        Probability: 20
-      - Level: 8
-        Probability: 20
-      - Level: 9
-        Probability: 30
-      - Level: 10
-        Probability: 30
-  - Skill: SA_SUMMONMONSTER
-    Probability:
-      - Level: 1
-        Probability: 100
-      - Level: 2
-        Probability: 200
-      - Level: 3
-        Probability: 300
-      - Level: 4
-        Probability: 400
-      - Level: 5
-        Probability: 500
-      - Level: 6
-        Probability: 600
-      - Level: 7
-        Probability: 700
-      - Level: 8
-        Probability: 800
-      - Level: 9
-        Probability: 900
-      - Level: 10
-        Probability: 1000
-  - Skill: SA_REVERSEORCISH
-    Probability:
-      - Level: 8
-        Probability: 10
-      - Level: 9
-        Probability: 50
-      - Level: 10
-        Probability: 100
-  - Skill: SA_DEATH
-    Probability:
-      - Level: 1
-        Probability: 50
-      - Level: 2
-        Probability: 100
-      - Level: 3
-        Probability: 150
-      - Level: 4
-        Probability: 200
-      - Level: 5
-        Probability: 250
-      - Level: 6
-        Probability: 300
-      - Level: 7
-        Probability: 350
-      - Level: 8
-        Probability: 400
-      - Level: 9
-        Probability: 450
-      - Level: 10
-        Probability: 500
-  - Skill: SA_QUESTION
-    Probability:
-      - Level: 1
-        Probability: 1000
-      - Level: 2
-        Probability: 800
-      - Level: 3
-        Probability: 600
-      - Level: 4
-        Probability: 400
-      - Level: 5
-        Probability: 200
-  - Skill: SA_GRAVITY
-    Probability:
-      - Level: 8
-        Probability: 20
-      - Level: 9
-        Probability: 50
-      - Level: 10
-        Probability: 100
-  - Skill: SA_INSTANTDEATH
-    Probability:
-      - Level: 8
-        Probability: 10
-      - Level: 9
-        Probability: 50
-      - Level: 10
-        Probability: 100
-  - Skill: SA_FULLRECOVERY
-    Probability:
-      - Level: 7
-        Probability: 20
-      - Level: 8
-        Probability: 50
-      - Level: 9
-        Probability: 100
-      - Level: 10
-        Probability: 200
-  - Skill: SA_COMA
-    Probability:
-      - Level: 5
-        Probability: 100
-      - Level: 6
-        Probability: 200
-      - Level: 7
-        Probability: 300
-      - Level: 8
-        Probability: 400
-      - Level: 9
-        Probability: 500
-      - Level: 10
-        Probability: 600
-  - Skill: BA_MUSICALSTRIKE
-  - Skill: BA_FROSTJOKER
-  - Skill: DC_THROWARROW
-  - Skill: DC_SCREAM
-
-Footer:
-  Imports:
-  - Path: db/pre-re/abra_db.yml
-    Mode: Prerenewal
-  - Path: db/import/abra_db.yml

db/achievement_level_db.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/>.
-#
-###########################################################################
-# Achievement Level Database
-###########################################################################
-#
-# Achievement Level Settings
-#
-###########################################################################
-# Level - Achievement Level
-###########################################################################
-# Points - Required total scoring points to reach this level.
-###########################################################################
-
-Header:
-  Type: ACHIEVEMENT_LEVEL_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/achievement_level_db.yml
-    Mode: Prerenewal
-  - Path: db/re/achievement_level_db.yml
-    Mode: Renewal
-  - Path: db/import/achievement_level_db.yml

db/attendance.yml

@@ -1,34 +1,3 @@
-# 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/>.
-#
-###########################################################################
-# Attendance Database
-###########################################################################
-#
-# Attendance Settings
-#
-###########################################################################
-# - Start                   Start date.
-#   End                     End date.
-#   Rewards:                List of rewards for each day.
-#     - Day                 Reward day.
-#       ItemId              Item ID.
-###########################################################################
-
 Header:
   Type: ATTENDANCE_DB
   Version: 1

db/battleground_db.yml

@@ -1,211 +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/>.
-#
-###########################################################################
-# Battleground Queue Database
-###########################################################################
-#
-# Battleground Queue Settings
-#
-###########################################################################
-# - Id                Unique ID for the battleground type.
-#   Name              Name of the battleground. Must be the exact same as in the client for players to be able to join.
-#   MinPlayers        Minimum number of players required on each team. (Default: 1)
-#   MaxPlayers        Maximum number of players on each team. (Default: MAX_BG_MEMBERS / 2)
-#   MinLevel          Minimum level required to join the battleground. (Default: 1)
-#   MaxLevel          Maximum level to join the battleground. (Default: MAX_LEVEL value)
-#   Deserter          Amount of time in seconds a player is marked deserter. (Default: 600)
-#   StartDelay        Amount of time in seconds once a queue is filled before players are warped. (Default: 0)
-#   Join:             Which application type is accepted. The entryqueuelist.lub can visually disable these options.
-#     Solo            Able to join a queue as an individual. (Default: true)
-#     Party           Able to join a queue as a party. (Default: true)
-#     Guild           Able to join a queue as a guild. (Default: true)
-#   JobRestrictions   List of jobs that are unable to join the battleground.
-#   Locations:        Battleground location settings.
-#     - Map           The map on which the battleground will be played.
-#       StartEvent    NPC event triggered when the battleground starts.
-#       TeamA:        TeamA settings.
-#         RespawnX    X coordinate for warping on death.
-#         RespawnY    Y coordinate for warping on death.
-#         DeathEvent  NPC event triggered when a player dies.
-#         QuitEvent   NPC event triggered when a player quits.
-#         ActiveEvent NPC event triggered when a player joints an active battleground.
-#         Variable    Name of BG ID variable used in the battleground script.
-#       TeamB:        TeamB settings.
-#         RespawnX    X coordinate for warping on death.
-#         RespawnY    Y coordinate for warping on death.
-#         DeathEvent  NPC event triggered when a player dies.
-#         QuitEvent   NPC event triggered when a player quits.
-#         ActiveEvent NPC event triggered when a player joints an active battleground.
-#         Variable    Name of BG ID variable used in the battleground script.
-###########################################################################
-
-Header:
-  Type: BATTLEGROUND_DB
-  Version: 1
-
-Body:
-  - Id: 1
-    Name: Tierra Gorge
-    MinPlayers: 6
-    MinLevel: 80
-    JobRestrictions:
-      Novice: true
-      SuperNovice: true
-      Novice_High: true
-      Baby: true
-      Super_Baby: true
-      Super_Novice_E: true
-      Super_Baby_E: true
-    Locations:
-      - Map: bat_a01
-        StartEvent: start#bat_a01::OnReadyCheck
-        TeamA:
-          RespawnX: 50
-          RespawnY: 374
-          QuitEvent: start#bat_a01::OnGuillaumeQuit
-          ActiveEvent: start#bat_a01::OnGuillaumeActive
-          Variable: $@TierraBG1_id1
-        TeamB:
-          RespawnX: 42
-          RespawnY: 16
-          QuitEvent: start#bat_a01::OnCroixQuit
-          ActiveEvent: start#bat_a01::OnCroixActive
-          Variable: $@TierraBG1_id2
-      - Map: bat_a02
-        StartEvent: start#bat_a02::OnReadyCheck
-        TeamA:
-          RespawnX: 50
-          RespawnY: 374
-          QuitEvent: start#bat_a02::OnGuillaumeQuit
-          ActiveEvent: start#bat_a02::OnGuillaumeActive
-          Variable: $@TierraBG2_id1
-        TeamB:
-          RespawnX: 42
-          RespawnY: 16
-          QuitEvent: start#bat_a02::OnCroixQuit
-          ActiveEvent: start#bat_a02::OnCroixActive
-          Variable: $@TierraBG2_id2
-  - Id: 2
-    Name: Flavius
-    MinPlayers: 6
-    MinLevel: 80
-    JobRestrictions:
-      Novice: true
-      SuperNovice: true
-      Novice_High: true
-      Baby: true
-      Super_Baby: true
-      Super_Novice_E: true
-      Super_Baby_E: true
-    Locations:
-      - Map: bat_b01
-        StartEvent: start#bat_b01::OnReadyCheck
-        TeamA:
-          RespawnX: 10
-          RespawnY: 290
-          QuitEvent: start#bat_b01::OnGuillaumeQuit
-          ActiveEvent: start#bat_b01::OnGuillaumeActive
-          Variable: $@FlaviusBG1_id1
-        TeamB:
-          RespawnX: 390
-          RespawnY: 10
-          QuitEvent: start#bat_b01::OnCroixQuit
-          ActiveEvent: start#bat_b01::OnCroixActive
-          Variable: $@FlaviusBG1_id2
-      - Map: bat_b02
-        StartEvent: start#bat_b02::OnReadyCheck
-        TeamA:
-          RespawnX: 10
-          RespawnY: 290
-          QuitEvent: start#bat_b02::OnGuillaumeQuit
-          ActiveEvent: start#bat_b02::OnGuillaumeActive
-          Variable: $@FlaviusBG2_id1
-        TeamB:
-          RespawnX: 390
-          RespawnY: 10
-          QuitEvent: start#bat_b02::OnCroixQuit
-          ActiveEvent: start#bat_b02::OnCroixActive
-          Variable: $@FlaviusBG2_id2
-  - Id: 3
-    Name: KVM (Level 80 and up)
-    MinPlayers: 5
-    MinLevel: 80
-    Locations:
-      - Map: bat_c01
-        StartEvent: KvM01_BG::OnStart
-        TeamA:
-          RespawnX: 52
-          RespawnY: 129
-          DeathEvent: KvM01_BG::OnGuillaumeDie
-          QuitEvent: KvM01_BG::OnGuillaumeQuit
-          ActiveEvent: KvM01_BG::OnGuillaumeActive
-          Variable: $@KvM01BG_id1
-        TeamB:
-          RespawnX: 147
-          RespawnY: 55
-          DeathEvent: KvM01_BG::OnCroixDie
-          QuitEvent: KvM01_BG::OnCroixQuit
-          ActiveEvent: KvM01_BG::OnCroixActive
-          Variable: $@KvM01BG_id2
-  - Id: 4
-    Name: KVM (Level 60~79)
-    MinPlayers: 5
-    MinLevel: 60
-    MaxLevel: 79
-    Locations:
-      - Map: bat_c02
-        StartEvent: KvM02_BG::OnStart
-        TeamA:
-          RespawnX: 52
-          RespawnY: 129
-          DeathEvent: KvM02_BG::OnGuillaumeDie
-          QuitEvent: KvM02_BG::OnGuillaumeQuit
-          ActiveEvent: KvM02_BG::OnGuillaumeActive
-          Variable: $@KvM02BG_id1
-        TeamB:
-          RespawnX: 147
-          RespawnY: 55
-          DeathEvent: KvM02_BG::OnCroixDie
-          QuitEvent: KvM02_BG::OnCroixQuit
-          ActiveEvent: KvM02_BG::OnCroixActive
-          Variable: $@KvM02BG_id2
-  - Id: 5
-    Name: KVM (Level 59 and below
-    MinPlayers: 5
-    MaxLevel: 59
-    Locations:
-      - Map: bat_c03
-        StartEvent: KvM03_BG::OnStart
-        TeamA:
-          RespawnX: 52
-          RespawnY: 129
-          DeathEvent: KvM03_BG::OnGuillaumeDie
-          QuitEvent: KvM03_BG::OnGuillaumeQuit
-          ActiveEvent: KvM03_BG::OnGuillaumeActive
-          Variable: $@KvM03BG_id1
-        TeamB:
-          RespawnX: 147
-          RespawnY: 55
-          DeathEvent: KvM03_BG::OnCroixDie
-          QuitEvent: KvM03_BG::OnCroixQuit
-          ActiveEvent: KvM03_BG::OnCroixActive
-          Variable: $@KvM03BG_id2
-
-Footer:
-  Imports:
-  - Path: db/import/battleground_db.yml

db/homun_skill_tree.txt

@@ -89,31 +89,31 @@
 //Eira
 6048,8022,5,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_LIGHT_OF_REGENE
 6048,8023,5,114,0,0,0,0,0,0,0,0,0,0,0	//MH_OVERED_BOOST
-6048,8024,10,106,0,0,0,0,0,0,0,0,0,0,0	//MH_ERASER_CUTTER
-6048,8025,10,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_XENO_SLASHER
+6048,8024,5,106,0,0,0,0,0,0,0,0,0,0,0	//MH_ERASER_CUTTER
+6048,8025,5,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_XENO_SLASHER
 6048,8026,5,137,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILENT_BREEZE
 //Bayeri
-6049,8031,10,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_STAHL_HORN
+6049,8031,5,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_STAHL_HORN
 6049,8032,5,112,0,0,0,0,0,0,0,0,0,0,0 	//MH_GOLDENE_FERSE
 6049,8033,5,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_STEINWAND
-6049,8034,10,138,0,0,0,0,0,0,0,0,0,0,0	//MH_HEILIGE_STANGE
+6049,8034,5,138,0,0,0,0,0,0,0,0,0,0,0	//MH_HEILIGE_STANGE
 6049,8035,5,130,0,0,0,0,0,0,0,0,0,0,0	//MH_ANGRIFFS_MODUS
 //Sera
 6050,8018,5,132,0,0,0,0,0,0,0,0,0,0,0 	//MH_SUMMON_LEGION
-6050,8019,10,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_NEEDLE_OF_PARALYZE
+6050,8019,5,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_NEEDLE_OF_PARALYZE
 6050,8020,5,116,0,0,0,0,0,0,0,0,0,0,0 	//MH_POISON_MIST
-6050,8021,10,123,0,0,0,0,0,0,0,0,0,0,0 	//MH_PAIN_KILLER
+6050,8021,5,123,0,0,0,0,0,0,0,0,0,0,0 	//MH_PAIN_KILLER
 //Dieter
 6051,8039,5,122,0,0,0,0,0,0,0,0,0,0,0 	//MH_MAGMA_FLOW
 6051,8040,5,116,0,0,0,0,0,0,0,0,0,0,0 	//MH_GRANITIC_ARMOR
-6051,8041,10,109,0,0,0,0,0,0,0,0,0,0,0 	//MH_LAVA_SLIDE
-6051,8042,10,131,0,0,0,0,0,0,0,0,0,0,0 	//MH_PYROCLASTIC
+6051,8041,5,109,0,0,0,0,0,0,0,0,0,0,0 	//MH_LAVA_SLIDE
+6051,8042,5,131,0,0,0,0,0,0,0,0,0,0,0 	//MH_PYROCLASTIC
 6051,8043,5,102,0,0,0,0,0,0,0,0,0,0,0 	//MH_VOLCANIC_ASH
 //Elanor
 6052,8027,1,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_STYLE_CHANGE
 6052,8028,5,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_SONIC_CRAW
-6052,8029,10,114,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILVERVEIN_RUSH
-6052,8030,10,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_MIDNIGHT_FRENZY
+6052,8029,5,114,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILVERVEIN_RUSH
+6052,8030,5,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_MIDNIGHT_FRENZY
 6052,8036,5,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_TINDER_BREAKER
 6052,8037,5,112,0,0,0,0,0,0,0,0,0,0,0 	//MH_CBC
 6052,8038,5,133,0,0,0,0,0,0,0,0,0,0,0 	//MH_EQC

db/import-tmpl/abra_db.txt

@@ -0,0 +1,17 @@
+// Hocus-Pocus (Abracadabra) Castable Skills Database
+//
+// Structure of Database:
+// SkillID,DummyName,ProbabilityPerLvl
+//
+// 01. SkillID                  Skill ID to be casted by hocus pocus.
+// 02. DummyName                Name of the skill (informative, not used by server).
+// 03. ProbabilityPerLvl        Not a rate! Chance at which the skill is selected compared
+//                              with other entries probabilties
+//
+// NOTE:
+// - The skill is picked at random from the entire database and then tested for rate. If it
+//   does not succeed at that rate, another skill is picked and tested. This continues
+//   until a skill succeeds. Abracadabra-specific skills have a different chance to occur
+//   depending on skill level used. All other skills have an equal chance and appear from
+//   level 1 onward.
+// - To remove entry by importing, put "clear" (without quotes) in DummyName

db/import-tmpl/abra_db.yml

@@ -1,33 +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/>.
-#
-###########################################################################
-# Abracadabra Database
-###########################################################################
-#
-# Abracadabra Settings
-#
-###########################################################################
-# - Skill             Skill to be casted by Abracadabra.
-#   Probability:      Probability of skill compared to others in database (1 = 0.01%, 10000 = 100%). (Default: 500)
-#     - Level         Skill level.
-#       Probability   Probability at specific skill level (1 = 0.01%, 10000 = 100%). (Default: 0)
-###########################################################################
-
-Header:
-  Type: ABRA_DB
-  Version: 1

db/import-tmpl/achievement_level_db.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/>.
-#
-###########################################################################
-# Import Achievement Level Database
-###########################################################################
-#
-# Achievement Level Settings
-#
-###########################################################################
-# Level - Achievement Level
-###########################################################################
-# Points - Required total scoring points to reach this level.
-###########################################################################
-
-Header:
-  Type: ACHIEVEMENT_LEVEL_DB
-  Version: 1

db/import-tmpl/attendance.yml

@@ -1,34 +1,3 @@
-# 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/>.
-#
-###########################################################################
-# Attendance Database
-###########################################################################
-#
-# Attendance Settings
-#
-###########################################################################
-# - Start                   Start date.
-#   End                     End date.
-#   Rewards:                List of rewards for each day.
-#     - Day                 Reward day.
-#       ItemId              Item ID.
-###########################################################################
-
 Header:
   Type: ATTENDANCE_DB
   Version: 1

db/import-tmpl/battleground_db.yml

@@ -1,59 +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/>.
-#
-###########################################################################
-# Battleground Queue Database
-###########################################################################
-#
-# Battleground Queue Settings
-#
-###########################################################################
-# - Id                Unique ID for the battleground type.
-#   Name              Name of the battleground. Must be the exact same as in the client for players to be able to join.
-#   MinPlayers        Minimum number of players required on each team. (Default: 1)
-#   MaxPlayers        Maximum number of players on each team. (Default: MAX_BG_MEMBERS / 2)
-#   MinLevel          Minimum level required to join the battleground. (Default: 1)
-#   MaxLevel          Maximum level to join the battleground. (Default: MAX_LEVEL value)
-#   Deserter          Amount of time in seconds a player is marked deserter. (Default: 600)
-#   StartDelay        Amount of time in seconds once a queue is filled before players are warped. (Default: 0)
-#   Join:             Which application type is accepted. The entryqueuelist.lub can visually disable these options.
-#     Solo            Able to join a queue as an individual. (Default: true)
-#     Party           Able to join a queue as a party. (Default: true)
-#     Guild           Able to join a queue as a guild. (Default: true)
-#   JobRestrictions   List of jobs that are unable to join the battleground.
-#   Locations:        Battleground location settings.
-#     - Map           The map on which the battleground will be played.
-#       StartEvent    NPC event triggered when the battleground starts.
-#       TeamA:        TeamA settings.
-#         RespawnX    X coordinate for warping on death.
-#         RespawnY    Y coordinate for warping on death.
-#         DeathEvent  NPC event triggered when a player dies.
-#         QuitEvent   NPC event triggered when a player quits.
-#         ActiveEvent NPC event triggered when a player joints an active battleground.
-#         Variable    Name of BG ID variable used in the battleground script.
-#       TeamB:        TeamB settings.
-#         RespawnX    X coordinate for warping on death.
-#         RespawnY    Y coordinate for warping on death.
-#         DeathEvent  NPC event triggered when a player dies.
-#         QuitEvent   NPC event triggered when a player quits.
-#         ActiveEvent NPC event triggered when a player joints an active battleground.
-#         Variable    Name of BG ID variable used in the battleground script.
-###########################################################################
-
-Header:
-  Type: BATTLEGROUND_DB
-  Version: 1

db/import-tmpl/instance_db.txt

@@ -0,0 +1,6 @@
+// Instance Database
+//
+// Structure of Database:
+// ID,Name,LimitTime,IdleTimeOut,EnterMap,EnterX,EnterY,Map2,Map3,...,Map255
+//
+// EnterMap is considered as Map1

db/import-tmpl/instance_db.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/>.
-#
-###########################################################################
-# Instance Database
-###########################################################################
-#
-# Instance Settings
-#
-###########################################################################
-# - Id                Instance ID.
-#   Name              Instance Name.
-#   TimeLimit         Total lifetime of instance in seconds. (Default: 3600)
-#   IdleTimeOut       Time before an idle instance is destroyed in seconds. (Default: 300)
-#   Destroyable       Toggles the ability to destroy the instance using instance 'Destroy' button. (Default: true)
-#                     Note: the button is displayed based on parties. For any mode, it requires the party leader to be the instance owner to destroy it.
-#   Enter:            Instance entrance coordinates.
-#     Map             Map Name where players start.
-#     X               X Coordinate where players start.
-#     Y               Y Coordinate where players start.
-#   AdditionalMaps:   List of maps that are part of an instance. (Optional)
-###########################################################################
-
-Header:
-  Type: INSTANCE_DB
-  Version: 1

db/import-tmpl/item_db.txt

@@ -26,7 +26,7 @@
 //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; },{},{}
+//5811,Santa_Beard,Santa Beard,4,20,,100,,5,,0,0xFFFFFFFF,63,2,1,,0,0,25,{ bonus2 bSubRace,RC_Brute,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; },{},{}

db/import-tmpl/magicmushroom_db.txt

@@ -0,0 +1,8 @@
+// Magic Mushroom Database
+// List of skills that are randomly used through Magic Mushroom status change.
+//
+// Structure of Database:
+// SkillID{,RemoveFlag}
+//
+// - To remove entry by importing, put 1 value on 'RemoveFlag'
+

db/import-tmpl/magicmushroom_db.yml

@@ -1,30 +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/>.
-#
-###########################################################################
-# Magic Mushroom Database
-###########################################################################
-#
-# Magic Mushroom Settings
-#
-###########################################################################
-# - Skill       Skill to be casted by Magic Mushroom.
-###########################################################################
-
-Header:
-  Type: MAGIC_MUSHROOM_DB
-  Version: 1

db/import-tmpl/mob_avail.txt

@@ -0,0 +1,16 @@
+// Mob Availability and Alias Database
+//
+// Structure of Database:
+// MobID,SpriteID{,Equipment}
+//
+// 01. MobID        Mob ID to change.
+// 02. SpriteID     Mob ID which will be sent to the client instead of MobID.
+//                  If 0, the mob becomes unavailable for use.
+// 03. Equipment    Item ID of pet equipment (must be available for pet counterpart, or this will cause problems).
+//
+// To disguise a mob as a player:
+// MobID,SpriteID,Sex,Hair_Style,Hair_Color,Weapon,Shield,Head_Top,Head_Middle,Head_Bottom,Option,Dye_Color
+//
+// SpriteID is a job class value.
+// Weapon and Shield uses Item ID, while Head uses View ID.
+

db/import-tmpl/mob_avail.yml

@@ -1,123 +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/>.
-#
-###########################################################################
-# Mob Availability and Alias Database
-###########################################################################
-#
-# Mob Availability and Alias Settings
-#
-###########################################################################
-# - Mob                     Mob to adjust.
-#   Sprite                  Sprite which will be sent to the client instead of Mob.
-#   Sex                     Sex (if Sprite is a player). (Default: Female)
-#   HairStyle               Hair Style ID (if Sprite is a player). (Default: 0)
-#   HairColor               Hair Color ID (if Sprite is a player). (Default: 0)
-#   ClothColor              Cloth Color ID (if Sprite is a player). (Default: 0)
-#   Weapon                  Item name of weapon (if Sprite is a player). (Default: 0)
-#   Shield                  Item name of shield (if Sprite is a player). (Default: 0)
-#   HeadTop                 Item name of headgear (if Sprite is a player). (Default: 0)
-#   HeadMid                 Item name of headgear (if Sprite is a player). (Default: 0)
-#   HeadLow                 Item name of headgear (if Sprite is a player). (Default: 0)
-#   PetEquip                Item name of pet equipment (if Mob is a valid pet). (Default: 0)
-#   Options:                Set an option for an object. (Optional)
-#     <Option>: bool
-###########################################################################
-
-Header:
-  Type: MOB_AVAIL_DB
-  Version: 1
-
-#Body:
-  # Examples
-#  - Mob: PORING
-#    Sprite: BAPHOMET
-#  - Mob: E_OBEAUNE
-#    Sprite: PORING
-#    PetEquip: Backpack
-
-  # Easter Event Monsters
-#  - Mob: MOROCC_3
-#    Sprite: DOPPELGANGER
-#  - Mob: MOROCC_4
-#    Sprite: ECLIPSE
-
-  # rAthena Dev Team
-  # Valaris
-#  - Mob: BOW_GUARDIAN_
-#    Sprite: JOB_ASSASSIN_CROSS
-#    Sex: Male
-#    HairStyle: 1
-#    HairColor: 1
-#    ClothColor: 1
-#    Weapon: Jamadhar
-#    HeadTop: Sahkkat
-#    HeadMid: Sunglasses
-#    HeadLow: Cigar
-#    Options:
-#      Falcon: true
-  # Valaris Worshiper
-#  - Mob: E_CONDOR
-#    Sprite: JOB_THIEF
-#    Sex: Male
-#    HairStyle: 1
-#    HairColor: 1
-#    ClothColor: 1
-#    Weapon: Gladius
-#    Shield: Guard
-#    HeadTop: Sahkkat
-#    HeadMid: Sunglasses
-#    HeadLow: Cigar
-  # MC Cameri
-#  - Mob: E_TREASURE1
-#    Sprite: JOB_CRUSADER
-#    Sex: Male
-#    HairStyle: 6
-#    HairColor: 6
-#    ClothColor: 3
-#    Weapon: Sword
-#    Shield: Shield
-#    Options:
-#      Riding: true
-  # Poki#3
-#  - Mob: E_TREASURE2
-#    Sprite: JOB_SNIPER
-#    Sex: Male
-#    HairStyle: 21
-#    Weapon: Bow_Of_Rudra
-#    HeadTop: Boy's_Cap
-#    HeadMid: Takius_Blindfold
-#    HeadLow: Centimental_Leaf
-#    Options:
-#      Falcon: true
-  # Sentry
-#  - Mob: BOMBPORING
-#    Sprite: KNIGHT_GUARDIAN
-
-  # iRO Halloween Event 2009
-#  - Mob: EP14_MORS_BOSSB
-#    Sprite: ZOMBIE
-#  - Mob: EP14_MORS_MOB1
-#    Sprite: GHOUL
-#  - Mob: EP14_MORS_MOB2
-#    Sprite: ZOMBIE_MASTER
-
-  # iRO Halloween Event 2009
-#  - Mob: EP14_3_DEATH_B_MOB2
-#    Sprite: WHISPER
-#  - Mob: EP14_3_DEATH_B_MOB3
-#    Sprite: DARK_LORD

db/import-tmpl/quest_db.txt

@@ -0,0 +1,7 @@
+// Quest Database
+//
+// Structure of Database:
+// Quest ID,Time Limit,Target1,Val1,Target2,Val2,Target3,Val3,MobID1,NameID1,Rate1,MobID2,NameID2,Rate2,MobID3,NameID3,Rate3,Quest Title
+//
+// The MobID*, NameID*, and Rate* reflect special values for quests that can drop an item at given rate from given mob.
+// If no MobID* is given, then any mob has a chance to drop the given ItemID*.

db/import-tmpl/quest_db.yml

@@ -1,44 +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/>.
-#
-###########################################################################
-# Quest Database
-###########################################################################
-#
-# Quest Settings
-#
-###########################################################################
-# - Id              Quest ID.
-#   Title           Quest title.
-#   TimeLimit       Amount of time before the quest expires. (Default: 0)
-#                   Use a number following by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-#                   Specify with "+" for how long until the quest expires.
-#                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
-#                   Please note the number before "d" only shift the exact timer to the given day(s).
-#   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
-#   Drops:          Quest item drop targets. (Default: null)
-#     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
-#       Item        Item to drop.
-#       Count       Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
-#       Rate        Item drop rate. (10000 = 100%)
-###########################################################################
-
-Header:
-  Type: QUEST_DB
-  Version: 1

db/import-tmpl/size_fix.txt

@@ -0,0 +1,7 @@
+// Size Fix Tables
+// Contains size fixes for weapon damage.
+//
+// Struture of Database:
+// Columns - Weapon type
+// Rows    - Target size
+

db/import-tmpl/size_fix.yml

@@ -1,33 +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/>.
-#
-###########################################################################
-# Size Fix Database
-###########################################################################
-#
-# Size Fix Settings
-#
-###########################################################################
-# - Weapon    Weapon type.
-#   Small     Small size modifier. (Default: 100)
-#   Medium    Medium size modifier. (Default: 100)
-#   Large     Large size modifier. (Default: 100)
-###########################################################################
-
-Header:
-  Type: SIZE_FIX_DB
-  Version: 1

db/import-tmpl/skill_cast_db.txt

@@ -0,0 +1,18 @@
+// Skill Times Database
+//
+// Structure of Database:
+// SkillID,CastingTime,AfterCastActDelay,AfterCastWalkDelay,Duration1,Duration2,Cool Down,Fixed Casting Time
+//
+// CastingTime: time to cast this skill, in miliseconds
+// AfterCastActDelay: "normal" delay, character cannot use skills, in miliseconds
+// AfterCastWalkDleay: amount of time before character can move again, in miliseconds
+// Duration1/Duration2: usually the durations used by the skill, at special cases it is used to hold special data
+// Cool Down: amount of time until character can re-use this skill, in miliseconds
+// Fixed Casting Time: the skills fixed casting time (when 0, uses 20% of cast time and less than 0 means no fixed cast time)
+//
+// On all fields you can use ':' as a delimiter for level-specific values.
+// For example:
+// - Original: 6,0,0,0,30000,0,1000
+// - Modified: 6,0,0,0,30000,0,1000:2500:3000:...
+// Gives Level 1 1000ms cool down, Level 2 2500ms, Level 3 3000ms, and so on.
+

db/import-tmpl/skill_castnodex_db.txt

@@ -0,0 +1,16 @@
+// <Skill id>,<Cast>,<Delay (optional)>
+//
+// Cast:  0 - everything affects the skill's cast time
+//        1 - skill's cast time is not affected by dex
+//        2 - skill's cast time is not affected by statuses (Suffragium, etc)
+//        4 - skill's cast time is not affected by item bonuses (equip, cards)
+//
+// Delay: 0 - everything affects the skill's delay
+//        1 - skill's delay is not affected by dex
+//        2 - skill's delay is not affected by Magic Strings / Bragi
+//        4 - skill's delay is not affected by item bonuses (equip, cards)
+//
+// Note: Values are bit fields, add them up to combine their effects.
+// Note: Delay setting '1' only makes sense when delay_dependon_dex is enabled.
+// Example: 46,1,1 = Double Strafe's cast time and delay is not affected by dex.
+

db/import-tmpl/skill_copyable_db.txt

@@ -0,0 +1,52 @@
+// Copyable Skills Database
+// List of skills able to be copied by Intimidate/Plagiarism and Reproduce.
+//
+// Sources:
+// http://irowiki.org/wiki/Intimidate
+//    -> "Intimidate will copy any 2nd class skill"
+// http://irowiki.org/wiki/Reproduce/List_of_reproducible_skills
+//    -> "Players can reproduce 1-x, 2-x, and 3-x skills and Expanded Class,
+//        but cannot reproduce transcendent skills"
+//
+// Structure of Database:
+// SkillName,Option{,JobAllowed{,RequirementRemoved}}
+//
+// Option (bitmask) determines how a skill can be copied.
+//	1 = Plagiarism
+//	2 = Reproduce
+//
+// JobAllowed (bitmask) restricts copying the skill to certain classes.
+// By default, all jobs can copy the skill (0).
+//	 1 = Rogue
+//	 2 = Stalker
+//	 4 = Shadow Chaser
+//	 8 = Trans. Shadow Chaser
+//	16 = Baby Rouge
+//	32 = Baby Shadow Chaser
+//	
+// RequirementRemoved (bitmask) removes requirements when casting a copied skill.
+// See 'skill_require_db.txt' for specific skill requirements.
+//	   0 = uses original requirement(s)
+//	   1 = hp
+//	   2 = maxhptrigger
+//	   4 = sp
+//	   8 = hprate
+//	  16 = sprate
+//	  32 = zeny
+//	  64 = weapon type
+//	 128 = ammo (with the amount)
+//	 256 = state
+//	 512 = statuses
+//	1024 = spirit sphere
+//	2048 = items (with the amount)
+//	4096 = equipments
+//
+// Examples:
+// AS_SONICBLOW,2,63,64
+//	Sonic Blow can be copied by all jobs with only Plagiarism.
+//	To use the copied skill, a Katar is not needed (a Sonic Blow weapon type requirement).
+//
+// CR_ACIDDEMONSTRATION,3,10
+//	Acid Demonstration can only be copied by Stalker/Trans. Shadow Chaser with Plagiarism or Reproduce.
+//	This mode simulates the previous battle config, which allowed only Trans. classes to copy Trans. skills.
+

db/import-tmpl/skill_damage_db.txt

@@ -4,12 +4,12 @@
 // SkillName,Caster,Map,Damage against Players{,Damage against Mobs{,Damage against Bosses{,Damage against Other}}}
 //
 // Caster: The groups for which the adjustment takes effect. (bitmask)
-//		BL_PC = Player
-//		BL_MOB = Monster
-//		BL_PET = Pet
-//		BL_HOM = Homunculus
-//		BL_MER = Mercenary
-//		BL_ELEM = Elemental
+//		 1 = Player
+//		 2 = Monster
+//		 4 = Pet
+//		 8 = Homunculus
+//		16 = Mercenary
+//		32 = Elemental
 //
 // Map:
 // 		1    - Normal (the maps that aren't classified as these maps below)
@@ -31,7 +31,7 @@
 //  	Negative values decrease damage and positive values increase it (0 = no change).
 //
 // Examples:
-// MC_MAMMONITE,BL_PC,1,50 // In normal maps, players deal +50% damage to other players with Mammonite.
-// MO_EXTREMITYFIST,BL_PC,6,-50 // In PVP and GVG, players deal -50% (half) damage to other players with Asura Strike.
-// AB_ADORAMUS,BL_PC,6,50,0,10,15 // In PVP and GVG, players deal +50% damage to other players, +0% to mobs, +10% to bosses, and +15% to other with Adoramus.
+// MC_MAMMONITE,1,1,50 // In normal maps, players deal +50% damage to other players with Mammonite.
+// MO_EXTREMITYFIST,1,6,-50 // In PVP and GVG, players deal -50% (half) damage to other players with Asura Strike.
+// AB_ADORAMUS,1,6,50,0,10,15 // In PVP and GVG, players deal +50% damage to other players, +0% to mobs, +10% to bosses, and +15% to other with Adoramus.
 

db/import-tmpl/skill_db.txt

@@ -0,0 +1,79 @@
+//id,range,hit,inf,element,nk,splash,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,inf3,name,description
+// 01 ID
+// 02 range (combo skills do not check for range when used,
+//           if range is < 5, the skill is considered melee-range)
+// 03 hit (8- repeated hitting, 6- single-hit)
+// 04 inf (0- passive, 1- enemy, 2- place, 4- self, 16- friend, 32- trap)
+// 05 element (0 - neutral, 1 - water, 2 - earth, 3 - fire, 4 - wind, 5 - poison,
+//             6 - holy, 7 - dark, 8 - ghost, 9 - undead, -1 - use weapon element
+//             -2 - use endowed element, -3 - use random element.)
+// 06 nk (skill damage properties):
+//    0x01 - No damage skill
+//    0x02 - Has splash area
+//    0x04 - Damage should be split among targets
+//    0x08 - Skill ignores caster's % damage cards (misc type always ignores)
+//    0x10 - Skill ignores elemental adjustments
+//    0x20 - Skill ignores target's defense (misc type always ignores)
+//    0x40 - Skill ignores target's flee (magic type always ignores)
+//    0x80 - Skill ignores target's def cards
+// 07 splash/effect range
+//      -1 - for screen-wide
+//       0 - no splash
+//      all other values follow the formula: value * 2 + 1
+//       1 - 3x3
+//       2 - 5x5
+//       3 - 7x7
+// 08 MaxLv
+// 09 Number of hits (when positive, damage is increased by hits, 
+//    negative values just show number of hits without increasing total damage)
+// 10 Cast interrupted when hit?
+// 11 defense-reduction rate during cast.
+// 12 inf2 (skill information 2):
+//    0x00001 - quest skill
+//    0x00002 - npc skill
+//    0x00004 - wedding skill
+//    0x00008 - spirit skill
+//    0x00010 - guild skill
+//    0x00020 - song/dance
+//    0x00040 - ensemble skill
+//    0x00080 - trap
+//    0x00100 - skill that damages/targets yourself
+//    0x00200 - cannot be casted on self (if inf = 4, auto-select target skill)
+//    0x00400 - usable only on party-members (and enemies if skill is offensive)
+//    0x00800 - usable only on guild-mates (and enemies if skill is offensive)
+//    0x01000 - disable usage on enemies (for non-offensive skills).
+//    0x02000 - available skill for SC_AUTOSHADOWSPELL
+//    0x04000 - chorus skill
+//    0x08000 - skill that ignore bg reduction
+//    0x10000 - skill that ignore gvg reduction
+//    0x20000 - makes 'self'/'place' skill cannot be casted/placed when near NPC (see 'db/skill_nonearnpc_db.txt' for more options)
+//    0x40000 - skill that can hit trap-type skill (inf2 has 0x00080)
+// 13 maxcount: max amount of skill instances to place on the ground when
+//    player_land_skill_limit/monster_land_skill_limit is enabled. For skills
+//    that attack using a path, this is the path length to be used.
+// 14 attack type (none, weapon, magic, misc)
+// 15 Blowcount (amount of tiles skill knockbacks)
+// 16 inf3 (skill information 3):
+//    0x00001 - skill ignores land protector
+//    0x00002 - free
+//    0x00004 - usable skills while hiding
+//    0x00008 - skill that can be use while in dancing state
+//    0x00010 - skill that could hit emperium
+//    0x00020 - skill ignores SC_STASIS
+//    0x00040 - skill blocked by kagehumi
+//    0x00080 - skill range affected by AC_VULTURE
+//    0x00100 - skill range affected by GS_SNAKEEYE
+//    0x00200 - skill range affected by NJ_SHADOWJUMP
+//    0x00400 - skill range affected by WL_RADIUS
+//    0x00800 - skill range affected by RA_RESEARCHTRAP
+//    0x01000 - skill that does not affect user that has NC_HOVERING active
+//    0x02000 - skill that can be using while riding warg
+//    0x04000 - skill that can be used while on Madogear
+//    0x08000 - skill that can be used to target while under SC__MANHOLE effect
+//    0x10000 - skill that affects hidden targets
+//    0x20000 - skill that affects SC_GLOOMYDAY_SK
+//    0x40000 - skill that is affected by SC_DANCEWITHWUG
+//    0x80000 - skill blocked by RA_WUGBITE
+// 17 Name
+// 18 Description
+

db/import-tmpl/skill_db.yml

@@ -1,132 +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/>.
-#
-###########################################################################
-# Skill Database
-###########################################################################
-#
-# Skill Settings
-#
-###########################################################################
-# - Id                        Unique skill ID.
-#   Name                      Skill Aegis name.
-#   Description               Skill description.
-#   MaxLevel                  Max skill level.
-#   Type                      Skill type. (Default: None)
-#   TargetType                Skill target type. (Default: Passive)
-#   DamageFlags:              Skill damage properties.
-#   Flags:                    Skill information flags.
-#   Range:                    Skill range. (Default: 0)
-#     - Level                 Skill level.
-#       Size                  Range at specific skill level.
-#   Hit                       Skill hit type. (Default: Normal)
-#   HitCount:                 Skill hit count. (Default: 0)
-#     - Level                 Skill level.
-#       Count                 Number of hits at specific skill level.
-#   Element:                  Skill element. (Default: Neutral)
-#     - Level                 Skill level.
-#       Element               Element at specific skill level.
-#   SplashArea:               Skill splash area of effect. (Default: 0)
-#     - Level                 Skill level.
-#       Area                  Splash area at specific skill level.
-#   ActiveInstance:           Maximum amount of active skill instances that can be on the ground. (Default: 0)
-#     - Level                 Skill level.
-#       Max                   Active instances at specific skill level.
-#   Knockback:                Amount of tiles the skill knockbacks. (Default: 0)
-#     - Level                 Skill level.
-#       Amount                Knockback count at specific skill level.
-#   CopyFlags:                Determines if the skill is copyable. (Optional)
-#     Skill:                  Type of skill that can copy.
-#     RemoveRequirement:      Remove a requirement type. (Optional)
-#   NoNearNPC:                Determines if the skill can be used near a NPC. (Optional)
-#     AdditionalRange         Number of cells from an NPC where the skill can be cast. (Optional)
-#     Type:                   Type of NPC.
-#   CastCancel                Cancel cast when hit. (Default: true)
-#   CastDefenseReduction      Defense reduction rate during skill cast. (Default: 0)
-#   CastTime:                 Time to cast the skill in milliseconds. (Default: 0)
-#     - Level                 Skill level.
-#       Time                  Cast time at specific skill level in milliseconds.
-#   AfterCastActDelay:        Time the character cannot use skills in milliseconds. (Default: 0)
-#     - Level                 Skill level.
-#       Time                  After cast action delay at specific skill level in milliseconds.
-#   AfterCastWalkDelay:       Time before the character can move again in milliseconds. (Default: 0)
-#     - Level                 Skill level.
-#       Time                  After cast walk delay at specific skill level in milliseconds.
-#   Duration1:                Duration of the skill in milliseconds. (Default: 0)
-#     - Level                 Skill level.
-#       Time                  Skill duration at specific skill level in milliseconds.
-#   Duration2:                Duration of the skill in milliseconds. (Default: 0)
-#     - Level                 Skill level.
-#       Time                  Skill duration at specific skill level in milliseconds.
-#   Cooldown:                 Time before the character can use the same skill again in milliseconds. (Default: 0)
-#     - Level                 Skill level.
-#       Time                  Cooldown at specific skill level in milliseconds.
-#   FixedCastTime:            Time that is fixed during cast of the skill in milliseconds. (Default: 0)
-#     - Level                 Skill level.
-#       Time                  After cast action delay at specific skill level in milliseconds.
-#   CastTimeFlags:            Effects of the skill's cast time. (Optional)
-#   CastDelayFlags:           Effects of the skill's delay. (Optional)
-#   Requires:                 List of requirements to cast the skill. (Optional)
-#     HpCost:                 HP required to cast. (Default: 0)
-#       - Level               Skill level.
-#         Amount              HP required at specific skill level.
-#     SpCost:                 SP required to cast. (Default: 0)
-#       - Level               Skill level.
-#         Amount              SP required at specific skill level.
-#     HpRateCost:             HP rate required to cast. If positive, uses current HP, else uses Max HP. (Default: 0)
-#       - Level               Skill level.
-#         Amount              HP rate required at specific skill level.
-#     SpRateCost:             SP rate required to cast. If positive, uses current SP, else uses Max SP. (Default: 0)
-#       - Level               Skill level.
-#         Amount              SP rate required at specific skill level.
-#     MaxHpTrigger:           Maximum amount of HP to cast the skill. (Default: 0)
-#       - Level               Skill level.
-#         Amount              Maximum HP trigger required at specific skill level.
-#     ZenyCost:               Zeny required to cast. (Default: 0)
-#       - Level               Skill level.
-#         Amount              Zeny required at specific skill level.
-#     Weapon:                 Weapon required to cast. (Default: All)
-#     Ammo:                   Ammo required to cast. (Default: None)
-#     AmmoAmount:             Ammo amount required to cast. (Default: 0)
-#       - Level               Skill level.
-#         Amount              Ammo amount required at specific skill level.
-#     State                   Special state required to cast. (Default: None)
-#     Status:                 Status change required to cast. (Default: nullptr)
-#     SphereCost:             Spirit sphere required to cast. (Default: 0)
-#       - Level               Skill level.
-#         Amount              Spirit sphere required at specific skill level.
-#     ItemCost:               Item required to cast. (Default: 0)
-#       - Item                Item name.
-#         Amount              Item amount.
-#     Equipment:              Equipped item required to cast. (Default: nullptr)
-#   Unit:                     Skill unit values. (Optional)
-#     Id                      Skill unit ID.
-#     AlternateId:            Alternate skill unit ID. (Default: 0)
-#     Layout:                 Skill unit layout. (Default: 0)
-#       - Level               Skill level.
-#         Size                Unit layout at specific skill level.
-#     Range:                  Skill unit range. (Default: 0)
-#       - Level               Skill level.
-#         Size                Unit range at specific skill level.
-#     Interval                Skill unit interval in milliseconds. (Default: 0)
-#     Target                  Skill unit target type. (Default: All)
-#     Flag:                   Skill unit flags. (Default: None)
-###########################################################################
-
-Header:
-  Type: SKILL_DB
-  Version: 1

db/import-tmpl/skill_improvise_db.txt

@@ -0,0 +1,8 @@
+// Improvise Database
+// Database for skills that can be summoned trough Randomize Spell/Improvised Song (Minstrel/Wanderer Skill).
+//
+// Structure of Database:
+// SkillID,Rate
+//
+// - To remove entry by importing, put 0 on 'Rate'
+

db/import-tmpl/skill_nonearnpc_db.txt

@@ -0,0 +1,28 @@
+// Skill Distance-to-NPC Database
+// Prevents skills from being used near NPC types using INF2_NO_NEARNPC.
+//
+// Structure of Database:
+// SkillName,AdditionalRange{,NPC Type}
+//
+// AdditionalRange:
+//	Number of cells from an NPC where the skill can be cast.
+//	If zero, this will read the splash range value from skill_db;
+//	if that is also zero, range+layout's range from skill_unit_db will be used.
+//
+// NPC Type (bitmask):
+//	1 = warp portal, 2 = shop NPC, 4 = normal NPC script, 8 = tomb
+//
+// Examples:
+// MG_SAFETYWALL,2
+//	Safety Wall can't be placed within 2 ground cells of an NPC.
+//	(MG_SAFETYWALL doesn't have splash, layout range, and range value,
+//	so we must add the 'additional_range', or it will be pointless.)
+//
+// GS_DESPERADO,2
+//	Desperado can't be casted if the caster is standing within 5 cells of an NPC.
+//	(Why? GS_DESPERADO has 3 cells of splash range +2 'additional_range' here.)
+//
+// SC_CHAOSPANIC,0,1
+//	Chaos Panic can't be placed within 2 ground cells of a warp portal.
+//	(Because SC_CHAOSPANIC doesn't have splash range, it uses layout range.)
+

db/import-tmpl/skill_require_db.txt

@@ -0,0 +1,33 @@
+// Skill Requirements Database
+//
+// Structure of Database:
+// SkillID,HPCost,MaxHPTrigger,SPCost,HPRateCost,SPRateCost,ZenyCost,RequiredWeapons,RequiredAmmoTypes,RequiredAmmoAmount,RequiredState,RequiredStatuses,SpiritSphereCost,RequiredItemID1,RequiredItemAmount1,RequiredItemID2,RequiredItemAmount2,RequiredItemID3,RequiredItemAmount3,RequiredItemID4,RequiredItemAmount4,RequiredItemID5,RequiredItemAmount5,RequiredItemID6,RequiredItemAmount6,RequiredItemID7,RequiredItemAmount7,RequiredItemID8,RequiredItemAmount8,RequiredItemID9,RequiredItemAmount9,RequiredItemID10,RequiredItemAmount10,RequiredEquipment
+//
+// If HP/SPratecost is positive, it is a percent of your current life, otherwise it is a percent of your max life.
+//
+// Legend for 'RequiredState' field:
+//  none = Nothing special
+//  hidden = Requires on hidden status by using Hiding, Cloaking, or maybe Chasewalk
+//  riding = Requires to ride either a peco or a dragon
+//  falcon = Requires a Falcon
+//  cart = Requires a Pushcart (for renewal can replace this state by SC_PUSH_CART in 'RequiredStatuses' field)
+//  shield = Requires a 0,shield equipped
+//  recover_weight_rate = Requires to be less than 50% weight
+//  move_enable = Requires to be able to move
+//  water = Requires to be standing on a water cell
+//  dragon = Requires to ride a Dragon
+//  warg = Requires a Warg
+//  ridingwarg = Requires to ride a Warg
+//  mado = Requires to have an active mado
+//  elementalspirit = Requires to have an Elemental Spirit summoned.
+//  peco = Requires riding a peco
+//
+// 'RequiredStatuses'
+//	Fill the value only with SC_STATUS (see db/const.txt for more details)
+//	Usage for multiple status requirements: SC_STATUS1:SC_STATUS2:SC_STATUS3
+//	Max. multiple value is 3 (skill.h: MAX_SKILL_STATUS_REQUIRE)
+//	Use any number or SC_ALL will disable status requirements
+// 'RequiredEquipment'
+//	Specified equipment to be equipped. For multiple values, use : as delimiter.
+//	Max. multiple value is 10 (skill.h: MAX_SKILL_EQUIP_REQUIRE)
+

db/import-tmpl/skill_unit_db.txt

@@ -0,0 +1,29 @@
+// Skill Unit Database
+//
+// Structure of Database:
+// ID,unit ID,unit ID 2,layout,range,interval,target,flag
+//
+// layout = -1:special, 0:1*1, 1:3*3, 2:5*5, up to 5:11*11
+// target = friend (party +guildmates +neutral players) / party / guild
+//          ally (party +guildmates) / all / enemy
+// flag 0x0001(UF_DEFNOTENEMY)		If 'defunit_not_enemy' is set, the target is changed to 'friend'
+//      0x0002(UF_NOREITERRATION)	Spell cannot be stacked
+//      0x0004(UF_NOFOOTSET)		Spell cannot be cast near/on targets
+//      0x0008(UF_NOOVERLAP)		Spell effects do not overlap
+//      0x0010(UF_PATHCHECK)		Only cells with a shootable path will be placed
+//      0x0020(UF_NOPC)				Spell cannot affect players.
+//      0x0040(UF_NOMOB)			Spell cannot affect mobs.
+//      0x0080(UF_SKILL)			Spell CAN affect skills.
+//      0x0100(UF_DANCE)			Dance skill
+//      0x0200(UF_ENSEMBLE)			Ensemble skill
+//      0x0400(UF_SONG)				Song skill
+//      0x0800(UF_DUALMODE)			Spell has effects both at an interval and when you step in/out
+//      0x2000(UF_RANGEDSINGLEUNIT)	Layout hack, use layout range propriety but only display center.
+// 	Example: 0x006 = 0x002+0x004 -> Cannot be stacked nor cast near targets
+//
+// Notes:
+//    0x89,0x8a,0x8b without indication
+//
+//    u1   u2 lay  r intr target  flag
+//
+

db/import-tmpl/spellbook_db.txt

@@ -0,0 +1,9 @@
+// Reading Spellbook Preserve Points Database
+//
+// Structure of Database:
+// SkillID,PreservePoints,Required Book
+//
+// NOTE:
+// - To add more entries, increase MAX_SKILL_SPELLBOOK_DB in skill.h.
+// - To remove entry by importing, put 0 for 'PreservePoints'
+

db/import-tmpl/spellbook_db.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/>.
-#
-###########################################################################
-# Reading Spellbook Database
-###########################################################################
-#
-# Reading Spellbook Settings
-#
-###########################################################################
-# - Skill             Skill that is usable through a Spellbook.
-#   Book              Book item required to cast skill.
-#   PreservePoints    Amount of points required to preserve the skill into the book.
-###########################################################################
-
-Header:
-  Type: READING_SPELLBOOK_DB
-  Version: 1

db/instance_db.yml

@@ -1,48 +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/>.
-#
-###########################################################################
-# Instance Database
-###########################################################################
-#
-# Instance Settings
-#
-###########################################################################
-# - Id                Instance ID.
-#   Name              Instance Name.
-#   TimeLimit         Total lifetime of instance in seconds. (Default: 3600)
-#   IdleTimeOut       Time before an idle instance is destroyed in seconds. (Default: 300)
-#   Destroyable       Toggles the ability to destroy the instance using instance 'Destroy' button. (Default: true)
-#                     Note: the button is displayed based on parties. For any mode, it requires the party leader to be the instance owner to destroy it.
-#   Enter:            Instance entrance coordinates.
-#     Map             Map Name where players start.
-#     X               X Coordinate where players start.
-#     Y               Y Coordinate where players start.
-#   AdditionalMaps:   List of maps that are part of an instance. (Optional)
-###########################################################################
-
-Header:
-  Type: INSTANCE_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/instance_db.yml
-    Mode: Prerenewal
-  - Path: db/re/instance_db.yml
-    Mode: Renewal
-  - Path: db/import/instance_db.yml

db/item_avail.txt

@@ -11,7 +11,7 @@
 // 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!
 
-//2240,2241 //Beard - Grampa Beard
+2240,2241 //Beard - Grampa Beard
 
 //Treasure Hunters Quest Items
 //use these aliases if your game client doesn't support them normally

db/job_db2.txt

@@ -280,9 +280,9 @@
 // Baby Mechanic (Mado)
 4112,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0,6,1,5,0,4,3,2,0,5,1
 // Super Novice (Expanded)
-4190,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,4,5,0
+4190,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0
 // Super Baby (Expanded)
-4191,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,4,5,0
+4191,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0
 // Kagerou
 4211,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
 // Oboro
@@ -312,15 +312,18 @@
 // Baby Star Gladiator (Union)
 4238,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2
 //================================
+// Note: Star Emperor and Soul Reaper bonus stats are unknown. Using Star Gladiator and Soul Linker's
+// bonus stats for now until I know the official ones.
+//
 // Star Emperor
-4239,1,5,0,0,2,0,4,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,1,3,4,0,5,0,2,5,1,0,0,5,2,6,3,5,1,0,2,3,1,0,5,0,2,1,0,5,0,0,0,0,0,1,0,0,2,0
+4239,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2
 // Soul Reaper
-4240,4,5,0,0,4,3,5,0,0,0,5,4,2,0,5,4,3,0,1,5,2,0,0,3,4,5,0,1,2,5,4,0,0,5,2,0,3,5,4,0,2,3,1,4,5,0,2,0,4,5,0,2,0,4,0,0,0,0,4,0
+4240,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5
 // Baby Star Emperor
-4241,1,5,0,0,2,0,4,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,1,3,4,0,5,0,2,5,1,0,0,5,2,6,3,5,1,0,2,3,1,0,5,0,2,1,0,5,0,0,0,0,0,1,0,0,2,0
+4241,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2
 // Baby Soul Reaper
-4242,4,5,0,0,4,3,5,0,0,0,5,4,2,0,5,4,3,0,1,5,2,0,0,3,4,5,0,1,2,5,4,0,0,5,2,0,3,5,4,0,2,3,1,4,5,0,2,0,4,5,0,2,0,4,0,0,0,0,4,0
+4242,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5
 // Star Emperor (Union)
-4243,1,5,0,0,2,0,4,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,1,3,4,0,5,0,2,5,1,0,0,5,2,6,3,5,1,0,2,3,1,0,5,0,2,1,0,5,0,0,0,0,0,1,0,0,2,0
+4243,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2
 // Baby Star Emperor (Union)
-4244,1,5,0,0,2,0,4,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,1,3,4,0,5,0,2,5,1,0,0,5,2,6,3,5,1,0,2,3,1,0,5,0,2,1,0,5,0,0,0,0,0,1,0,0,2,0
+4244,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2

db/magicmushroom_db.txt

@@ -0,0 +1,31 @@
+// Magic Mushroom Database
+// List of skills that are randomly used through Magic Mushroom status change.
+//
+// Structure of Database:
+// SkillID{,RemoveFlag}
+//
+// - To remove entry by importing, put 1 value on 'RemoveFlag'
+
+7	//SM_MAGNUM
+8	//SM_ENDURE
+10	//MG_SIGHT
+24	//AL_RUWACH
+32	//AL_CRUCIS
+33	//AL_ANGELUS
+45	//AC_CONCENTRATION
+61	//KN_AUTOCOUNTER
+74	//PR_MAGNIFICAT
+110	//BS_HAMMERFALL
+114	//BS_MAXIMIZE
+142	//NV_FIRSTAID
+150	//TF_BACKSLIDING
+151	//TF_PICKSTONE
+157	//MG_ENERGYCOAT
+249	//CR_AUTOGUARD
+256	//CR_PROVIDENCE
+261	//MO_CALLSPIRITS
+270	//MO_EXPLOSIONSPIRITS
+326	//DC_SCREAM
+500	//GS_GLITTERING
+527	//NJ_TATAMIGAESHI
+531	//NJ_UTSUSEMI

db/magicmushroom_db.yml

@@ -1,36 +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/>.
-#
-###########################################################################
-# Magic Mushroom Database
-###########################################################################
-#
-# Magic Mushroom Settings
-#
-###########################################################################
-# - Skill       Skill to be casted by Magic Mushroom.
-###########################################################################
-
-Header:
-  Type: MAGIC_MUSHROOM_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/re/magicmushroom_db.yml
-    Mode: Renewal
-  - Path: db/import/magicmushroom_db.yml

db/mob_avail.txt

@@ -0,0 +1,44 @@
+// Mob Availability and Alias Database
+//
+// Structure of Database:
+// MobID,SpriteID{,Equipment}
+//
+// 01. MobID        Mob ID to change.
+// 02. SpriteID     Mob ID which will be sent to the client instead of MobID.
+//                  If 0, the mob becomes unavailable for use.
+// 03. Equipment    Item ID of pet equipment (must be available for pet counterpart, or this will cause problems).
+//
+// To disguise a mob as a player:
+// MobID,SpriteID,Sex,Hair_Style,Hair_Color,Weapon,Shield,Head_Top,Head_Middle,Head_Bottom,Option,Dye_Color
+//
+// SpriteID is a job class value.
+// Weapon and Shield uses Item ID, while Head uses View ID.
+// Option for carts only works if you compiled your server for a packet version before 2012-02-01
+
+//1002,1039		// Poring - Baphomet
+//1970,1002,10013	// Displays a Poring with a backpack
+
+// Easter Event Monsters
+//1920,1047,0
+//1921,1093,0
+
+// rAthena Dev Team
+// Valaris
+//1900,4013,1,1,1,1254,0,67,12,54,16,1
+// Valaris Worshiper
+//1901,6,1,1,1,1219,2101,67,12,54,0,1
+// MC Cameri
+//1902,14,1,6,6,1101,2105,0,0,0,32,3
+// Poki#3
+//1903,4012,1,21,0,1720,0,102,184,57,16,0
+// Sentry
+//1904,1286,0
+
+// iRO Halloween Event 2008
+//3000,1015,0
+//3001,1036,0
+//3002,1298,0
+
+// iRO Halloween Event 2009
+//3014,1179,0
+//3015,1272,0

db/mob_chat_db.txt

@@ -19,7 +19,7 @@
 14#0xFF0000#This is how you attack? Watch and learn, weaklings!
 15#0xFF0000#It's time to finish the game!
 16#0xFF0000#Oh, you're stronger than I thought!
-17#0xFF0000#No, this can't be happening! I'm Satan Morocc, Demon King of Destruction!
+17#0xFF0000#No, this can't be happening! I'm Satan Morroc, Demon King of Destruction!
 18#0xFF0000#I can never die! I'll be coming back for you!
 19#0xFF0000#I was born to conquer this world! None shall stop me!
 20#0xFF0000#Your days are numbered!

db/pre-re/abra_db.yml

@@ -1,57 +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/>.
-#
-###########################################################################
-# Abracadabra Database
-###########################################################################
-#
-# Abracadabra Settings
-#
-###########################################################################
-# - Skill             Skill to be casted by Abracadabra.
-#   Probability:      Probability of skill compared to others in database (1 = 0.01%, 10000 = 100%). (Default: 500)
-#     - Level         Skill level.
-#       Probability   Probability at specific skill level (1 = 0.01%, 10000 = 100%). (Default: 0)
-###########################################################################
-
-Header:
-  Type: ABRA_DB
-  Version: 1
-
-Body:
-  - Skill: SA_TAMINGMONSTER
-    Probability:
-      - Level: 1
-        Probability: 50
-      - Level: 2
-        Probability: 100
-      - Level: 3
-        Probability: 150
-      - Level: 4
-        Probability: 200
-      - Level: 5
-        Probability: 250
-      - Level: 6
-        Probability: 300
-      - Level: 7
-        Probability: 350
-      - Level: 8
-        Probability: 400
-      - Level: 9
-        Probability: 450
-      - Level: 10
-        Probability: 500

db/pre-re/achievement_db.yml

@@ -452,7 +452,7 @@ Body:
     Score: 10
   - ID: 120061
     Group: "AG_ADVENTURE"
-    Name: "Juno Field Exploration"
+    Name: "Yuno Field Exploration"
     #Reward:
     #  ItemID: 22876
     Score: 10
@@ -704,7 +704,7 @@ Body:
     Score: 10
   - ID: 120103
     Group: "AG_ADVENTURE"
-    Name: "Kunlun Field Exploration"
+    Name: "Gonryun Field Exploration"
     #Reward:
     #  ItemID: 22876
     Score: 10
@@ -890,7 +890,7 @@ Body:
     Score: 20
   - ID: 120134
     Group: "AG_ADVENTURE"
-    Name: "Kunlun Dungeon Exploration"
+    Name: "Gonryun Dungeon Exploration"
     #Reward:
     #  ItemID: 22876
     Score: 20
@@ -1000,7 +1000,7 @@ Body:
     Score: 10
   - ID: 127005
     Group: "AG_CHATTING"
-    Name: "Juno Contribution"
+    Name: "Yuno Contribution"
     Map: "yuno"
     Target:
       - Id: 0
@@ -1564,7 +1564,7 @@ Body:
     Score: 20
   - ID: 129008
     Group: "AG_ADVENTURE"
-    Name: "Rune-Midgarts Explorer"
+    Name: "Rune Midgard Explorer"
     Dependent:
       - Id: 129001
       - Id: 129002
@@ -1578,7 +1578,7 @@ Body:
     Score: 50
   - ID: 129009
     Group: "AG_ADVENTURE"
-    Name: "Juno Explorer"
+    Name: "Yuno Explorer"
     Dependent:
       - Id: 120052
       - Id: 120053
@@ -1726,12 +1726,6 @@ Body:
     Reward:
       ItemID: 617
     Score: 50
-  - ID: 129021
-    Group: "AG_BATTLE"
-    Name: "Glastheim Challenge Mode" # Complete 100 times?
-    Reward:
-      TitleID: 1045
-    Score: 10
   - ID: 130000 # Talk to Prince NPC (npc/quests/quests_morocc.txt L5288)
     Group: "AG_CHATTING"
     Name: "Socialite debut"
@@ -1989,216 +1983,6 @@ Body:
     #Reward:
     #  ItemID: 23585
     Score: 10
-  - ID: 200033
-    Group: "AG_GOAL_LEVEL"
-    Name: "With a new mind!(1)"
-    Condition: " BaseLevel == 170 && (Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS_T) "
-    #Reward:
-    #  ItemID: 6959
-    Score: 50
-  - ID: 200034
-    Group: "AG_GOAL_LEVEL"
-    Name: "With a new mind!(2)"
-    Condition: " BaseLevel == 170 && (Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER_T) "
-    #Reward:
-    #  ItemID: 6959
-    Score: 50
-  - ID: 220000
-    Group: "AG_CHATTING_CREATE"
-    Name: "Community begin"
-    Score: 10
-  - ID: 220001
-    Group: "AG_CHATTING_DYING"
-    Name: "A mouth only moment"
-    Score: 10
-  - ID: 220002
-    Group: "AG_CHATTING_COUNT"
-    Name: "Admiring the chatter"
-    Condition: " ARG0 == 20 "
-    Score: 10
-  - ID: 220003
-    Group: "AG_ADD_FRIEND"
-    Name: "My friend's friend~"
-    Condition: " ARG0 >= 1 "
-    Score: 10
-  - ID: 220004
-    Group: "AG_ADD_FRIEND"
-    Name: "A competition of popularity"
-    Condition: " ARG0 >= 10 "
-    Score: 10
-  - ID: 220005
-    Group: "AG_PARTY"
-    Name: "Let's Party~"
-    Score: 10
-  - ID: 220006
-    Group: "AG_MARRY"
-    Name: "Married with who..?"
-    Reward:
-      TitleID: 1022
-    Score: 20
-  - ID: 220007
-    Group: "AG_BABY"
-    Name: "Can you grow?"
-    Condition: " ARG0 == 1 "
-    Reward:
-      TitleID: 1032
-    Score: 20
-  - ID: 220008
-    Group: "AG_BABY"
-    Name: "Being a parent"
-    Condition: " ARG0 == 2 "
-    Reward:
-      TitleID: 1033
-    Score: 20
-  - ID: 220009
-    Group: "AG_SPEND_ZENY"
-    Name: "Activating the market economy (1)"
-    Condition: " ARG0 >= 10000 "
-    Target:
-      - Id: 0
-        Count: 10000
-    Score: 10
-  - ID: 220010
-    Group: "AG_SPEND_ZENY"
-    Name: "Activating the market economy (2)"
-    Condition: " ARG0 >= 100000 "
-    Target:
-      - Id: 0
-        Count: 100000
-    Score: 15
-  - ID: 220011
-    Group: "AG_SPEND_ZENY"
-    Name: "Activating the market economy (3)"
-    Condition: " ARG0 >= 500000 "
-    Target:
-      - Id: 0
-        Count: 500000
-    Score: 20
-  - ID: 220012
-    Group: "AG_SPEND_ZENY"
-    Name: "Activating the market economy (4)"
-    Condition: " ARG0 >= 1000000 "
-    Target:
-      - Id: 0
-        Count: 1000000
-    Score: 30
-  - ID: 220013
-    Group: "AG_SPEND_ZENY"
-    Name: "Activating the market economy (5)"
-    Condition: " ARG0 >= 5000000 "
-    Target:
-      - Id: 0
-        Count: 5000000
-    Score: 50
-  - ID: 220014
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (1)"
-    Condition: " ARG0 == 1 && ARG1 >= 7 "
-    Score: 10
-  - ID: 220015
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (2)"
-    Condition: " ARG0 == 1 && ARG1 >= 12 "
-    Score: 15
-  - ID: 220016
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (3)"
-    Condition: " ARG0 == 2 && ARG1 >= 7 "
-    Score: 10
-  - ID: 220017
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (4)"
-    Condition: " ARG0 == 2 && ARG1 >= 12 "
-    Score: 15
-  - ID: 220018
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (5)"
-    Condition: " ARG0 == 3 && ARG1 >= 7 "
-    Score: 15
-  - ID: 220019
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (6)"
-    Condition: " ARG0 == 3 && ARG1 >= 12 "
-    Score: 20
-  - ID: 220020
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (7)"
-    Condition: " ARG0 == 4 && ARG1 >= 7 "
-    Score: 20
-  - ID: 220021
-    Group: "AG_ENCHANT_SUCCESS"
-    Name: "I can't quit from refining! (8)"
-    Condition: " ARG0 == 4 && ARG1 >= 12 "
-    Score: 30
-  - ID: 220022
-    Group: "AG_ENCHANT_FAIL"
-    Name: "Human's greed has no ending.."
-    Score: 10
-  - ID: 220023
-    Group: "AG_GET_ITEM"
-    Name: "I found it! (1)"
-    Condition: " ARG0 >= 100 "
-    Score: 10
-  - ID: 220024
-    Group: "AG_GET_ITEM"
-    Name: "I found it! (2)"
-    Condition: " ARG0 >= 1000 "
-    Score: 10
-  - ID: 220025
-    Group: "AG_GET_ITEM"
-    Name: "I found it! (3)"
-    Condition: " ARG0 >= 5000 "
-    Score: 15
-  - ID: 220026
-    Group: "AG_GET_ITEM"
-    Name: "I found it! (4)"
-    Condition: " ARG0 >= 10000 "
-    Score: 15
-  - ID: 220027
-    Group: "AG_GET_ITEM"
-    Name: "I found it! (5)"
-    Condition: " ARG0 >= 50000 "
-    Score: 20
-  - ID: 220028
-    Group: "AG_GET_ITEM"
-    Name: "I found it! (6)"
-    Condition: " ARG0 >= 100000 "
-    Score: 20
-  - ID: 220029
-    Group: "AG_GET_ITEM"
-    Name: "I found it! (7)"
-    Condition: " ARG0 >= 150000 "
-    Score: 30
-  - ID: 220030
-    Group: "AG_GET_ZENY"
-    Name: "Rich King (1)"
-    Condition: " ARG0 >= 10000 "
-    Score: 10
-  - ID: 220031
-    Group: "AG_GET_ZENY"
-    Name: "Rich King (2)"
-    Condition: " ARG0 >= 100000 "
-    Score: 15
-  - ID: 220032
-    Group: "AG_GET_ZENY"
-    Name: "Rich King (3)"
-    Condition: " ARG0 >= 1000000 "
-    Score: 20
-  - ID: 220033
-    Group: "AG_GET_ZENY"
-    Name: "Rich King (4)"
-    Condition: " ARG0 >= 10000000 "
-    Score: 25
-  - ID: 220034
-    Group: "AG_GET_ZENY"
-    Name: "Rich King (5)"
-    Condition: " ARG0 >= 100000000 "
-    Score: 30
-  - ID: 220035
-    Group: "AG_GET_ZENY"
-    Name: "Rich King (6)"
-    Condition: " ARG0 >= 1000000000 "
-    Score: 40
   - ID: 230100
     Group: "AG_TAMING"
     Name: "Poring is Love"
@@ -2456,6 +2240,202 @@ Body:
         MobID: 1505
         Count: 1
     Score: 10
+  - ID: 220000
+    Group: "AG_CHATTING_CREATE"
+    Name: "Community begin"
+    Score: 10
+  - ID: 220001
+    Group: "AG_CHATTING_DYING"
+    Name: "A mouth only moment"
+    Score: 10
+  - ID: 220002
+    Group: "AG_CHATTING_COUNT"
+    Name: "Admiring the chatter"
+    Condition: " ARG0 == 20 "
+    Score: 10
+  - ID: 220003
+    Group: "AG_ADD_FRIEND"
+    Name: "My friend's friend~"
+    Condition: " ARG0 >= 1 "
+    Score: 10
+  - ID: 220004
+    Group: "AG_ADD_FRIEND"
+    Name: "A competition of popularity"
+    Condition: " ARG0 >= 10 "
+    Score: 10
+  - ID: 220005
+    Group: "AG_PARTY"
+    Name: "Let's Party~"
+    Score: 10
+  - ID: 220006
+    Group: "AG_MARRY"
+    Name: "Married with who..?"
+    Reward:
+      TitleID: 1022
+    Score: 20
+  - ID: 220007
+    Group: "AG_BABY"
+    Name: "Can you grow?"
+    Condition: " ARG0 == 1 "
+    Reward:
+      TitleID: 1032
+    Score: 20
+  - ID: 220008
+    Group: "AG_BABY"
+    Name: "Being a parent"
+    Condition: " ARG0 == 2 "
+    Reward:
+      TitleID: 1033
+    Score: 20
+  - ID: 220009
+    Group: "AG_SPEND_ZENY"
+    Name: "Activating the market economy (1)"
+    Condition: " ARG0 >= 10000 "
+    Target:
+      - Id: 0
+        Count: 10000
+    Score: 10
+  - ID: 220010
+    Group: "AG_SPEND_ZENY"
+    Name: "Activating the market economy (2)"
+    Condition: " ARG0 >= 100000 "
+    Target:
+      - Id: 0
+        Count: 100000
+    Score: 15
+  - ID: 220011
+    Group: "AG_SPEND_ZENY"
+    Name: "Activating the market economy (3)"
+    Condition: " ARG0 >= 500000 "
+    Target:
+      - Id: 0
+        Count: 500000
+    Score: 20
+  - ID: 220012
+    Group: "AG_SPEND_ZENY"
+    Name: "Activating the market economy (4)"
+    Condition: " ARG0 >= 1000000 "
+    Target:
+      - Id: 0
+        Count: 1000000
+    Score: 30
+  - ID: 220013
+    Group: "AG_SPEND_ZENY"
+    Name: "Activating the market economy (5)"
+    Condition: " ARG0 >= 5000000 "
+    Target:
+      - Id: 0
+        Count: 5000000
+    Score: 50
+  - ID: 220014
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (1)"
+    Condition: " ARG0 == 1 && ARG1 >= 7 "
+    Score: 10
+  - ID: 220015
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (2)"
+    Condition: " ARG0 == 1 && ARG1 >= 12 "
+    Score: 15
+  - ID: 220016
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (3)"
+    Condition: " ARG0 == 2 && ARG1 >= 7 "
+    Score: 10
+  - ID: 220017
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (4)"
+    Condition: " ARG0 == 2 && ARG1 >= 12 "
+    Score: 15
+  - ID: 220018
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (5)"
+    Condition: " ARG0 == 3 && ARG1 >= 7 "
+    Score: 15
+  - ID: 220019
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (6)"
+    Condition: " ARG0 == 3 && ARG1 >= 12 "
+    Score: 20
+  - ID: 220020
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (7)"
+    Condition: " ARG0 == 4 && ARG1 >= 7 "
+    Score: 20
+  - ID: 220021
+    Group: "AG_ENCHANT_SUCCESS"
+    Name: "I can't quit from refining! (8)"
+    Condition: " ARG0 == 4 && ARG1 >= 12 "
+    Score: 30
+  - ID: 220022
+    Group: "AG_ENCHANT_FAIL"
+    Name: "Human's greed has no ending.."
+    Score: 10
+  - ID: 220023
+    Group: "AG_GET_ITEM"
+    Name: "I found it! (1)"
+    Condition: " ARG0 >= 100 "
+    Score: 10
+  - ID: 220024
+    Group: "AG_GET_ITEM"
+    Name: "I found it! (2)"
+    Condition: " ARG0 >= 1000 "
+    Score: 10
+  - ID: 220025
+    Group: "AG_GET_ITEM"
+    Name: "I found it! (3)"
+    Condition: " ARG0 >= 5000 "
+    Score: 15
+  - ID: 220026
+    Group: "AG_GET_ITEM"
+    Name: "I found it! (4)"
+    Condition: " ARG0 >= 10000 "
+    Score: 15
+  - ID: 220027
+    Group: "AG_GET_ITEM"
+    Name: "I found it! (5)"
+    Condition: " ARG0 >= 50000 "
+    Score: 20
+  - ID: 220028
+    Group: "AG_GET_ITEM"
+    Name: "I found it! (6)"
+    Condition: " ARG0 >= 100000 "
+    Score: 20
+  - ID: 220029
+    Group: "AG_GET_ITEM"
+    Name: "I found it! (7)"
+    Condition: " ARG0 >= 150000 "
+    Score: 30
+  - ID: 220030
+    Group: "AG_GET_ZENY"
+    Name: "Rich King (1)"
+    Condition: " ARG0 >= 10000 "
+    Score: 10
+  - ID: 220031
+    Group: "AG_GET_ZENY"
+    Name: "Rich King (2)"
+    Condition: " ARG0 >= 100000 "
+    Score: 15
+  - ID: 220032
+    Group: "AG_GET_ZENY"
+    Name: "Rich King (3)"
+    Condition: " ARG0 >= 1000000 "
+    Score: 20
+  - ID: 220033
+    Group: "AG_GET_ZENY"
+    Name: "Rich King (4)"
+    Condition: " ARG0 >= 10000000 "
+    Score: 25
+  - ID: 220034
+    Group: "AG_GET_ZENY"
+    Name: "Rich King (5)"
+    Condition: " ARG0 >= 100000000 "
+    Score: 30
+  - ID: 220035
+    Group: "AG_GET_ZENY"
+    Name: "Rich King (6)"
+    Condition: " ARG0 >= 1000000000 "
+    Score: 40
   - ID: 230200
     Group: "AG_BATTLE"
     Name: "Poring seeker"
@@ -2520,13 +2500,11 @@ Body:
     Score: 20
   - ID: 240000
     Group: "AG_GOAL_LEVEL"
-    Name: "First Login after the introduction of Achievement Tasks"
+    Name: "Complete challenges after first introduction"
     Score: 10
-    Condition: " true "
   - ID: 240001
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 1"
-    Condition: " AchievementLevel >= 1 "
     Reward:
       ItemID: 644
       Script: " specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,30000,10; "
@@ -2534,7 +2512,6 @@ Body:
   - ID: 240002
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 2"
-    Condition: " AchievementLevel >= 2 "
     Dependent:
       - Id: 240001
     Reward:
@@ -2544,7 +2521,6 @@ Body:
   - ID: 240003
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 3"
-    Condition: " AchievementLevel >= 3 "
     Dependent:
       - Id: 240002
     Reward:
@@ -2554,7 +2530,6 @@ Body:
   - ID: 240004
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 4"
-    Condition: " AchievementLevel >= 4 "
     Dependent:
       - Id: 240003
     Reward:
@@ -2564,7 +2539,6 @@ Body:
   - ID: 240005
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 5"
-    Condition: " AchievementLevel >= 5 "
     Dependent:
       - Id: 240004
     Reward:
@@ -2574,7 +2548,6 @@ Body:
   - ID: 240006
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 6"
-    Condition: " AchievementLevel >= 6 "
     Dependent:
       - Id: 240005
     Reward:
@@ -2584,7 +2557,6 @@ Body:
   - ID: 240007
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 7"
-    Condition: " AchievementLevel >= 7 "
     Dependent:
       - Id: 240006
     Reward:
@@ -2594,7 +2566,6 @@ Body:
   - ID: 240008
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 8"
-    Condition: " AchievementLevel >= 8 "
     Dependent:
       - Id: 240007
     Reward:
@@ -2604,7 +2575,6 @@ Body:
   - ID: 240009
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 9"
-    Condition: " AchievementLevel >= 9 "
     Dependent:
       - Id: 240008
     Reward:
@@ -2614,7 +2584,6 @@ Body:
   - ID: 240010
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 10"
-    Condition: " AchievementLevel >= 10 "
     Dependent:
       - Id: 240009
     Reward:
@@ -2625,7 +2594,6 @@ Body:
   - ID: 240011
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 11"
-    Condition: " AchievementLevel >= 11 "
     Dependent:
       - Id: 240010
     Reward:
@@ -2635,7 +2603,6 @@ Body:
   - ID: 240012
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 12"
-    Condition: " AchievementLevel >= 12 "
     Dependent:
       - Id: 240011
     Reward:
@@ -2645,7 +2612,6 @@ Body:
   - ID: 240013
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 13"
-    Condition: " AchievementLevel >= 13 "
     Dependent:
       - Id: 240012
     Reward:
@@ -2655,7 +2621,6 @@ Body:
   - ID: 240014
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 14"
-    Condition: " AchievementLevel >= 14 "
     Dependent:
       - Id: 240013
     Reward:
@@ -2665,7 +2630,6 @@ Body:
   - ID: 240015
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 15"
-    Condition: " AchievementLevel >= 15 "
     Dependent:
       - Id: 240014
     Reward:
@@ -2675,7 +2639,6 @@ Body:
   - ID: 240016
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 16"
-    Condition: " AchievementLevel >= 16 "
     Dependent:
       - Id: 240015
     Reward:
@@ -2685,7 +2648,6 @@ Body:
   - ID: 240017
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 17"
-    Condition: " AchievementLevel >= 17 "
     Dependent:
       - Id: 240016
     Reward:
@@ -2695,7 +2657,6 @@ Body:
   - ID: 240018
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 18"
-    Condition: " AchievementLevel >= 18 "
     Dependent:
       - Id: 240017
     Reward:
@@ -2705,7 +2666,6 @@ Body:
   - ID: 240019
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 19"
-    Condition: " AchievementLevel >= 19 "
     Dependent:
       - Id: 240018
     Reward:
@@ -2715,7 +2675,6 @@ Body:
   - ID: 240020
     Group: "AG_GOAL_ACHIEVE"
     Name: "Reaching Level 20"
-    Condition: " AchievementLevel >= 20 "
     Dependent:
       - Id: 240019
     Reward:

db/pre-re/achievement_level_db.yml

@@ -1,74 +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/>.
-#
-###########################################################################
-# Pre-Renewal Achievement Level Database
-###########################################################################
-#
-# Achievement Level Settings
-#
-###########################################################################
-# Level - Achievement Level
-###########################################################################
-# Points - Required total scoring points to reach this level.
-###########################################################################
-
-Header:
-  Type: ACHIEVEMENT_LEVEL_DB
-  Version: 1
-
-Body:
-  - Level: 1
-    Points: 18
-  - Level: 2
-    Points: 49
-  - Level: 3
-    Points: 98
-  - Level: 4
-    Points: 171
-  - Level: 5
-    Points: 306
-  - Level: 6
-    Points: 410
-  - Level: 7
-    Points: 550
-  - Level: 8
-    Points: 728
-  - Level: 9
-    Points: 942
-  - Level: 10
-    Points: 1247
-  - Level: 11
-    Points: 1504
-  - Level: 12
-    Points: 1804
-  - Level: 13
-    Points: 2152
-  - Level: 14
-    Points: 2550
-  - Level: 15
-    Points: 3070
-  - Level: 16
-    Points: 3522
-  - Level: 17
-    Points: 4030
-  - Level: 18
-    Points: 4592
-  - Level: 19
-    Points: 5210
-  - Level: 20
-    Points: 5980

db/pre-re/attendance.yml

@@ -1,34 +1,3 @@
-# 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/>.
-#
-###########################################################################
-# Attendance Database
-###########################################################################
-#
-# Attendance Settings
-#
-###########################################################################
-# - Start                   Start date.
-#   End                     End date.
-#   Rewards:                List of rewards for each day.
-#     - Day                 Reward day.
-#       ItemId              Item ID.
-###########################################################################
-
 Header:
   Type: ATTENDANCE_DB
   Version: 1

db/pre-re/instance_db.txt

@@ -0,0 +1,11 @@
+// Instance Database
+//
+// Structure of Database:
+// ID,Name,LimitTime,IdleTimeOut,EnterMap,EnterX,EnterY,Map2,Map3,...,Map255
+//
+// EnterMap is considered as Map1
+
+1,Endless Tower,14400,300,1@tower,50,355,2@tower,3@tower,4@tower,5@tower,6@tower
+2,Sealed Catacomb,7200,300,1@cata,100,224,2@cata
+3,Orc's Memory,3600,300,1@orcs,179,15,2@orcs
+4,Nidhoggur's Nest,14400,300,1@nyd,32,36,2@nyd

db/pre-re/instance_db.yml

@@ -1,81 +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/>.
-#
-###########################################################################
-# Instance Database
-###########################################################################
-#
-# Instance Settings
-#
-###########################################################################
-# - Id                Instance ID.
-#   Name              Instance Name.
-#   TimeLimit         Total lifetime of instance in seconds. (Default: 3600)
-#   IdleTimeOut       Time before an idle instance is destroyed in seconds. (Default: 300)
-#   Destroyable       Toggles the ability to destroy the instance using instance 'Destroy' button. (Default: true)
-#                     Note: the button is displayed based on parties. For any mode, it requires the party leader to be the instance owner to destroy it.
-#   Enter:            Instance entrance coordinates.
-#     Map             Map Name where players start.
-#     X               X Coordinate where players start.
-#     Y               Y Coordinate where players start.
-#   AdditionalMaps:   List of maps that are part of an instance. (Optional)
-###########################################################################
-
-Header:
-  Type: INSTANCE_DB
-  Version: 1
-
-Body:
-  - Id: 1
-    Name: Endless Tower
-    TimeLimit: 14400
-    Enter:
-      Map: 1@tower
-      X: 50
-      Y: 355
-    AdditionalMaps:
-      2@tower: true
-      3@tower: true
-      4@tower: true
-      5@tower: true
-      6@tower: true
-  - Id: 2
-    Name: Sealed Catacomb
-    TimeLimit: 7200
-    Enter:
-      Map: 1@cata
-      X: 100
-      Y: 224
-    AdditionalMaps:
-      2@cata: true
-  - Id: 3
-    Name: Orc's Memory
-    Enter:
-      Map: 1@orcs 
-      X: 179
-      Y: 15
-    AdditionalMaps:
-      2@orcs: true
-  - Id: 4
-    Name: Nidhoggur's Nest
-    TimeLimit: 14400
-    Enter:
-      Map: 1@nyd
-      X: 32
-      Y: 36
-    AdditionalMaps:
-      2@nyd: true

db/pre-re/item_combo_db.txt

@@ -66,18 +66,18 @@
 2357:2421:2524:5171,{ bonus bAllStats,1; }
 2358:5153,{ bonus bLuk,6; bonus bFlee,5; bonus bInt,2; }
 2359:2654,{ bonus bUseSPrate,-20; bonus bMaxHP,300; }
-2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FROSTNOVA",10; }
+2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FROSTNOVA",10; }
 2371:2522,{ bonus bAgi,5; bonus bFlee,10; }
 2371:2523,{ bonus bAgi,5; bonus bFlee,10; }
 2374:2729,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; }
 2375:2729,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; }
-2376:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bVit,3; bonus bMaxHPRate,12; bonus bHealpower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2377:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor; }
-2378:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2379:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2380:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2381:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
-2382:2437:2540,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
+2376:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bVit,3; bonus bMaxHPRate,12; bonus bHealpower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2377:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor; }
+2378:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2379:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2380:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2381:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
+2382:2437:2540,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
 2387:2440:2744,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bCastrate,-3; bonus bDelayrate,-15; }
 2390:2749,{ bonus bFlee2,5; }
 2394:2444:2549,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSkillHeal2,"AM_POTIONPITCHER",3; bonus2 bSkillHeal2,"AL_HEAL",3; bonus2 bSkillHeal2,"PR_SANCTUARY",3; }
@@ -137,7 +137,7 @@
 4153:4247:4273,{ bonus3 bAddMonsterDropItem,544,RC_Fish,3000; bonus2 bAddEle,Ele_Water,30; }
 4168:4169,{ bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus bCastrate,-10; }
 4172:4210:4230:4257:4272,{ bonus bAgi,5; bonus bStr,5; bonus bAspdRate,5; bonus bSpeedRate,25; bonus bSPDrainValue,1; if(BaseClass==Job_Thief) bonus bNoGemStone; }
-4178:4199:4234:4252:4297,{ bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass==Job_Archer) { bonus2 bExpAddRace,RC_Brute,5; bonus2 bComaRace,RC_Brute,100; bonus2 bComaRace,RC_Player_Doram,100; } }
+4178:4199:4234:4252:4297,{ bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass==Job_Archer) { bonus2 bExpAddRace,RC_Brute,5; bonus2 bComaRace,RC_Brute,100; } }
 4178:4234:4252:4297:4381,{ bonus bDex,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",5; bonus2 bSkillAtk,"DC_THROWARROW",10; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",10; if(BaseJob==Job_Bard||BaseJob==Job_Dancer) bonus3 bAutoSpellWhenHit,"CG_TAROTCARD",2,50; }
 4185:4217:4280:4293:4312,{ bonus bVit,10; bonus bCastrate,-10; bonus bUseSPRate,-10; if(BaseClass==Job_Acolyte) { bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; } }
 4185:4293:4312:4332,{ bonus bStr,3; bonus bMaxSP,80; bonus bBaseAtk,25; bonus3 bAutoSpell,"AL_CRUCIS",5,10; bonus2 bSkillAtk,"MO_EXTREMITYFIST",10; if(BaseJob==Job_Monk) { bonus bUseSPrate,-10; bonus bNoCastCancel; } }
@@ -152,7 +152,7 @@
 4268:4277,{ bonus bBaseAtk,20; bonus bLuk,3; }
 4311:4319:4331:4371,{ bonus bInt,1; bonus bStr,1; bonus bDef,2; bonus bSPrecovRate,10; bonus2 bSkillAtk,"PA_SHIELDCHAIN",10; bonus2 bSkillAtk,"PA_SACRIFICE",10; bonus bCastrate,-10; if(BaseJob==Job_Crusader) bonus bDefEle,Ele_Holy; }
 4323:4324,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,250; }
-4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_Player_Human,2; }
+4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_Player,2; }
 5040:5442,{ bonus bAspdRate,3; bonus bCastrate,3; }
 5068:5653,{ bonus bStr,1; bonus bAtkRate,5; }
 5074:5653,{ bonus bStr,1; bonus bAspdRate,2; }

db/pre-re/item_trade.txt

@@ -44,7 +44,7 @@
 7332,507,100	// Complete Tablet
 7333,507,100	// Prontera Tablet
 7334,507,100	// Payon Tablet
-7335,507,100	// Morocc Tablet
+7335,507,100	// Morroc Tablet
 7336,507,100	// Geffen Tablet
 7339,507,100	// Commemorative Travel Card
 5132,472,100	// Angeling Hat
@@ -113,7 +113,7 @@
 7341,507,100	// Old Pendant
 
 // Lighthalzen Quest items
-// * Schwarzwald Trilogy Quest items
+// * Schwartzvalt Trilogy Quest items
 7342,507,100	// File Folder
 7343,507,100	// Sealed File Folder
 7344,507,100	// Shinokas Case File
@@ -129,11 +129,11 @@
 // "2006 USA 3rd Anniversary" related items
 7530,507,100	// Travel Brochure [Amatsu]
 7531,507,100	// Travel Brochure [Kunlun]
-7532,507,100	// Travel Brochure [Luoyang]
+7532,507,100	// Travel Brochure [Louyang]
 7533,507,100	// Travel Brochure [Ayothaya]
 7534,507,100	// Amatsu Completed Photo Album
 7535,507,100	// Kunlun Completed Photo Album
-7536,507,100	// Luoyang Completed Photo Album
+7536,507,100	// Louyang Completed Photo Album
 7537,507,100	// Ayothaya Completed Photo Album
 
 // Poring Coin items
@@ -332,7 +332,7 @@
 // Taiwan ???
 2713,507,100	// Certificate
 
-// Satan Morocc
+// Satan Morroc
 7820,507,100	// Piece of Morocc Skin
 
 // Vietnam Independence Day

db/pre-re/mob_branch.txt

@@ -436,10 +436,10 @@ MOBG_Branch_Of_Dead_Tree,1881,Les,71428
 MOBG_Branch_Of_Dead_Tree,1882,Baba-Yaga,71428
 MOBG_Branch_Of_Dead_Tree,1883,Uzhas,71428
 MOBG_Branch_Of_Dead_Tree,1884,Mavka,71428
-MOBG_Branch_Of_Dead_Tree,1918,Incarnation of Morocc,71428
-MOBG_Branch_Of_Dead_Tree,1919,Incarnation of Morocc,71428
-MOBG_Branch_Of_Dead_Tree,1920,Incarnation of Morocc,71428
-MOBG_Branch_Of_Dead_Tree,1921,Incarnation of Morocc,71428
+MOBG_Branch_Of_Dead_Tree,1918,Incarnation of Morroc,71428
+MOBG_Branch_Of_Dead_Tree,1919,Incarnation of Morroc,71428
+MOBG_Branch_Of_Dead_Tree,1920,Incarnation of Morroc,71428
+MOBG_Branch_Of_Dead_Tree,1921,Incarnation of Morroc,71428
 MOBG_Branch_Of_Dead_Tree,1974,Banshee Master,71428
 MOBG_Branch_Of_Dead_Tree,1975,Beholder Master,71428
 MOBG_Branch_Of_Dead_Tree,1976,Cobalt Mineral,71428

db/pre-re/mob_db.txt

@@ -519,7 +519,7 @@
 
 1511,AMON_RA,Amon Ra,Amon Ra,88,1214138,0,87264,35891,3,1647,2576,26,52,0,1,90,124,74,45,14,12,2,7,62,0x6280084,170,854,2016,480,43632,607,5500,608,3500,732,5500,5053,150,2615,50,7211,7760,985,3880,616,400,1552,10,607,3000,0,0,0,0,4236,1
 
-// Luoyang
+// Louyang
 1512,HYEGUN,Hyegun,Yao Jun,56,9981,0,2199,1022,1,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,49,0x3885,180,890,1320,720,0,0,0,0,0,0,0,7054,3880,609,100,985,10,2406,1,7277,300,0,0,0,0,0,0,0,0,4328,1
 1513,CIVIL_SERVANT,Civil Servant,Mao Guai,62,14390,0,4023,2750,2,650,1010,42,5,58,15,20,60,80,50,10,12,1,2,44,0x3885,200,1257,528,432,0,0,0,0,0,0,0,7262,4171,7263,2000,606,10,1023,100,693,100,0,0,0,0,0,0,0,0,4202,1
 1514,DANCING_DRAGON,Dancing Dragon,Zhu Po Long,54,9136,0,3030,769,2,550,789,39,10,55,62,55,25,72,22,10,12,1,9,44,0x83,160,600,840,504,0,0,0,0,0,0,0,7266,4365,7265,3000,7268,800,1036,1000,7038,3000,0,0,0,0,0,0,0,0,4272,1
@@ -959,17 +959,17 @@
 1914,OBJ_A2,Blue Crystal,Blue Crystal,90,250,0,0,0,0,1,2,100,99,1,1,1,1,1,1,0,0,2,0,20,0x6370000,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1915,OBJ_B2,Pink Crystal,Pink Crystal,90,250,0,0,0,0,1,2,100,99,1,1,1,1,1,1,0,0,2,0,20,0x6370000,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
-// Satan Morocc
-1916,MOROCC,Satan Morocc,Satan Morocc,99,8388607,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x6203695,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1917,MOROCC_,Wounded Morocc,Wounded Morocc,99,8388607,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x6283695,100,576,540,432,1800000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0
-1918,MOROCC_1,Incarnation of Morocc,Incarnation of Morocc,97,190000,0,61000,140000,1,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0
-1919,MOROCC_2,Incarnation of Morocc,Incarnation of Morocc,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0
-1920,MOROCC_3,Incarnation of Morocc,Incarnation of Morocc,96,143000,0,50000,80000,2,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0
-1921,MOROCC_4,Incarnation of Morocc,Incarnation of Morocc,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0
-1922,G_MOROCC_1,Incarnation of Morocc,Incarnation of Morocc,97,1200000,0,0,0,1,16000,16001,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1923,G_MOROCC_2,Incarnation of Morocc,Incarnation of Morocc,97,1200000,0,0,0,1,16000,16001,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1924,G_MOROCC_3,Incarnation of Morocc,Incarnation of Morocc,96,1200000,0,0,0,2,16000,16001,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1925,G_MOROCC_4,Incarnation of Morocc,Incarnation of Morocc,98,1200000,0,0,0,1,16000,16001,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+// Satan Morroc
+1916,MOROCC,Satan Morroc,Satan Morroc,99,8388607,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x6203695,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1917,MOROCC_,Wounded Morroc,Wounded Morroc,99,8388607,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x6283695,100,576,540,432,1800000,607,5500,617,5000,617,5000,5808,1000,2374,5000,2375,5000,2433,5000,7799,9000,7798,9000,0,0,0,0,0,0,0,0
+1918,MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,61000,140000,1,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,1541,20,0,0,0,0,0,0
+1919,MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,2130,15,0,0,0,0,0,0,0,0
+1920,MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,143000,0,50000,80000,2,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,1182,15,0,0,0,0,0,0
+1921,MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,2129,20,0,0,0,0,0,0,0,0
+1922,G_MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,1200000,0,0,0,1,16000,16001,20,35,150,152,30,180,186,70,10,12,2,8,27,0x6203695,110,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1923,G_MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,1200000,0,0,0,1,16000,16001,20,5,120,83,20,10,166,50,10,12,1,6,67,0x6203695,150,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1924,G_MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,1200000,0,0,0,2,16000,16001,15,37,40,200,20,60,100,37,10,12,1,6,69,0x6203695,150,212,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1925,G_MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,1200000,0,0,0,1,16000,16001,18,54,60,60,30,220,125,20,10,12,1,6,68,0x6203695,150,1536,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // God Item Creation (WoE SE); Catacombs
 1926,JAKK_H,Jakk,Jakk,38,300,0,0,0,1,5,10,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,480,648,0,0,0,0,0,0,0,1062,3000,1062,3000,0,0,535,3000,535,3000,535,3000,0,0,0,0,0,0,0,0
 1927,WHISPER_H,Whisper,Whisper,34,100,0,0,0,1,5,10,0,45,1,51,14,0,60,0,10,12,0,6,68,0x2003095,150,1960,960,504,0,0,0,0,0,0,0,1059,5000,1059,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

db/pre-re/mob_race2_db.txt

@@ -16,12 +16,8 @@ RC2_GUARDIAN,1285,1286,1287,2081
 // Ninja Classes (Pirate's_Pride)
 RC2_NINJA,1315,1364,1401,1560
 // GvG
-RC2_GVG,1288,1905,1907,1908
+RC2_GVG,1143,1905,1906,1907
 // Battlefield
-RC2_BATTLEFIELD,1906,1909,1910,1911,1912,1913,1914,1915
+RC2_BATTLEFIELD,1906,1909,1914,1915
 // Treasure Chests
 RC2_TREASURE,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1938,1939,1940,1941,1942,1943,1944,1945,1946
-// Manuk
-RC2_MANUK,1986,1987,1988,1989,1990,1997,1998,1999
-// Splendide
-RC2_SPLENDIDE,1991,1992,1993,1994,1995

db/pre-re/mob_skill_db.txt

@@ -4854,206 +4854,206 @@
 
 1904,Bomb Poring@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,always,0,,,,,,,
 
-// Satan Morocc (12.1)
+// Satan Morroc (12.1)
 //5% HP - Dragon Fear
-1916,Satan Morocc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
-1916,Satan Morocc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
+1916,Satan Morroc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
+1916,Satan Morroc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
 //10% HP - Talk
-1916,Satan Morocc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
-1916,Satan Morocc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
+1916,Satan Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
+1916,Satan Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
 //30% HP - Earthquake Combo
-1916,Satan Morocc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
-1916,Satan Morocc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
-1916,Satan Morocc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
-1916,Satan Morocc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
-1916,Satan Morocc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
-1916,Satan Morocc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
+1916,Satan Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
+1916,Satan Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
+1916,Satan Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
+1916,Satan Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
+1916,Satan Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
+1916,Satan Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
 //40% HP - Mixed Combo
-1916,Satan Morocc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
-1916,Satan Morocc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
-1916,Satan Morocc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
-1916,Satan Morocc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
-1916,Satan Morocc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
-1916,Satan Morocc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
+1916,Satan Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
+1916,Satan Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
+1916,Satan Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
+1916,Satan Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
+1916,Satan Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
+1916,Satan Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
 //50% HP - Vampire Combo
-1916,Satan Morocc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
-1916,Satan Morocc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
-1916,Satan Morocc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
-1916,Satan Morocc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
-1916,Satan Morocc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
-1916,Satan Morocc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
+1916,Satan Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
+1916,Satan Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
+1916,Satan Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
+1916,Satan Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
+1916,Satan Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
+1916,Satan Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
 //60% HP - Hell Combo
-1916,Satan Morocc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
-1916,Satan Morocc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
-1916,Satan Morocc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
-1916,Satan Morocc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
-1916,Satan Morocc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
-1916,Satan Morocc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
+1916,Satan Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
+1916,Satan Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
+1916,Satan Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
+1916,Satan Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
+1916,Satan Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
+1916,Satan Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
 //80% HP - Magic Combo
-1916,Satan Morocc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
-1916,Satan Morocc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
-1916,Satan Morocc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
-1916,Satan Morocc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
-1916,Satan Morocc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1916,Satan Morocc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1916,Satan Morocc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1916,Satan Morocc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1916,Satan Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-1916,Satan Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1916,Satan Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
-1916,Satan Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
-1916,Satan Morocc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1916,Satan Morocc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1916,Satan Morocc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1916,Satan Morocc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1
-1916,Satan Morocc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
-1916,Satan Morocc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
-1916,Satan Morocc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,,
-1916,Satan Morocc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,,
+1916,Satan Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
+1916,Satan Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
+1916,Satan Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
+1916,Satan Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
+1916,Satan Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1916,Satan Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1916,Satan Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1916,Satan Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1916,Satan Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+1916,Satan Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+1916,Satan Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
+1916,Satan Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+1916,Satan Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+1916,Satan Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+1916,Satan Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+1916,Satan Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1
+1916,Satan Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
+1916,Satan Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
+1916,Satan Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,,
+1916,Satan Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,,
 //5% HP - Dragon Fear
-1917,Wounded Morocc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
-1917,Wounded Morocc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
+1917,Wounded Morroc@NPC_DRAGONFEAR,chase,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
+1917,Wounded Morroc@NPC_DRAGONFEAR,attack,659,10,10000,0,600000,no,self,myhpltmaxrate,5,,,,,,,17
 //10% HP - Talk
-1917,Wounded Morocc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
-1917,Wounded Morocc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
+1917,Wounded Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
+1917,Wounded Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpltmaxrate,10,,,,,,,16
 //30% HP - Earthquake Combo
-1917,Wounded Morocc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
-1917,Wounded Morocc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
-1917,Wounded Morocc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
-1917,Wounded Morocc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
-1917,Wounded Morocc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
-1917,Wounded Morocc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
+1917,Wounded Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
+1917,Wounded Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,6
+1917,Wounded Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
+1917,Wounded Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,myhpltmaxrate,30,,,,,,,
+1917,Wounded Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
+1917,Wounded Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,myhpltmaxrate,30,,,,,,,
 //40% HP - Mixed Combo
-1917,Wounded Morocc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
-1917,Wounded Morocc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
-1917,Wounded Morocc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
-1917,Wounded Morocc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
-1917,Wounded Morocc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
-1917,Wounded Morocc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
+1917,Wounded Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
+1917,Wounded Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpltmaxrate,40,,,,,,,14
+1917,Wounded Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
+1917,Wounded Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,myhpltmaxrate,40,,,,,,,
+1917,Wounded Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
+1917,Wounded Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,myhpltmaxrate,40,,,,,,,
 //50% HP - Vampire Combo
-1917,Wounded Morocc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
-1917,Wounded Morocc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
-1917,Wounded Morocc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
-1917,Wounded Morocc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
-1917,Wounded Morocc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
-1917,Wounded Morocc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
+1917,Wounded Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
+1917,Wounded Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,15
+1917,Wounded Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
+1917,Wounded Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,myhpltmaxrate,50,,,,,,,
+1917,Wounded Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
+1917,Wounded Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,myhpltmaxrate,50,,,,,,,
 //60% HP - Hell Combo
-1917,Wounded Morocc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
-1917,Wounded Morocc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
-1917,Wounded Morocc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
-1917,Wounded Morocc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
-1917,Wounded Morocc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
-1917,Wounded Morocc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
+1917,Wounded Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
+1917,Wounded Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,60,,,,,,,3
+1917,Wounded Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
+1917,Wounded Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,myhpltmaxrate,60,,,,,,,
+1917,Wounded Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
+1917,Wounded Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,myhpltmaxrate,60,,,,,,,
 //80% HP - Magic Combo
-1917,Wounded Morocc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
-1917,Wounded Morocc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
-1917,Wounded Morocc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
-1917,Wounded Morocc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
-1917,Wounded Morocc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1917,Wounded Morocc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1917,Wounded Morocc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1917,Wounded Morocc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
-1917,Wounded Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-1917,Wounded Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1917,Wounded Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
-1917,Wounded Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
-1917,Wounded Morocc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1917,Wounded Morocc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1917,Wounded Morocc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1917,Wounded Morocc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1
-1917,Wounded Morocc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
-1917,Wounded Morocc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
-1917,Wounded Morocc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,,
-1917,Wounded Morocc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,,
-1918,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
-1918,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
-1918,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-1918,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1918,Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,,
-1918,Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,,
-1918,Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
-1918,Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,,
-1918,Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
-1918,Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,0,,,,,,,
-1918,Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,0,,,,,,,
-1918,Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,0,,,,,,,
-1918,Incarnation of Morocc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,0,,,,,,,
-1919,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
-1919,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
-1919,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-1919,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1919,Incarnation of Morocc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,,
-1919,Incarnation of Morocc@NPC_WIDEBLEEDING,chase,665,1,10000,500,60000,no,self,always,0,,,,,,,
-1919,Incarnation of Morocc@NPC_WIDEBLEEDING,attack,665,1,10000,500,60000,no,self,always,0,,,,,,,
-1919,Incarnation of Morocc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,,
-1919,Incarnation of Morocc@NPC_EARTHQUAKE,attack,653,1,5000,5000,100000,no,self,myhpltmaxrate,10,,,,,,,
-1920,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
-1920,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
-1920,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-1920,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1920,Incarnation of Morocc@NPC_CRITICALWOUND,attack,673,3,10000,0,5000,yes,target,always,0,,,,,,,
-1920,Incarnation of Morocc@NPC_CRITICALWOUND,idle,673,3,5000,0,5000,yes,target,always,0,,,,,,,
-1920,Incarnation of Morocc@NPC_CRITICALWOUND,chase,673,3,5000,0,5000,yes,target,always,0,,,,,,,
-1920,Incarnation of Morocc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,,
-1920,Incarnation of Morocc@NPC_WIDESILENCE,chase,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36,
-1920,Incarnation of Morocc@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36,
-1921,Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
-1921,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
-1921,Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-1921,Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1921,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
-1921,Incarnation of Morocc@AL_HEAL,chase,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
-1921,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
-1921,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,500,0,yes,self,myhpltmaxrate,70,,,,,,36,
-1921,Incarnation of Morocc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,no,friend,friendhpltmaxrate,90,,,,,,,
-1921,Incarnation of Morocc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,,
-1921,Incarnation of Morocc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,,
-1922,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1922,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1922,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1922,Incarnation of Morocc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,,
-1922,Incarnation of Morocc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,,
-1922,Incarnation of Morocc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
-1922,Incarnation of Morocc@KN_TWOHANDQUICKEN,chase,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,,
-1922,Incarnation of Morocc@KN_TWOHANDQUICKEN,attack,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,,
-1922,Incarnation of Morocc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,,
-1922,Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,self,always,0,,,,,,6,
-1922,Incarnation of Morocc@NPC_EXPULSION,attack,674,1,100,1000,30000,no,target,always,0,,,,,,,
-1922,Incarnation of Morocc@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,0,,,,,,,
-1922,Incarnation of Morocc@SA_DISPELL,attack,289,5,500,0,30000,yes,target,always,0,,,,,,,
-1922,Incarnation of Morocc@WZ_VERMILION,chase,85,5,5000,700,25000,no,target,always,0,,,,,,,
-1922,Incarnation of Morocc@WZ_VERMILION,attack,85,5,2000,700,25000,no,target,always,0,,,,,,,
-1922,Incarnation of Morocc@WZ_JUPITEL,chase,84,5,5000,1000,20000,no,target,always,0,,,,,,,
-1922,Incarnation of Morocc@WZ_JUPITEL,attack,84,5,3000,1000,20000,no,target,always,0,,,,,,,
-1923,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1923,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1923,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1923,Incarnation of Morocc@NPC_SUMMONSLAVE,chase,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,,
-1923,Incarnation of Morocc@NPC_SUMMONSLAVE,attack,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,,
-1923,Incarnation of Morocc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,,
-1923,Incarnation of Morocc@NPC_WIDEBLEEDING,chase,665,2,10000,500,100000,no,self,always,0,,,,,,,
-1923,Incarnation of Morocc@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,always,0,,,,,,,
-1923,Incarnation of Morocc@NPC_EARTHQUAKE,attack,653,1,2000,700,100000,no,self,myhpltmaxrate,10,,,,,,,
-1923,Incarnation of Morocc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,,
-1924,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1924,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1924,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1924,Incarnation of Morocc@NPC_CRITICALWOUND,attack,673,4,10000,0,5000,yes,target,always,0,,,,,,,
-1924,Incarnation of Morocc@NPC_CRITICALWOUND,idle,673,4,5000,0,5000,yes,target,always,0,,,,,,,
-1924,Incarnation of Morocc@NPC_CRITICALWOUND,chase,673,4,5000,0,5000,yes,target,always,0,,,,,,,
-1924,Incarnation of Morocc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,,
-1924,Incarnation of Morocc@NPC_WIDESILENCE,chase,663,2,10000,1000,20000,no,self,always,0,,,,,,36,
-1924,Incarnation of Morocc@NPC_WIDESILENCE,attack,663,2,10000,1000,20000,no,self,always,0,,,,,,36,
-1925,Incarnation of Morocc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1925,Incarnation of Morocc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1925,Incarnation of Morocc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
-1925,Incarnation of Morocc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,yes,friend,friendhpltmaxrate,90,,,,,,,
-1925,Incarnation of Morocc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,,
-1925,Incarnation of Morocc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,,
-1925,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
-1925,Incarnation of Morocc@AL_HEAL,chase,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
-1925,Incarnation of Morocc@AL_HEAL,attack,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
-1925,Incarnation of Morocc@AL_HEAL,idle,28,11,10000,300,0,yes,self,myhpltmaxrate,70,,,,,,36,
+1917,Wounded Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
+1917,Wounded Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,2
+1917,Wounded Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
+1917,Wounded Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,myhpltmaxrate,80,,,,,,,
+1917,Wounded Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1917,Wounded Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1917,Wounded Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1917,Wounded Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,myhpltmaxrate,80,,,,,,,
+1917,Wounded Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+1917,Wounded Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+1917,Wounded Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
+1917,Wounded Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+1917,Wounded Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+1917,Wounded Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+1917,Wounded Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+1917,Wounded Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,,1
+1917,Wounded Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
+1917,Wounded Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,4
+1917,Wounded Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,,
+1917,Wounded Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,,
+1918,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
+1918,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+1918,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+1918,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+1918,Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,,
+1918,Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,,
+1918,Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
+1918,Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,,
+1918,Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
+1918,Incarnation of Morroc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,0,,,,,,,
+1918,Incarnation of Morroc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,0,,,,,,,
+1918,Incarnation of Morroc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,0,,,,,,,
+1918,Incarnation of Morroc@NPC_WIDECURSE,attack,677,5,5000,800,5000,no,self,always,0,,,,,,,
+1919,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
+1919,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+1919,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+1919,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+1919,Incarnation of Morroc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,,
+1919,Incarnation of Morroc@NPC_WIDEBLEEDING,chase,665,1,10000,500,60000,no,self,always,0,,,,,,,
+1919,Incarnation of Morroc@NPC_WIDEBLEEDING,attack,665,1,10000,500,60000,no,self,always,0,,,,,,,
+1919,Incarnation of Morroc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,,
+1919,Incarnation of Morroc@NPC_EARTHQUAKE,attack,653,1,5000,5000,100000,no,self,myhpltmaxrate,10,,,,,,,
+1920,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
+1920,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+1920,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+1920,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+1920,Incarnation of Morroc@NPC_CRITICALWOUND,attack,673,3,10000,0,5000,yes,target,always,0,,,,,,,
+1920,Incarnation of Morroc@NPC_CRITICALWOUND,idle,673,3,5000,0,5000,yes,target,always,0,,,,,,,
+1920,Incarnation of Morroc@NPC_CRITICALWOUND,chase,673,3,5000,0,5000,yes,target,always,0,,,,,,,
+1920,Incarnation of Morroc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,,
+1920,Incarnation of Morroc@NPC_WIDESILENCE,chase,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36,
+1920,Incarnation of Morroc@NPC_WIDESILENCE,attack,663,5,10000,1000,20000,no,self,myhpltmaxrate,80,,,,,,36,
+1921,Incarnation of Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
+1921,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+1921,Incarnation of Morroc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+1921,Incarnation of Morroc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+1921,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
+1921,Incarnation of Morroc@AL_HEAL,chase,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
+1921,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,500,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
+1921,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,500,0,yes,self,myhpltmaxrate,70,,,,,,36,
+1921,Incarnation of Morroc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,no,friend,friendhpltmaxrate,90,,,,,,,
+1921,Incarnation of Morroc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,,
+1921,Incarnation of Morroc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,no,friend,friendhpltmaxrate,90,,,,,,,
+1922,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1922,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1922,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1922,Incarnation of Morroc@NPC_SLOWCAST,attack,672,5,10000,0,30000,yes,self,always,0,,,,,,,
+1922,Incarnation of Morroc@NPC_PULSESTRIKE,chase,661,5,2000,0,30000,yes,self,always,0,,,,,,,
+1922,Incarnation of Morroc@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
+1922,Incarnation of Morroc@KN_TWOHANDQUICKEN,chase,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,,
+1922,Incarnation of Morroc@KN_TWOHANDQUICKEN,attack,60,30,10000,800,60000,no,self,myhpltmaxrate,45,,,,,,,
+1922,Incarnation of Morroc@NPC_MAGICMIRROR,chase,671,1,10000,0,30000,yes,self,always,0,,,,,,,
+1922,Incarnation of Morroc@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,self,always,0,,,,,,6,
+1922,Incarnation of Morroc@NPC_EXPULSION,attack,674,1,100,1000,30000,no,target,always,0,,,,,,,
+1922,Incarnation of Morroc@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,0,,,,,,,
+1922,Incarnation of Morroc@SA_DISPELL,attack,289,5,500,0,30000,yes,target,always,0,,,,,,,
+1922,Incarnation of Morroc@WZ_VERMILION,chase,85,5,5000,700,25000,no,target,always,0,,,,,,,
+1922,Incarnation of Morroc@WZ_VERMILION,attack,85,5,2000,700,25000,no,target,always,0,,,,,,,
+1922,Incarnation of Morroc@WZ_JUPITEL,chase,84,5,5000,1000,20000,no,target,always,0,,,,,,,
+1922,Incarnation of Morroc@WZ_JUPITEL,attack,84,5,3000,1000,20000,no,target,always,0,,,,,,,
+1923,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1923,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1923,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1923,Incarnation of Morroc@NPC_SUMMONSLAVE,chase,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,,
+1923,Incarnation of Morroc@NPC_SUMMONSLAVE,attack,196,7,10000,1000,10000,no,self,slavele,0,1937,,,,,,
+1923,Incarnation of Morroc@NPC_BLOODDRAIN,attack,199,1,3000,0,0,yes,target,always,0,,,,,,,
+1923,Incarnation of Morroc@NPC_WIDEBLEEDING,chase,665,2,10000,500,100000,no,self,always,0,,,,,,,
+1923,Incarnation of Morroc@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,always,0,,,,,,,
+1923,Incarnation of Morroc@NPC_EARTHQUAKE,attack,653,1,2000,700,100000,no,self,myhpltmaxrate,10,,,,,,,
+1923,Incarnation of Morroc@SM_MAGNUM,attack,7,25,2000,500,5000,no,self,always,0,,,,,,,
+1924,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1924,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1924,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1924,Incarnation of Morroc@NPC_CRITICALWOUND,attack,673,4,10000,0,5000,yes,target,always,0,,,,,,,
+1924,Incarnation of Morroc@NPC_CRITICALWOUND,idle,673,4,5000,0,5000,yes,target,always,0,,,,,,,
+1924,Incarnation of Morroc@NPC_CRITICALWOUND,chase,673,4,5000,0,5000,yes,target,always,0,,,,,,,
+1924,Incarnation of Morroc@NPC_ENERGYDRAIN,chase,200,1,3000,0,0,yes,target,always,0,,,,,,,
+1924,Incarnation of Morroc@NPC_WIDESILENCE,chase,663,2,10000,1000,20000,no,self,always,0,,,,,,36,
+1924,Incarnation of Morroc@NPC_WIDESILENCE,attack,663,2,10000,1000,20000,no,self,always,0,,,,,,36,
+1925,Incarnation of Morroc@NPC_EMOTION,idle,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1925,Incarnation of Morroc@NPC_EMOTION,chase,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1925,Incarnation of Morroc@NPC_EMOTION,attack,197,1,10000,0,30000,yes,self,always,0,9,0x3885,,,,,
+1925,Incarnation of Morroc@HP_ASSUMPTIO,idle,361,5,5000,1000,5000,yes,friend,friendhpltmaxrate,90,,,,,,,
+1925,Incarnation of Morroc@HP_ASSUMPTIO,chase,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,,
+1925,Incarnation of Morroc@HP_ASSUMPTIO,attack,361,5,5000,1000,10000,yes,friend,friendhpltmaxrate,90,,,,,,,
+1925,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
+1925,Incarnation of Morroc@AL_HEAL,chase,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
+1925,Incarnation of Morroc@AL_HEAL,attack,28,11,10000,300,0,yes,friend,friendhpltmaxrate,99,,,,,,36,
+1925,Incarnation of Morroc@AL_HEAL,idle,28,11,10000,300,0,yes,self,myhpltmaxrate,70,,,,,,36,
 1927,Whisper@AS_CLOAKING,attack,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1927,Whisper@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1927,Whisper@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,,

db/pre-re/pet_db.yml

@@ -461,8 +461,8 @@ Body:
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus2 bAddRace,RC_Demihuman,2;
         bonus2 bMagicAddRace,RC_DemiHuman,2;
-        bonus2 bAddRace,RC_Player_Human,2;
-        bonus2 bMagicAddRace,RC_Player_Human,2;
+        bonus2 bAddRace,RC_Player,2;
+        bonus2 bMagicAddRace,RC_Player,2;
       }
   - Mob: ALICE
     TameItem: Sway_Apron
@@ -478,7 +478,7 @@ Body:
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus bMdef,1;
         bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player_Human,1;
+        bonus2 bSubRace,RC_Player,1;
       }
   - Mob: EVENT_RICECAKE
     EggItem: Rice_Cake_Egg
@@ -522,7 +522,7 @@ Body:
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus bDef,1;
         bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player_Human,1;
+        bonus2 bSubRace,RC_Player,1;
       }
   - Mob: ECLIPSE_P
     EggItem: Spring_Rabbit_Egg
@@ -670,7 +670,7 @@ Body:
       
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus2 bAddRace,RC_DemiHuman,3;
-        bonus2 bAddRace,RC_Player_Human,3;
+        bonus2 bAddRace,RC_Player,3;
       }
   - Mob: SUCCUBUS
     TameItem: Boy's_Naivety
@@ -839,7 +839,6 @@ Body:
       
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus2 bSubRace,RC_Brute,3;
-        bonus2 bSubRace,RC_Player_Doram,3;
       }
   - Mob: BACSOJIN_
     TameItem: Shiny_Wing_Gown

db/pre-re/produce_db.txt

@@ -192,7 +192,7 @@
 
 //--------------------LEVEL 4-----------
 
-//-- Morocc Fruit Wine <-- 10 Strawberry, 4 Lemon, 10 Orange, 2 Alcohol, 5 Grape
+//-- Morroc Fruit Wine <-- 10 Strawberry, 4 Lemon, 10 Orange, 2 Alcohol, 5 Grape
 70,12049,14,0,0,7475,0,578,10,568,4,582,10,970,2,514,5
 //-- Seasoned Jellyfish <-- 30 Tentacle, 10 White Herb, 10 Soft Blade Grass, 1 Old Frying Pan, 20 Squid Ink
 71,12054,14,0,0,7475,0,962,30,509,10,7194,10,7031,1,1024,20
@@ -618,15 +618,15 @@
 
 //---- Create Bomb --- ItemLV=28 ---------------
 //-- Apple Bomb <-- GN_MAKEBOMB Lv1, Apple Bomb CB, 1 Apple, 1 Scell, 1 Detonator, 1 Gun Powder
-//246,13260,28,2496,1,6279,0,512,1,911,1,1051,1,6244,1
+246,13260,28,2496,1,6279,0,512,1,911,1,1051,1,6244,1
 //-- Coconut Bomb <-- GN_MAKEBOMB Lv1, Coconut Bomb CB, 1 Detonator, 1 Coconut Fruit, 2 Gun Powder
-//247,13261,28,2496,1,6281,0,1051,1,6263,1,6244,2
+247,13261,28,2496,1,6281,0,1051,1,6263,1,6244,2
 //-- Melon Bomb <-- GN_MAKEBOMB Lv1, Melon Bomb CB, 1 Sticky Mucus, 1 Detonator, 2 Gun Powder, 1 Melon
-//248,13262,28,2496,1,6282,0,938,1,1051,1,6244,2,6264,1
+248,13262,28,2496,1,6282,0,938,1,1051,1,6244,2,6264,1
 //-- Pineapple Bomb <-- GN_MAKEBOMB Lv1, Pinepple Bomb CB, 1 Cactus Needle, 1 Detonator, 3 Gun Powder, 1 Pineapple
-//249,13263,28,2496,1,6280,0,952,1,1051,1,6244,3,6265,1
+249,13263,28,2496,1,6280,0,952,1,1051,1,6244,3,6265,1
 //-- Banana Bomb <-- GN_MAKEBOMB Lv1, Banana Bomb CB, 1 Banana, 1 Detonator, 4 Gun Powder, 1 Mould Powder
-//250,13264,28,2496,1,6283,0,513,1,1051,1,6244,4,7001,1
+250,13264,28,2496,1,6283,0,513,1,1051,1,6244,4,7001,1
 
 //---- Special Pharmacy --- ItemLV=29 ----------
 //-- Seed Of Horny Plant <-- GN_S_PHARMACY Lv1, Plant Genetic Grow, 10 Prickly Fruit

db/pre-re/size_fix.yml

@@ -1,38 +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/>.
-#
-###########################################################################
-# Size Fix Database
-###########################################################################
-#
-# Size Fix Settings
-#
-###########################################################################
-# - Weapon    Weapon type.
-#   Small     Small size modifier. (Default: 100)
-#   Medium    Medium size modifier. (Default: 100)
-#   Large     Large size modifier. (Default: 100)
-###########################################################################
-
-Header:
-  Type: SIZE_FIX_DB
-  Version: 1
-
-Body:
-  - Weapon: Knuckle
-    Medium: 75
-    Large: 50

db/pre-re/skill_castnodex_db.txt

@@ -0,0 +1,78 @@
+// <Skill id>,<Cast>,<Delay (optional)>
+//
+// Cast:  0 - everything affects the skill's cast time
+//        1 - skill's cast time is not affected by dex
+//        2 - skill's cast time is not affected by statuses (Suffragium, etc)
+//        4 - skill's cast time is not affected by item bonuses (equip, cards)
+//
+// Delay: 0 - everything affects the skill's delay
+//        1 - skill's delay is not affected by dex
+//        2 - skill's delay is not affected by Magic Strings / Bragi
+//        4 - skill's delay is not affected by item bonuses (equip, cards)
+//
+// Note: Values are bit fields, add them up to combine their effects.
+// Note: Delay setting '1' only makes sense when delay_dependon_dex is enabled.
+// Example: 46,1,1 = Double Strafe's cast time and delay is not affected by dex.
+
+136,0,2	//AS_SONICBLOW
+263,0,2	//MO_TRIPLEATTACK
+272,0,2	//MO_CHAINCOMBO
+273,0,2	//MO_COMBOFINISH
+336,1	//WE_CALLPARTNER
+366,7	//HW_MAGICPOWER
+370,1	//CH_PALMSTRIKE
+371,0,2	//CH_TIGERFIST
+372,0,2	//CH_CHAINCRUSH
+394,0,2	//CG_ARROWVULCAN
+403,3	//PF_MEMORIZE
+408,1	//WE_BABY
+409,1	//WE_CALLPARENT
+410,1	//WE_CALLBABY
+482,1	//PF_DOUBLECASTING
+462,1	//SL_KAIZEL
+496,1	//AM_TWILIGHT1
+497,1	//AM_TWILIGHT2
+498,1	//AM_TWILIGHT3
+512,3	//GS_TRACKING
+1014,1	//PR_REDEMPTIO
+
+2012,7	//RK_CRUSHSTRIKE
+2013,7	//RK_REFRESH
+2014,7	//RK_GIANTGROWTH
+2015,7	//RK_STONEHARDSKIN
+2022,0,2	//GC_CROSSIMPACT
+2032,7	//GC_POISONSMOKE
+2234,7	//RA_FEARBREEZE
+//2267,7	//NC_SELFDESTRUCTION
+2268,7	//NC_SHAPESHIFT
+//2270,7	//NC_INFRAREDSCAN
+2271,7	//NC_ANALYZE
+2281,7	//NC_SILVERSNIPER
+2282,7	//NC_MAGICDECOY
+2313,7	//LG_FORCEOFVANGUARD
+2462,7	//SO_EL_ANALYSIS
+
+2534,7,7	//RETURN_TO_ELDICASTES
+2536,7,7	//ALL_GUARDIAN_RECALL
+2537,0,7	//ALL_ODINS_POWER
+
+5067,7,7	//ALL_EQSWITCH
+
+// Mercenary Skills
+8214,7	//MA_CHARGEARROW
+8215,7	//MA_SHARPSHOOTING
+8217,7	//ML_BRANDISHSPEAR
+8218,7	//ML_SPIRALPIERCE
+8221,7	//ML_DEVOTION
+8222,7	//MER_MAGNIFICAT
+8225,7	//MER_CRASH
+8234,7	//MER_DECAGI
+8235,7	//MER_SCAPEGOAT
+8238,7	//MER_KYRIE
+8240,7	//MER_INCAGI
+
+// Guild Skills
+10010,3	//GD_BATTLEORDER
+10011,3	//GD_REGENERATION
+10012,6	//GD_RESTORE
+10013,7	//GD_EMERGENCYCALL