Merge branch 'master' into refactor/windows-build

# Conflicts:
#	vcproj-10/char-server.vcxproj
#	vcproj-10/char-server.vcxproj.filters
#	vcproj-10/login-server.vcxproj
#	vcproj-10/map-server.vcxproj
#	vcproj-10/map-server.vcxproj.filters
#	vcproj-10/mapcache.vcxproj
#	vcproj-12/char-server.vcxproj
#	vcproj-12/char-server.vcxproj.filters
#	vcproj-12/login-server.vcxproj
#	vcproj-12/map-server.vcxproj
#	vcproj-12/map-server.vcxproj.filters
#	vcproj-12/mapcache.vcxproj
#	vcproj-13/char-server.vcxproj
#	vcproj-13/char-server.vcxproj.filters
#	vcproj-13/login-server.vcxproj
#	vcproj-13/map-server.vcxproj
#	vcproj-13/map-server.vcxproj.filters
#	vcproj-13/mapcache.vcxproj
#	vcproj-14/char-server.vcxproj
#	vcproj-14/char-server.vcxproj.filters
#	vcproj-14/login-server.vcxproj
#	vcproj-14/map-server.vcxproj
#	vcproj-14/map-server.vcxproj.filters
#	vcproj-14/mapcache.vcxproj
#	vcproj-9/char-server.vcproj
#	vcproj-9/dbghelpplug.vcproj
#	vcproj-9/login-server.vcproj
#	vcproj-9/map-server.vcproj
#	vcproj-9/mapcache.vcproj

.github/CONTRIBUTING.md

@@ -0,0 +1,170 @@
+# Contributing to rAthena
+
+
+Table of Contents
+-----------------
+
+  * [Reporting Bugs](#reporting-bugs)
+  * [Suggesting Enhancements](#suggesting-enhancements)
+  * [Issue Labels](#issue-labels)
+  * [Become a Team Member](#become-a-team-member)
+
+Reporting Bugs
+--------------
+
+This bit of information is here to guide you through the process of creating a bug report for rAthena! Issues cannot only be used for developers to track bugs, but they can also track enhancements and tasks. The more detailed your report is, the easier it is for developers to reproduce and resolve the bug!
+
+### Did you find a bug? :bug:
+
+* **Ensure the bug is not coming from a customization** within your files!
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/rathena/rathena/issues). If the same issue exists, feel free to leave a comment and tell us you are experiencing the issue as well and if possible add some additional or missing information!
+* If you are unable to find an open issue addressing the problem, [open a new one](#submit-a-bug-report)!
+
+#### Submit A Bug Report :inbox_tray:
+
+There are several things that go into making a bug report a good bug report!
+
+This is a breakdown of a generic Issue:
+* **Title** should give some general insight as to what the bug is about.
+* **Description** should give greater detail of the bug that cannot be explained in the **Title**.
+* **Labels** are colored to represent a category they fall into.
+* **Milestones** are what developers use to group tasks together and quickly evaluate how close the project deliverable is near completion.
+* **Assignees** are developers who are directly linked to resolve the issue.
+* **Comments** allow other members to give feedback on the issue.
+
+#### What are some good details to provide in a bug report? :pencil2:
+
+When describing your Issue through the **Description** area, it is recommended that you provide as much information as possible to resolve the Issue as fast as possible. Keep in mind that you can tag people within the **Description** area through the `@mention` feature. You can also tag other Issues or Pull Requests by typing `#` which will pull up a list of issues. You can find a markdown guide at [Mastering Markdown](https://guides.github.com/features/mastering-markdown/).
+Some information to keep in mind while creating an Issue:
+* **GitHub Hash**: The hash is a 40 alpha-numeric string (which can be broken down to the first 7 characters) which states the version you are at. (**If you are using SVN instead of Git:** Please also put the change date and first line of the commit message beside the revision number, or we will not be able to look up the corresponding Git hash).
+* **Client Date**: The client date provides specific details depending on the issue. The main detail is that it helps narrow down issues that are related to a packet problem.
+* **Modifications that may affect results**: It is always best to try to reproduce your issue on a clean rAthena if you have lots of modifications.
+* **Description of Issue**: Describe your issue in detail! Screenshots and videos help a lot! Please also provide crash dumps if one of the servers is crashing.
+* **How to Reproduce Issue**: Describe how to reproduce your issue in detail! The more the merrier!
+* **Official Info**: Provide creditable sources to state why it is a bug! Please do not provide an iRO Wiki link as there is a high chance it does not match kRO behavior.
+
+#### Be wary of the `@mention` feature! :warning:
+
+Since rAthena uses custom `@commands`, when describing an issue that deals with these commands please keep in mind that this does clash with the `@mention` system for GitHub! Always quote the text when mentioning an ``` `@command` ```(like this) so that you do not tag uninvolved GitHub users!
+
+Suggesting Enhancements
+-----------------------
+
+### Did you write a patch that fixes a bug? :bookmark_tabs:
+
+* Open a new GitHub Pull Request with the patch.
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+### Do you intend to add a new feature or change an existing one? :bulb:
+
+* Open a new GitHub Pull Request with the feature addition or changes.
+* Ensure the PR description clearly describes what the addition or changes are for. Include the relevant issue number if applicable.
+
+#### How to create Pull Requests :pencil:
+
+1. Make sure you have a [GitHub account](https://github.com/signup/free).
+2. Next, you will need to [fork rAthena](https://help.github.com/articles/fork-a-repo/#step-3-configure-git-to-sync-your-fork-with-the-original-spoon-knife-repository) to your account.
+3. Before making changes, make sure you [create a new branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/) for your working tree.
+4. After completing your changes, commit and push it to your branch.
+5. Now you are ready to [create a Pull Request](https://help.github.com/articles/creating-a-pull-request/) for rAthena!
+  * Upon creating the Pull Request, make sure you follow our [template](https://github.com/rathena/rathena/blob/master/.github/PULL_REQUEST_TEMPLATE.md) and provide the required information.
+  * **OPTIONAL**: We would greatly appreciate those that check the box to [allow edits by maintainers](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/), so we can apply small cleanups or additions to your changes before merging them!
+
+Issue Labels
+------------
+
+For the most part you as a user will have no reason to worry about the **Milestone** or **Assignee** parts of an Issue. The different **Labels** of an Issue allow developers to quickly understand the issue and also allows for fast searching or sorting.
+
+:bangbang: Users should be aware of the 'Mode' and 'Status' Type **Labels** as these sometimes require feedback! :bangbang:
+
+#### Bug Type
+
+| Label Name | Search Link | Description |
+| --- | --- | --- |
+| `bug:core` | [search][search-rathena-label-bugcore] | A fault that lies within the main framework of rAthena. |
+| `bug:database` | [search][search-rathena-label-bugdatabase] | A fault that lies within the database of rAthena. |
+| `bug:documentation` | [search][search-rathena-label-bugdocumentation] | A fault that lies within the documentation of rAthena. |
+| `bug:forum` | [search][search-rathena-label-bugforum] | A fault that lies within the rAthena forum. |
+| `bug:script` | [search][search-rathena-label-bugscript] | A fault that lies within the scripts of rAthena. |
+| `bug:skill` | [search][search-rathena-label-bugskill] | A fault that deals specifically with a skill. |
+| `bug:tool` | [search][search-rathena-label-bugtool] | A fault that lies within a tool of rAthena. |
+
+#### Mode Type
+
+| Label Name | Search Link | Description |
+| --- | --- | --- |
+| `mode:missing` | [search][search-rathena-label-modemissing] | Issue **Title** or **Description** does not state pre-renewal or renewal mode. |
+| `mode:prerenewal` | [search][search-rathena-label-modeprerenewal] | A fault that exists within the pre-renewal mode. |
+| `mode:renewal` | [search][search-rathena-label-moderenewal] | A fault that exists within the renewal mode. |
+
+#### Priority Type
+
+| Label Name | Search Link | Description |
+| --- | --- | --- |
+| `priority:high` | [search][search-rathena-label-priorityhigh] | A fault that makes rAthena unstable or unusable. |
+| `priority:medium` | [search][search-rathena-label-prioritymedium] | A fault that makes rAthena have significant repercussions but does not render rAthena unusable. |
+| `priority:low` | [search][search-rathena-label-prioritylow] | A fault that affects rAthena in one piece of functionality and is self-contained. |
+
+#### Server Type
+
+| Label Name | Search Link | Description |
+| --- | --- | --- |
+| `server:login` | [search][search-rathena-label-serverlogin] | A fault that lies within the login server of rAthena. |
+| `server:char` | [search][search-rathena-label-serverchar] | A fault that lies within the character server of rAthena. |
+| `server:map` | [search][search-rathena-label-servermap] | A fault that lies within the map server of rAthena. |
+
+#### Status Type
+
+| Label Name | Search Link | Description |
+| --- | --- | --- |
+| `status:client date missing` | [search][search-rathena-label-statusclientdatemissing] | Issue **Title** or **Description** does not state the client date used to create the bug. |
+| `status:confirmed` | [search][search-rathena-label-statusconfirmed] | Issue that has been validated by a developer to affect rAthena. |
+| `status:duplicate` | [search][search-rathena-label-statusduplicate] |  Issue that has been reported before. |
+| `status:git hash missing` | [search][search-rathena-label-statusgithashmissing] | Issue **Description** does not state the hash of rAthena used when the bug occurred. |
+| `status:invalid` | [search][search-rathena-label-statusinvalid] | Issue that is either not official or is not related to rAthena. |
+| `status:needs more info` | [search][search-rathena-label-statusneedsmoreinfo] | Issue that needs more information from the issue creator. |
+| `status:needs official info` | [search][search-rathena-label-statusneedsofficialinfo] | Issue that needs more information from a creditable source. |
+| `status:started` | [search][search-rathena-label-statusstarted] | Issue that has begun resolution by a developer. |
+| `status:unable to reproduce` | [search][search-rathena-label-statusunabletoreproduce] | Issue that was unable to be reproduced on rAthena. |
+| `status:wontfix` | [search][search-rathena-label-statuswontfix] |  Issue that cannot be fixed through some limitation or is intended behavior. |
+
+[search-rathena-label-bugcore]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Acore
+[search-rathena-label-bugdatabase]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Adatabase
+[search-rathena-label-bugdocumentation]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Adocumentation
+[search-rathena-label-bugforum]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Aforum
+[search-rathena-label-bugscript]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Ascript
+[search-rathena-label-bugskill]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Askill
+[search-rathena-label-bugtool]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Abug%3Atool
+[search-rathena-label-modemissing]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amode%3Amissing
+[search-rathena-label-modeprerenewal]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amode%3Aprerenewal
+[search-rathena-label-moderenewal]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Amode%3Arenewal
+[search-rathena-label-priorityhigh]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Apriority%3Ahigh
+[search-rathena-label-prioritymedium]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Apriority%3Amedium
+[search-rathena-label-prioritylow]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Apriority%3Alow
+[search-rathena-label-serverchar]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Aserver%3Achar
+[search-rathena-label-serverlogin]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Aserver%3Alogin
+[search-rathena-label-servermap]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Aserver%3Amap
+[search-rathena-label-statusclientdatemissing]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aclient+date+missing"
+[search-rathena-label-statusconfirmed]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Aconfirmed
+[search-rathena-label-statusduplicate]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Aduplicate
+[search-rathena-label-statusgithashmissing]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Agit+hash+missing"
+[search-rathena-label-statusinvalid]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Ainvalid
+[search-rathena-label-statusneedsmoreinfo]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aneeds+more+info"
+[search-rathena-label-statusneedsofficialinfo]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aneeds+official+info"
+[search-rathena-label-statusstarted]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Astarted
+[search-rathena-label-statusunabletoreproduce]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3A"status%3Aunable+to+reproduce"
+[search-rathena-label-statuswontfix]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Astatus%3Awontfix
+
+Become a Team Member
+--------------------
+
+1. Before you send in a staff application, make sure you have an [rAthena account](https://rathena.org/board/register/).
+  * If you are new to the community, go ahead and [introduce yourself](https://rathena.org/board/forum/89-introductions/)!
+2. Please fill out the [Staff Application](https://rathena.org/board/staffapplications/) and you will be notified shortly.
+
+<br />
+The rAthena team is comprised of all volunteers ([AUTHORS](https://github.com/rathena/rathena/blob/master/AUTHORS)). We encourage you to pitch in and submit bug reports or Pull Requests!
+
+Thanks!
+
+rAthena Team

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!-- NOTE: Anything within these brackets will be hidden on the preview of the Issue. -->
+
+* **rAthena Hash**: 
+
+<!-- Please specify the rAthena [GitHub hash](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) on which you encountered this issue. -->
+
+* **Client Date**: 
+
+<!-- Please specify the client date you used. -->
+
+* **Server Mode**: 
+
+<!-- Which mode does your server use: Pre-Renewal or Renewal? -->
+
+* **Description of Issue**: 
+  * Result: <!-- Describe the issue that you experienced in detail. -->
+  * Expected Result: <!-- Describe what you would expect to happen in detail. -->
+  * How to Reproduce: <!-- If you have not stated in the description of the result already, please give us a short guide how we can reproduce your issue. -->
+  * Official Information:<!-- If possible, provide information from official servers (kRO or other sources) which prove that the result is wrong. Please take into account that iRO (especially iRO Wiki) is not always the same as kRO. -->
+  <!-- * _NOTE: Make sure you quote ``` `@atcommands` ``` just like this so that you do not tag uninvolved GitHub users!_ -->
+
+* **Modifications that may affect results**: 
+  <!-- * Please provide any information that could influence the expected result. -->
+  <!-- * This can be either configurations you changed, database values you changed, or even external source modifications. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+<!-- NOTE: Anything within these brackets will be hidden on the preview of the Pull Request. -->
+
+* **Addressed Issue(s)**: 
+
+<!--
+Please specify the rAthena [GitHub issue(s)](https://help.github.com/articles/autolinked-references-and-urls/#issues-and-pull-requests) this pull request amends.
+If no issue exists yet, please [create one](https://github.com/rathena/rathena/issues/new) first and then link your pull request to the amendment!
+-->
+
+* **Server Mode**: 
+
+<!-- Which mode does this pull request apply to: Pre-Renewal, Renewal, or Both? -->
+
+* **Description of Pull Request**: 
+
+<!-- Describe how this pull request will resolve the issue(s) listed above. -->

.gitignore

@@ -30,6 +30,7 @@ Thumbs.db
 /config.log
 /config.status
 /core
+/enc_temp_folder
 /ipch
 /login-server
 /Makefile
@@ -54,9 +55,6 @@ Thumbs.db
 /conf/import
 /conf/msg_conf/import
 
-# /doc/
-/doc/doxygen
-
 # /log/
 /log/*.log
 /log/*.leaks
@@ -98,9 +96,17 @@ Thumbs.db
 /tools/*.ilk
 /tools/*.pdb
 
+# /vcproj-15/
+/vcproj-15/char-server
+/vcproj-15/login-server
+/vcproj-15/mapcache
+/vcproj-15/map-server
+/vcproj-15/*.user
+
 # /vcproj-14/
 .vs
 *.VC.db
+*.VC.opendb
 /vcproj-14/char-server
 /vcproj-14/login-server
 /vcproj-14/mapcache

.travis.yml

@@ -41,8 +41,10 @@ env:
     - DB_PASS="ragnarok"
     - PACKETDBVER=45
   matrix:
-    - CONFIGURE_FLAGS="--enable-prere=no"
-    - CONFIGURE_FLAGS="--enable-prere=yes"
+    - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
+    - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=no --enable-buildbot=yes"
+    - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=yes --enable-buildbot=yes"
+    - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=yes --enable-buildbot=yes"
 
 notifications:
   email: false

README.md

@@ -1,7 +1,7 @@
 rAthena
 =======
 
-Build Status: [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena)
+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)
 
 Table of Contents
 ---------
@@ -11,6 +11,7 @@ Table of Contents
 4. Troubleshooting
 5. Helpful Links
 6. More Documentation
+7. How to Contribute
 
 1. What is rAthena?
 ---------
@@ -56,6 +57,7 @@ relevant to your Operation System, please refer to the Wiki (links at the end of
 	* Paste the GitHub URL into the box:
 
 				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
@@ -65,10 +67,7 @@ relevant to your Operation System, please refer to the Wiki (links at the end of
 	* Type:
 		* (For CentOS)
 
-				yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel
-				rpm -Uvhhttp://repo.webtatic.com/yum/centos/5/latest.rpm
-				yum install --enablerepo=webtatic git-all
-				yum install --enablerepo=webtatic --disableexcludes=main git-all
+				yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel git
 		* (For Debian)
 
 				apt-get install git make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev
@@ -95,7 +94,27 @@ relevant to your Operation System, please refer to the Wiki (links at the end of
 
 				./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
 ---------
@@ -154,17 +173,20 @@ Examples:
 	* https://github.com/rathena/rathena
 
 * Full Installation Instructions
-	* Windows: https://rathena.org/wiki/Installation_on_Windows
-	* CentOS: https://rathena.org/wiki/Installation_(CentOS)
-	* Debian: https://rathena.org/wiki/Installation_(Debian)
-	* FreeBSD: https://rathena.org/wiki/Installation_(FreeBSD)
+	* [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 IRC Channel
 	* irc://irc.rizon.net/rathena
 	* Web Chat: https://rathena.org/board/page/chat.html
 
+* rAthena Discord Chat
+	http://discord.rathena.org
+
 * rAthena Wiki
-	https://rathena.org/board/index.php?app=ipbwiki
+	https://github.com/rathena/rathena/wiki
 
 * Fork and Pull Request Q&A
 	https://rathena.org/board/topic/86913-pull-request-qa/
@@ -177,3 +199,7 @@ directory. These include detailed explanations of NPC script commands, atcommand
 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.
+
+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)!

README.txt

@@ -1,180 +0,0 @@
-//============================================================
-//= rAthena Readme File
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Last Updated: ========================================
-//= 20150104
-//===== Description: =========================================
-//= Basic information and installation guide with links to
-//= various forum posts and Wiki articles.
-//============================================================
-
-============================
-||   Table of Contents    ||
-============================
-|| 1. What is rAthena?    ||
-|| 2. Prerequisites       ||
-|| 3. Installation        ||
-|| 4. Troubleshooting     ||
-|| 5. Helpful Links       ||
-|| 6. More Documentation  ||
-============================
-
-
-============================
-|| 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.
-
-
-============================
-|| 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.
-
-Windows
-	* MySQL (http://www.mysql.com/downloads/mysql/)
-	* MySQL Workbench (http://www.mysql.com/downloads/workbench/)
-	* MS Visual C++ (http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express)
-	* TortoiseGIT (http://code.google.com/p/tortoisegit/)
-	* MSysGit (http://code.google.com/p/msysgit/downloads/ or https://github.com/msysgit/git/releases)
-
-Linux (names of packages may require specific version numbers on certain distributions)
-	* gcc
-	* make
-	* mysql
-	* mysql-devel
-	* mysql-server
-	* pcre-devel
-	* zlib-devel
-	* git
-
-
-============================
-|| 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).
-
-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:
-		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
-
-Linux
-	* Type:
-	(For CentOS)
-		yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel
-		rpm -Uvhhttp://repo.webtatic.com/yum/centos/5/latest.rpm
-		yum install --enablerepo=webtatic git-all
-		yum install --enablerepo=webtatic --disableexcludes=main git-all
-	(For Debian)
-		apt-get install git make gcc 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
-	* When you're ready, start the servers:
-		./athena-start start
-
-
-============================
-|| 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.
-
-Examples:
-
-1.) 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.
-
-2.) 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.
-	
-3.) 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://rathena.org/wiki/Installation_on_Windows
-	CentOS  	https://rathena.org/wiki/Installation_(CentOS)
-	Debian  	https://rathena.org/wiki/Installation_(Debian)
-	FreeBSD 	https://rathena.org/wiki/Installation_(FreeBSD)
-	
-* rAthena IRC Channel
-	irc://irc.rizon.net/rathena
-
-* rAthena Wiki
-	https://rathena.org/board/index.php?app=ipbwiki
-
-* 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.

appveyor.yml

@@ -0,0 +1,126 @@
+image: Visual Studio 2015
+# 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
+clone_depth: 50
+version: '{branch}-{build}'
+pull_requests:
+  do_not_increment_build_number: true
+environment:
+  matrix:
+  - VisualStudioVersion: 10.0
+    Solution: rAthena-10.sln
+    Defines: "\"BUILDBOT\""
+  - VisualStudioVersion: 11.0
+    Solution: rAthena-12.sln
+    Defines: "\"BUILDBOT\""
+  - VisualStudioVersion: 12.0
+    Solution: rAthena-13.sln
+    Defines: "\"BUILDBOT\""
+  - VisualStudioVersion: 14.0
+    Solution: rAthena-14.sln
+    Defines: "\"BUILDBOT\""
+  - VisualStudioVersion: 10.0
+    Solution: rAthena-10.sln
+    Defines: "\"BUILDBOT;PRERE\""
+  - VisualStudioVersion: 11.0
+    Solution: rAthena-12.sln
+    Defines: "\"BUILDBOT;PRERE\""
+  - VisualStudioVersion: 12.0
+    Solution: rAthena-13.sln
+    Defines: "\"BUILDBOT;PRERE\""
+  - VisualStudioVersion: 14.0
+    Solution: rAthena-14.sln
+    Defines: "\"BUILDBOT;PRERE\""
+platform:
+  - Win32
+configuration:
+  - Debug
+# Disable Release for now, since do not want to have any optimization and have access to debug infos on crash
+#  - Release
+matrix:
+  fast_finish: true
+build_script:
+- cmd: msbuild %Solution% /p:DefineConstants=%Defines%
+services: mysql
+test_script:
+- cmd: >-
+    rem Set up the environment variables we need
+    
+    set DB_HOST=127.0.0.1
+    
+    set DB_ROOT=root
+    
+    set DB_ROOTPW=Password12!
+    
+    set DB_USER=ragnarok
+    
+    set DB_USERPW=ragnarok
+    
+    set DB_NAME=ragnarok
+    
+    set MYSQL="C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe"
+    
+    rem Setting creation
+    
+    cd C:\projects\rathena
+    
+    echo map_server_ip: %DB_HOST%>> conf\import\inter_conf.txt
+    
+    echo map_server_id: %DB_USER%>> conf\import\inter_conf.txt
+    
+    echo map_server_pw: %DB_PASS%>> conf\import\inter_conf.txt
+    
+    echo map_server_db: %DB_NAME%>> conf\import\inter_conf.txt
+    
+    echo log_db_ip: %DB_HOST%>> conf\import\inter_conf.txt
+    
+    echo log_db_id: %DB_USER%>> conf\import\inter_conf.txt
+    
+    echo log_db_pw: %DB_USERPW%>> conf\import\inter_conf.txt
+    
+    echo log_db_db: %DB_NAME%>> conf\import\inter_conf.txt
+    
+    rem MySQL database setup
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;"
+    
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\main.sql"
+    
+    %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 ALL ON *.* TO '%DB_USER%'@'%DB_HOST%' IDENTIFIED BY '%DB_USERPW%';"
+    
+    rem Start the map server
+    
+    map-server.exe --run-once

conf/atcommand_athena.conf

@@ -62,9 +62,10 @@ aliases: {
 	autoloottype: ["aloottype"]
 	cloneequip: ["eqclone"]
 	clonestat: ["stclone"]
+	reloadnpcfile: ["reloadnpc"]
 }
 
 /* Commands help file */
 help: {
 	@include "conf/help.txt"
-}
+}

conf/battle/feature.conf

@@ -23,7 +23,7 @@ feature.atcommand_suggestions: off
 // Feature became unstable on clients 2012 onwards (exact date not known),
 // it has been fixed on clients 2013-05-15 onwards however.
 // Feature was removed again on clients 2014-11-12 and later.
-feature.auction: on
+feature.auction: off
 
 // Warp suggestions (Note 1)
 // Show suggestions when attempting to @warp to a non-existent map?

conf/battle/gm.conf

@@ -16,6 +16,8 @@ atcommand_slave_clone_limit: 25
 // If 'no', commands require exact player name. If 'yes', entering a partial 
 // name will work, as long as there's only one match from all players in the 
 // current map server.
+// Some critical atcommands like jail, ban and a few others will still require you to enter the full name.
+// It will always work for charcommands when the setting is enabled.
 partial_name_scan: yes
 
 // Ban people that try trade dupe.
@@ -27,3 +29,8 @@ ban_hack_trade: 5
 // modifies @iteminfo to not display the minimum item drop rate (since it can't tell the mob level)
 // modifies @whodrops to display the users' real drop rate as per renewal_drop formula
 atcommand_mobinfo_type: 1
+
+// Should atcommands trigger level up events for NPCs? (Note 1)
+// This option is for @baselevelup and @joblevelup
+// Default: no
+atcommand_levelup_events: no

conf/battle/guild.conf

@@ -57,3 +57,7 @@ max_guild_alliance: 3
 // Upon changing maps: 1
 // Do not re-display: 0 (disabled)
 guild_notice_changemap: 2
+
+// Should maprespawnguildid kill clones too?
+// Default: no
+guild_maprespawn_clones: no

conf/battle/items.conf

@@ -81,7 +81,7 @@ autospell_stacking: no
 // Allow the consumption of usable items that are disabled by item_noequip.txt? (Note 1)
 // no = can't be consumed
 // yes = consumed with no effect
-allow_consume_restricted_item: yes
+allow_consume_restricted_item: no
 
 // Allow equipping items that are disabled by item_noequip.txt? (Note 1)
 // no = can't be equipped and will be unequipped when entering the map

conf/battle/misc.conf

@@ -146,8 +146,10 @@ mon_trans_disable_in_gvg: no
 discount_item_point_shop: 0
 
 // Don't display message "login-serv has been asked to %s the player '%.*s'." (Note 1)
-disp_serverbank_msg: no
 disp_servervip_msg: no
 
 // Delay to allow user resend new mail (default & minimum is 1000)
 mail_delay: 1000
+
+// Hides items from the player's favorite tab from being sold to a NPC. (Note 1)
+hide_fav_sell: no

conf/battle/monster.conf

@@ -228,6 +228,10 @@ mob_slave_keep_target: yes
 // See http://irowiki.org/wiki/MVP#Gravestone
 mvp_tomb_enabled: yes
 
+// Delay before the MVP tomb is spawned.
+// Default: 9 seconds
+mvp_tomb_delay: 9000
+
 // Whether or not the size of specially summoned mobs influences experience, drop rates,
 // and stats. The rates will be doubled for large mobs, and halved for small ones.
 // This is only invoked under the 'monster' command, @monsterbig, and @monstersmall. (Note 1)

conf/battle/party.conf

@@ -56,3 +56,9 @@ party_even_share_bonus: 0
 // Display party name regardless if player is in a guild.
 // Official servers do not display party name unless the user is in a guild. (Note 1)
 display_party_name: no
+
+// Prevent multiple characters of the same account to join the same party. (Note 1)
+block_account_in_same_party: yes
+
+// Prevent changing the party leader if the specified player is not on the same map (Note 1)
+change_party_leader_samemap: yes

conf/battle/pet.conf

@@ -78,3 +78,6 @@ pet_disable_in_gvg: no
 
 // Will does petskillattack2 fixed damage ignore plant infnite defense? (Note 1)
 pet_ignore_infinite_def: yes
+
+// Whether or not the pet will continue to attack when the master is dead. (Note 1)
+pet_master_dead: no

conf/battle/player.conf

@@ -120,6 +120,15 @@ max_cart_weight: 8000
 // Prevent logout of players after being hit for how long (in ms, 0 disables)?
 prevent_logout: 10000
 
+// When should the server prevent a player from logging out? Have no effect if prevent_logout is disabled. (Note 3)
+// Official servers prevent players from logging out after attacking, casting skills, and taking damage.
+// 0 = Players can always logout
+// 1 = Prevent logout on login
+// 2 = Prevent logout after attacking
+// 4 = Prevent logout after casting skill
+// 8 = Prevent logout after being hit
+prevent_logout_trigger: 14
+
 // Display the drained hp/sp values from normal attacks? (Ie: Hunter Fly card)
 show_hp_sp_drain: no
 
@@ -163,6 +172,10 @@ min_npc_vendchat_distance: 3
 // Default is 25. 100 = 100% Increase.
 rental_mount_speed_boost: 25
 
+// Display Katar critical bonus in the status window? (Note 1)
+// Default (official): no
+show_status_katar_crit: no
+
 //===================================
 // VIP system
 //===================================
@@ -180,17 +193,15 @@ vip_base_exp_increase: 50
 // Default: 50
 vip_job_exp_increase: 50
 
-// Experience penalty rate multiplier for non-VIP accounts.
-// Multiplies the 'death_penalty_base' and 'death_penalty_job' settings in 'conf/battle/exp.conf'.
-// Default: 3 (3*100 = 3% penalty)
-vip_exp_penalty_base_normal: 3
-vip_exp_penalty_job_normal: 3
-
 // Experience penalty rate multiplier for VIP accounts.
-// Multiplies the 'death_penalty_base' and 'death_penalty_job' settings in 'conf/battle/exp.conf'.
-// Default: 1 (1*100 = 1% penalty)
-vip_exp_penalty_base: 1
-vip_exp_penalty_job: 1
+// Default: 100 (100 = 1% penalty)
+vip_exp_penalty_base: 100
+vip_exp_penalty_job: 100
+
+// Zeny penalty for VIP accounts.
+// Zeny loss only happens if the player dies from another player.
+// Default: 0 (100 = 1% penalty)
+vip_zeny_penalty: 0
 
 // Battle Manual experience increase. Setting to 0 will disable.
 // - Regular/Thick Battle Manual: 50+(50/X) = 75%
@@ -206,10 +217,12 @@ vip_bm_increase: 2
 // Default: 50
 vip_drop_increase: 50
 
-// Gemstone requirement. Setting to false will disable.
+// Gemstone requirement.
 // Can the VIP Group ignore Gemstone requirement for skills?
-// Default: yes
-vip_gemstone: yes
+// 0 = Disable
+// 1 = Behave like Mistress Card
+// 2 = Remove all gemstone requirements (default)
+vip_gemstone: 2
 
 // Will display rate information (EXP, Drop, and Death penalty message)? (Note 1)
 vip_disp_rate: yes

conf/battle/skill.conf

@@ -352,3 +352,14 @@ skill_eightpath_algorithm: yes
 // The official setting makes it quite easy to trap MVPs, set this to 31 if you want all units to be able to
 // damage skills (previous behavior).
 can_damage_skill: 1
+
+// 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
+// If you set this to "yes", the chance for each card becomes 1/14.
+tarotcard_equal_chance: no
+
+// Should Dispel work on songs when the target is not in the song area? (Note 1)
+// On official servers, it's impossible to dispel songs.
+// Hint: Also affects the Rebellion skill "Vanishing Buster".
+dispel_song: no

conf/channels.conf

@@ -1,16 +1,5 @@
 // Channel System Configuration File
-
-chsys: (
-{
-	/* Default channels (available to all players) */
-	default_channels: {
-		/* channel_name : channel_messages_color */
-	 	main: "Yellow"
-		support: "Blue"
-		trade: "Red"
-		chat: "Default"
-		/* Add as many channels as you'd like. */
-	}
+channel_config: {
 
 	/* Colors available */
 	colors: {
@@ -21,24 +10,112 @@ chsys: (
 		Cyan: "0x00b89d"
 		Yellow: "0xffff90"
 		Green: "0x28bf00"
+		White: "0xFFFFFF"
+		Purple: "0xD67FFF"
+		LightGreen: "0xB6FF00"
 		Normal: "0x00ff00"
 		/* Add as many colors as you'd like. */
 	}
 
-	/* Allow users to create their own (private) channels through @channel command? */
-	/* (must also allow players to use @channel in groups.conf) */
-	allow_user_channel_creation: true
+	/**
+	 * Private channel config
+	 * - Always CHAN_TYPE_PUBLIC
+	 * - Always displayed in chat log as "#channel_name: <name>: <chat>"
+	 * - ID of private channels start at 1000
+	 **/
+	private_channel: {
+		allow: true			  // (bool)	Allow player to create their own channel?
+		color: "Default"	  // (string)	Default color, see colors
+		delay: 1000			  // (int)	Chat delay for each member
+		max_member: 1000	  // (int)	Max members
+		self_notif: true	  // (bool)	Show message when player enters or leaves the channel
+		join_notif: false	  // (bool)	Show message when player joined the channel
+		leave_notif: false	  // (bool)	Show message when player leaves the channel
+		/* Moderation feature for channel owner, allowed to: */
+		ban: true			  // (bool)	Ban players
+		kick: true			  // (bool)	Kick players
+		color_override: false // (bool)	Allow players to change the private channel color to their own
+		change_delay: false	  // (bool)	Allow players to change the private channel delay to their own
+	}
 
-	/* "map_local_channel" is an instanced channel unique to each map. */
-	map_local_channel: false
-	map_local_channel_name: "map"
-	map_local_channel_color: "Yellow"
-	map_local_channel_autojoin: true /* Disable autojoin in specific maps through mapflag 'nomapchannelautojoin'. */
+	/**
+	 * Default server channels
+	 **/
+	channels: (
+	/**
+	 * Structure
+	{
+		name: "#channel"		 // (string)	Channel name
+		password: ""			 // (string)	Channel password
+		alias: "[Channel]"		 // (string)	Message from this that channel will be displayed instead the channel name
+		color: "Default"		 // (string)	Channel color
+		type: "CHAN_TYPE_PUBLIC" // (string)	Channel type: CHAN_TYPE_PUBLIC, CHAN_TYPE_ALLY, CHAN_TYPE_MAP
+		autojoin: false			 // (bool)	Players will auto join channel
+		delay: 1000				 // (int)	Chat delay for each player
+		leave: true				 // (bool)	Player is allowed to leave the channel
+		chat: true				 // (bool)	Player is allowed to chat on this channel
+		color_override: false	 // (bool)	Allow players to change the private channel color to their own
+		self_notif: true		 // (bool)	Show message when player enters or leaves the channel
+		join_notif: false		 // (bool)	Show message when player joined the channel
+		leave_notif: false		 // (bool)	Show message when player leaves the channel
+		groupid: (0,..,99)		 // (list,int)	Only players with valid group IDs are allowed to join. Group with 'channel_admin' can always enter the channel.
+		/// All values above are default settings
+	},							 // Use comma if followed by other channel
+	 **/
+	{
+		name: "#global"
+		alias: "[Global]"
+		color: "White"
+		type: "CHAN_TYPE_PUBLIC"
+		delay: 1000
+		autojoin: false
+		leave: false
+	},
+	{
+		name: "#support"
+		alias: "[Support]"
+		color: "Blue"
+		type: "CHAN_TYPE_PUBLIC"
+		delay: 1000
+		autojoin: false
+	},
+	{
+		name: "#trade"
+		alias: "[Trade]"
+		color: "LightGreen"
+		type: "CHAN_TYPE_PUBLIC"
+		delay: 1000
+		autojoin: false
+	}
+	)
 
-	/* "ally_channel" is a channel shared by all your guild allies. */
-	ally_channel_enabled: true
-	ally_channel_name: "ally"
-	ally_channel_color: "Green"
-	ally_channel_autojoin: true
+	/**
+	 * Channel config for guild alliance
+	 * For the structure, see the 'channels' above
+	 **/
+	ally: {
+		name: "#ally"
+		alias: "[Ally]"
+		color: "Green"
+		type: "CHAN_TYPE_ALLY" // DO NOT CHANGE THIS VALUE
+		delay: 1000
+		autojoin: false
+		leave: true
+		chat: true
+	}
+
+	/**
+	 * Channel config for map channel
+	 * For the structure, see the 'channels' above
+	 **/
+	map: {
+		name: "#map"
+		alias: "[Map]"
+		color: "Yellow"
+		type: "CHAN_TYPE_MAP" // DO NOT CHANGE THIS VALUE
+		delay: 1000
+		autojoin: false
+		leave: true
+		chat: true
+	}
 }
-)

conf/char_athena.conf

@@ -172,13 +172,23 @@ char_del_delay: 86400
 
 // Restrict character deletion by email address or birthdate.
 // This restricts players from changing the langtype and deleting characters.
-// For birthdate, the client must be 20100803 or newer.
 // Defaults based on client date.
 // 1: Email address
 // 2: Birthdate
 // 3: Email address or Birthdate
+// IMPORTANT!
+// - This config only works for clients that send 0x0068 or 0x01fb for delete request.
+// - Use langtype 1 for newer clients (2013+), to use 0x01fb.
+// - Clients that are not using 0x0068 or 0x01fb, only use birthdate (YYMMDD) as default.
 char_del_option: 2
 
+// Restrict character deletion as long as he is still in a party or guild
+// 0: No restriction is applied
+// 1: Character cannot be deleted as long as he remains in a party
+// 2: Character cannot be deleted as long as he remains in a guild
+// 3: Character cannot be deleted as long as he remains in a party or guild(default)
+char_del_restriction: 3
+
 // What folder the DB files are in (item_db.txt, etc.)
 db_path: db
 
@@ -228,6 +238,15 @@ char_movetoused: yes
 // Allow users to move characters as often as they like?
 char_moves_unlimited: no
 
+// Character renaming
+// Allow users to rename a character while being in a party?
+// Default: no
+char_rename_party: no
+
+// Allow users to rename a character while being in a guild?
+// Default: no
+char_rename_guild: no
+
 // Should we check if sql-tables are correct on server startup ?
 char_checkdb: yes
 

conf/groups.conf

@@ -293,6 +293,7 @@ groups: (
 		item_unconditional: false
 		bypass_stat_onclone: true
 		bypass_max_stat: true
+		cashshop_sale: true
 		/* all_permission: true */
 	}
 }

conf/help.txt

@@ -116,9 +116,13 @@ jobchange: "Params: <job name|ID>\n" "Changes your job.\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\n"
 	"---- Modes And Others ----\n"
 	" 22 Wedding            26 Christmas          27 Summer           28 Hanbok\n"
-	" 4048 Star Gladiator (Union)\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"

conf/inter_athena.conf

@@ -93,7 +93,6 @@ scdata_db: sc_data
 cart_db: cart_inventory
 inventory_db: inventory
 charlog_db: charlog
-storage_db: storage
 skill_db: skill
 interlog_db: interlog
 memo_db: memo
@@ -123,31 +122,36 @@ acc_reg_num_table: acc_reg_num
 acc_reg_str_table: acc_reg_str
 char_reg_str_table: char_reg_str
 char_reg_num_table: char_reg_num
+clan_table: clan
+clan_alliance_table: clan_alliance
 
 // Map Database Tables
-buyingstore_db: buyingstores
-buyingstore_items_db: buyingstore_items
-item_db_db: item_db
-item_db_re_db: item_db_re
-item_db2_db: item_db2
-//item_db2_db: item_db2_re
-item_cash_db_db: item_cash_db
-item_cash_db2_db: item_cash_db2
-mob_db_db: mob_db
-mob_db_re_db: mob_db_re
-mob_db2_db: mob_db2
-//mob_db2_db: mob_db2_re
-mob_skill_db_db: mob_skill_db
-mob_skill_db_re_db: mob_skill_db_re
-mob_skill_db2_db: mob_skill_db2
-//mob_skill_db2_db: mob_skill_db2_re
+buyingstore_table: buyingstores
+buyingstore_items_table: buyingstore_items
+item_table: item_db
+renewal-item_table: item_db_re
+item2_table: item_db2
+renewal-item2_table: item_db2_re
+item_cash_table: item_cash_db
+item_cash2_table: item_cash_db2
+mob_table: mob_db
+renewal-mob_table: mob_db_re
+mob2_table: mob_db2
+renewal-mob2_table: mob_db2_re
+mob_skill_table: mob_skill_db
+renewal-mob_skill_table: mob_skill_db_re
+mob_skill2_table: mob_skill_db2
+renewal-mob_skill2_table: mob_skill_db2_re
 mapreg_table: mapreg
-vending_db: vendings
-vending_items_db: vending_items
+sales_table: sales
+vending_table: vendings
+vending_items_table: vending_items
 market_table: market
-db_roulette_table: db_roulette
+roulette_table: db_roulette
 
 // Use SQL item_db, mob_db and mob_skill_db for the map server? (yes/no)
 use_sql_db: no
 
+inter_server_conf: conf/inter_server.conf
+
 import: conf/import/inter_conf.txt

conf/inter_server.conf

@@ -0,0 +1,26 @@
+/**
+ * Config for Storages
+ *
+ * To access the premium storage, use script command 'openstorage2'.
+ * 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.
+},					          // Use comma to add more storages
+ **/
+
+storages: (
+{
+	// Default Storage
+	// DO NOT CHANGE THIS UNLESS YOU KNOW WHAT YOU ARE DOING
+	id: 0
+	name: "Storage"
+	table: "storage"
+	//max: 600
+}
+)

conf/log_athena.conf

@@ -103,7 +103,7 @@ log_commands: yes
 // Log NPC 'logmes' commands (Note 1)
 log_npc: yes
 
-// Log CHAT (Global, Whisper, Party, Guild, Main chat) (Note 3)
+// Log CHAT (Global, Whisper, Party, Guild, Main chat, Clan) (Note 3)
 // LOGGING FILTERS
 // =============================================================
 // 0 = Don't log at all
@@ -112,10 +112,11 @@ log_npc: yes
 // 4 - Log Party messages
 // 8 - Log Guild messages
 // 16 - Log Main chat messages
+// 32 - Log Clan messages
 // Example:
 // log_chat: 5 = logs both Whisper & Party messages
 // log_chat: 8 = logs only Guild messages
-// log_chat: 31 = logs everything
+// log_chat: 63 = logs everything
 log_chat: 0
 
 // Disable chat logging when WoE is running? (Note 1)

conf/login_athena.conf

@@ -98,8 +98,8 @@ chars_per_account: 0
 // Increase the value of MAX_CHARS if you want to increase vip_char_increase.
 // Note: The amount of VIP characters = MAX_CHARS - chars_per_account.
 // Note 2: This setting must be set after chars_per_account.
-// Default: 6
-vip_char_increase: 6
+// -1 will default to MAX_CHAR_VIP (src/config/core.h)
+vip_char_increase: -1
 
 // Create accounts with limited time?
 // -1: new accounts are created with unlimited time (default)
@@ -170,11 +170,5 @@ client_hash_check: off
 //client_hash: 10, cb1ea78023d337c38e8ba5124e2338ae
 //client_hash: 99, disabled
 
-//New registration flood protection [Kevin]
-//Number of new registration allowed
-allowed_regs: 1
-//Time in second before the counter for the number of registration is reset
-time_allowed: 10
-
 import: conf/inter_athena.conf
 import: conf/import/login_conf.txt

conf/map_athena.conf

@@ -119,6 +119,9 @@ help_txt: conf/help.txt
 help2_txt: conf/help2.txt
 charhelp_txt: conf/charhelp.txt
 
+// Load channel config from
+channel_conf: conf/channels.conf
+
 // Maps:
 import: conf/maps_athena.conf
 

conf/msg_conf/char_msg.conf

@@ -113,7 +113,19 @@
 103: Kagerou
 104: Oboro
 105: Hanbok
-106: Unknown Job
+106: Rebellion
+107: Oktoberfest
+108: Summoner
+109: Baby Summoner
+110: Baby Ninja
+111: Baby Kagerou
+112: Baby Oboro
+113: Baby Taekwon
+114: Baby Star Gladiator
+115: Baby Soul Linker
+116: Baby Gunslinger
+117: Baby Rebellion
+118: Unknown Job
 
 //Auction
 200: Auction Manager

conf/msg_conf/map_msg.conf

@@ -279,7 +279,7 @@
 266: Some of your items cannot be vended and were removed from the shop.
 267: '%s' designated maps reset.
 268: Reloaded the Message of the Day.
-269: Displaying first %d out of %d matches
+269: Displaying first %d matches
 //@me output format
 270: * :%s %s: *
 271: You can't drop items on this map.
@@ -418,7 +418,7 @@
 400: Usage: @jailfor <time> <character name>
 401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes
 402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
-// WoE SE (@agitstart2)
+// WoE SE (@agitstart2/@agitend2)
 403: War of Emperium SE has been initiated.
 404: War of Emperium SE is currently in progress.
 405: War of Emperium SE has been ended.
@@ -720,6 +720,8 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
 
 // @vip
 700: Usage: @vip <time> <character name>
@@ -770,7 +772,7 @@
 
 732: Item cannot be opened when your inventory is full.
 
-733: Item '%s' has not yet saved to your cart. Please re-log in order to correctly save your Vending information.
+733: Please enter a NPC file name (usage: @reloadnpcfile <file name>).
 
 // @cloneequip/@clonestat
 734: Cannot clone your own %s.
@@ -795,7 +797,35 @@
 747: The Baby is not a Novice.
 748: A parent or Baby was not found.
 
-//749-899 free
+// WoE TE (@agitstart3/@agitend3)
+749: War of Emperium TE has been initiated.
+750: War of Emperium TE is currently in progress.
+751: War of Emperium TE has been ended.
+752: War of Emperium TE is currently not in progress.
+
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
+
+// Channel System
+760: You cannot join channel '%s'. Limit of %d has been met.
+761: %s %s has joined.
+762: You cannot leave channel '%s'.
+763: %s %s left.
+764: You cannot change the color for channel '%s'.
+765: You're not allowed to ban a player.
+766: You cannot kick a player from channel '%s'.
+767: You're not allowed to kick a player.
+768: %s %s has been kicked.
+769: %s %s has been banned.
+770: %s %s has been unbanned.
+
+//771-899 free
 
 //------------------------------------
 // More atcommands message
@@ -949,7 +979,8 @@
 // @rates
 1024: MVP Drop Rates: Common %.2fx / Healing %.2fx / Usable %.2fx / Equipment %.2fx / Card %.2fx
 
-//1025: free
+// @recall
+1025: The player is currently autotrading and cannot be recalled.
 
 // @kick
 1026: Please enter a player name (usage: @kick <char name/ID>).
@@ -1231,7 +1262,7 @@
 1230: Please enter a player name (usage: @trade <char name>).
 
 // @setbattleflag
-1231: Usage: @setbattleflag <flag> <value>
+1231: Usage: @setbattleflag <flag> <value> {<reload>}
 1232: Unknown battle_config flag.
 1233: Set battle_config as requested.
 
@@ -1615,5 +1646,14 @@
 // Roulette
 1497: Roulette is disabled
 
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
+// @clanspy
+1499: Please enter a clan name/ID (usage: @clanspy <clan_name/ID>).
+1500: No longer spying on the %s clan.
+1501: Spying on the %s clan.
+1502: Incorrect clan name/ID.
+
 //Custom translations
 //import: conf/msg_conf/import/map_msg_eng_conf.txt

conf/msg_conf/map_msg_chn.conf

@@ -283,7 +283,7 @@
 266: 你的某些物品不能被出售，它將從你的商店中被取消掉
 267: '%s' 該地圖被重置
 268: 重新載入今天的訊息
-269: 顯示 %d 分之 %d 關聯
+269: 顯示 %d 關聯
 //@me output format
 270: * :%s %s: *
 271: 在這張地圖你無法丟棄物品
@@ -674,6 +674,17 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
+
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
 
 //------------------------------------
 // More atcommands message
@@ -827,9 +838,6 @@
 // @charunblock
 1024: 請輸入角色名稱 (用法: @charunblock <char name>).
 
-// @charunban
-1025: 請輸入角色名稱 (用法: @charunban <char name>).
-
 // @kick
 1026: 請輸入角色名稱 (用法: @kick <char name/ID>).
 
@@ -1486,5 +1494,9 @@
 1492: 使用方法: @dropall {<類型>}
 1493: 類型列表: (預設值) 全部 = -1, 藥水/料理 = 0, 消耗品 = 2, 其他 = 3, 武器 = 4, 防具 = 5, 卡片 = 6, 寵物蛋 = 7, 寵物裝備 = 8, 箭/子彈 = 10
 1494: %d 物品已掉落!
+
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
 //Custom translations
 //import: conf/msg_conf/import/map_msg_chn_conf.txt

conf/msg_conf/map_msg_frn.conf

@@ -283,7 +283,7 @@
 266: Certains de vos objets ne peuvent pas être vendus et ont été supprimés du magasin.
 267: Carte '%s' réinitialisée.
 268: Re-lancement du message du jour.
-269: Affichage des premiers %d parmis %d trouvés
+269: Affichage des %d premiers résultats trouvés
 //@me output format
 270: * :%s %s: *
 271: Vous ne pouvez pas déposer d'objets sur cette carte.
@@ -686,6 +686,17 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
+
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
 
 //------------------------------------
 // More atcommands message
@@ -839,9 +850,6 @@
 // @charunblock
 1024: Entrez un nom de Joueur (usage: @charunblock <nom du joueur>).
 
-// @charunban
-1025: Entrez un nom de Joueur (usage: @charunban <nom du joueur>).
-
 // @kick
 1026: Entrez un nom de Joueur (usage: @kick <nom du joueur/ID>).
 
@@ -1479,5 +1487,8 @@
 1478: Différence de niveau pour le partage en équipe changé.
 1479: Mise à jour de la configuration échouée. Character serveur est hors ligne.
 
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
 //Custom translations
 //import: conf/msg_conf/import/map_msg_frn_conf.txt

conf/msg_conf/map_msg_grm.conf

@@ -282,7 +282,7 @@
 266: Manche Items können nicht verkauft werden und werden aus dem Shop entfernt.
 267: '%s' bezeichnetete Maps resettet.
 268: Läd die Nachrichten vom Tag neu.
-269: Zeigt erst %d von %d treffern
+269: Zeigt die ersten %d Treffer an
 //@me output format
 270: * :%s %s: *
 271: Du kannst auf dieser Map keine Items droppen.
@@ -589,6 +589,20 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
+
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
+
+// @guild
+1498: You cannot create a guild because you are in a clan.
 
 //Custom translations
 import: conf/msg_conf/import/map_msg_grm_conf.txt

conf/msg_conf/map_msg_idn.conf

@@ -279,7 +279,7 @@
 266: Beberapa item tidak dapat ditransaksikan dan telah dikeluarkan dari toko.
 267: '%s' map yang dipilih sudah diatur ulang.
 268: 'Pesan Hari Ini' sudah dimuat ulang.
-269: Menampilkan hasil %d dari %d
+269: Menampilkan hasil %d
 //@me format keluaran
 270: * :%s %s: *
 271: Kamu tidak bisa membuang item di map ini.
@@ -719,6 +719,8 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
 
 // @vip
 700: Penggunaan: @vip <waktu> <nama pemain>
@@ -769,7 +771,7 @@
 
 732: Item tidak dapat dibuka ketika inventory penuh.
 
-733: Item '%s' belum tersimpan di gerobak. Harap masuk kembali untuk dapat menyimpan informasi vending dengan benar.
+//733 free
 
 // @cloneequip/@clonestat
 734: Tidak dapat mengkloning %s diri sendiri.
@@ -778,7 +780,16 @@
 737: Status '%s' (%d) tidak dapat ditiru, batas status (%d).
 738: Kloning '%s' selesai.
 
-//739-899 kosong
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
+
+//760-899 kosong
 
 //------------------------------------
 // Pesan dalam perintah atcommand
@@ -1592,5 +1603,8 @@
 
 1497: Roulette tidak tersedia.
 
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
 //Bila ada terjemahan lain
 //import: conf/msg_conf/import/map_msg_idn_conf.txt

conf/msg_conf/map_msg_por.conf

@@ -288,7 +288,7 @@
 266: Alguns de seus itens não podem ser vendidos e foram removidos de sua venda.
 267: '%s' mapas designados redefinidos.
 268: Recarregada Mensagem do Dia.
-269: Exibindo o primeiro %d de %d resultados
+269: Exibindo o primeiro %d resultados
 //Formato de saída do @me
 270: * :%s %s: *
 271: Você não pode derrubar itens neste mapa
@@ -666,6 +666,17 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
+
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
 
 //------------------------------------
 // Mais mensagens de atcommand
@@ -819,9 +830,6 @@
 // @charunblock
 1024: Digite o nome de um jogador (uso: @charunblock <nome do personagem>).
 
-// @charunban
-1025: Digite o nome de um jogador (uso: @charunban <nome do personagem>).
-
 // @kick
 1026: Digite o nome de um jogador (uso: @kick <nome do personagem/ID>).
 
@@ -1455,5 +1463,8 @@
 1475: ---- Meus Canais ----
 1476: Você ainda não está em nenhum canal.
 
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
 //Custom translations
 //import: conf/msg_conf/import/map_msg_por_conf.txt

conf/msg_conf/map_msg_rus.conf

@@ -281,7 +281,7 @@
 266: Некоторые из ваших товаров не могут быть проданы, поэтому они удалены из магазина.
 267: '%s' обозначеных карт сброшено.
 268: Сообщение дня перезагружено.
-269: Показаны первые %d из %d результатов
+269: Показаны первые %d результатов
 // Сообщение команды @me
 270: * :%s %s: *
 271: Вы не можете выбрасывать предметы на этой локации.
@@ -685,8 +685,19 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
 
-//698-899 НЕ ИСПОЛЬЗУЕТСЯ
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
+
+//760-899 НЕ ИСПОЛЬЗУЕТСЯ
 
 //------------------------------------
 // Сообщения ралзичных команд
@@ -840,9 +851,6 @@
 // @charunblock
 1024: Введите ник персонажа (Использование: @charunblock <ник персонажа>).
 
-// @charunban
-1025: Введите ник персонажа (Использование: @charunban <ник персонажа>).
-
 // @kick
 1026: Введите ник персонажа (Использование: @kick <ID/ник персонажа>).
 
@@ -1479,5 +1487,8 @@
 1478: Диапазон уровней разделения опыта между участниками группы успешно изменен.
 1479: Невозможно обновить конфигурацию. Character-сервер выключен.
 
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
 // Пользовательский перевод
 //import: conf/msg_conf/import/map_msg_rus_conf.txt

conf/msg_conf/map_msg_spn.conf

@@ -283,7 +283,7 @@
 266: Algunos de tus objetos se han retirado de la tienda porque no pueden venderse.
 267: Se han reiniciado los mapas designados a '%s'.
 268: Has actualizado el mensaje del día.
-269: Se muestran %d de un total de %d resultados.
+269: Se muestran %d resultados
 //Formato de @me
 270: * :%s %s: *
 271: No puedes tirar objetos al suelo en este mapa.
@@ -673,6 +673,17 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
+
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
 
 //------------------------------------
 // Más mensajes relacionados con comandos
@@ -826,9 +837,6 @@
 // @charunblock
 1024: Introduce el nombre de un jugador bloqueado (Instrucciones: @charunblock <nombre del personaje>).
 
-// @charunban
-1025: Introduce el nombre de un jugador bloqueado temporalmente (Instrucciones: @charunban <nombre del personaje>).
-
 // @kick
 1026: Introduce el nombre de un personaje (Instrucciones: @kick <nombre del personaje/ID>).
 
@@ -1458,5 +1466,8 @@
 1475: ---- Mis canales ----
 1476: No te has unido a ningún canal.
 
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
 //Traducciones personalizadas
 //import: conf/msg_conf/import/map_msg_spn_conf.txt

conf/msg_conf/map_msg_tha.conf

@@ -283,7 +283,7 @@
 266: ÁÕºÒ§ Item ¢Í§¤Ø³äÁèÊÒÁÒö¹ÓÁÒµÑé§ÃéÒ¹¢Ò¢ͧä´é ¡ÃسҹÓÍÍ¡¨Ò¡ÃÒ¡ÒõÑé§ÃéÒ¹.
 267: '%s' designated maps reset.
 268: ¢éͤÇÒÁ»ÃШÓÇѹ ä´é¶Ù¡âËÅ´ãËÁèàÃÕºÃéÍÂáÅéÇ.
-269: áÊ´§¼Å¡Òäé¹ËÒ %d Íѹ´Ñºáá¨Ò¡·Ñé§ËÁ´ %d ·Õ辺
+269: áÊ´§¼Å¡Òäé¹ËÒ %d ·Õ辺
 //@me output format
 270: * :%s %s: *
 271: ¤Ø³äÁèÊÒÁÒöâ¹ item ŧ¾×é¹ã¹á¼¹·Õè¹Õéä´é.
@@ -680,6 +680,17 @@
 695: Rebellion
 696: Oktoberfest
 697: Summoner
+698: Baby Summoner
+699: Baby Ninja
+
+// Expanded Baby Jobs
+753: Baby Kagerou
+754: Baby Oboro
+755: Baby Taekwon
+756: Baby Star Gladiator
+757: Baby Soul Linker
+758: Baby Gunslinger
+759: Baby Rebellion
 
 //------------------------------------
 // More atcommands message
@@ -833,9 +844,6 @@
 // @charunblock
 1024: â»Ã´Ãкت×è͵ÑÇÅФà (ÇÔ¸Õãªé: @charunblock <ª×è͵ÑÇÅФÃ>).
 
-// @charunban
-1025: â»Ã´Ãкت×è͵ÑÇÅФà (ÇÔ¸Õãªé: @charunban <ª×è͵ÑÇÅФÃ>).
-
 // @kick
 1026: â»Ã´Ãкت×è͵ÑÇÅФà (ÇÔ¸Õãªé: @kick <ª×èÍ/ID µÑÇÅФÃ>).
 
@@ -1498,5 +1506,8 @@
 // Roulette
 1497: Ãкº Roulette »Ô´¡ÒÃãªé§Ò¹
 
+// @guild
+1498: You cannot create a guild because you are in a clan.
+
 //Custom translations
 //import: conf/msg_conf/import/map_msg_tha_conf.txt

conf/readme.txt

@@ -19,4 +19,4 @@ and you'll eliminate any problems updating in the future.
 
 Neat, isn't it?
 
-- Semi-guide by Ajarn / Euphy
+- Semi-guide by Ajarn / Euphy

configure

@@ -696,6 +696,7 @@ enable_manager
 enable_packetver
 enable_debug
 enable_prere
+enable_vip
 enable_warn
 enable_buildbot
 enable_rdtsc
@@ -1335,6 +1336,8 @@ Optional Features:
                           (available options: yes, no, gdb)
   --enable-prere[=ARG]    Compiles serv in prere mode. (disabled by default)
                           (available options: yes, no)
+  --enable-vip[=ARG]      Compiles serv with vip features. (disabled by default)
+                          (available options: yes, no)
   --enable-warn[=ARG]     Compiles with warnings. (disabled by default)
                           (available options: yes, no, extra)
   --enable-buildbot[=ARG] (available options: yes, no)
@@ -3506,6 +3509,26 @@ fi
 
 
 
+#
+# VIP
+#
+# Check whether --enable-vip was given.
+if test "${enable_vip+set}" = set; then :
+  enableval=$enable_vip;
+		enable_vip="$enableval"
+		case $enableval in
+			"no");;
+			"yes");;
+			*) as_fn_error $? "invalid argument --enable-vip=$enableval... stopping" "$LINENO" 5;;
+		esac
+
+else
+  enable_vip="no"
+
+fi
+
+
+
 #
 # warn
 #
@@ -6334,6 +6357,19 @@ case $enable_prere in
 		;;
 esac
 
+#
+# VIP
+#
+case $enable_vip in
+	"no")
+		# default value
+		CPPFLAGS="$CPPFLAGS"
+		;;
+	"yes")
+		CPPFLAGS="$CPPFLAGS -DVIP_ENABLE"
+		;;
+esac
+
 #
 # Warnings
 #

configure.in

@@ -100,6 +100,30 @@ AC_ARG_ENABLE(
 )
 
 
+#
+# VIP
+#
+AC_ARG_ENABLE(
+	[vip],
+	AC_HELP_STRING(
+		[--enable-vip@<:@=ARG@:>@],
+		[
+			Compiles serv with vip features. (disabled by default)
+			(available options: yes, no)
+		]
+	),
+	[
+		enable_vip="$enableval"
+		case $enableval in
+			"no");;
+			"yes");;
+			*) AC_MSG_ERROR([[invalid argument --enable-vip=$enableval... stopping]]);;
+		esac
+	],
+	[enable_vip="no"]
+)
+
+
 #
 # warn
 #
@@ -999,6 +1023,19 @@ case $enable_prere in
 		;;
 esac
 
+#
+# VIP
+#
+case $enable_vip in
+	"no")
+		# default value
+		CPPFLAGS="$CPPFLAGS"
+		;;
+	"yes")
+		CPPFLAGS="$CPPFLAGS -DVIP_ENABLE"
+		;;
+esac
+
 #
 # Warnings
 #

db/castle_db.txt

@@ -9,18 +9,19 @@
 // 04. OnGuildBreakEventName    NPC unique name to invoke ::OnGuildBreak on, when a occupied
 //                              castle is abandoned during guild break.
 
-0,aldeg_cas01,Neuschwanstein,Agit#aldeg_cas01		// kRO : Noisyubantian
-1,aldeg_cas02,Hohenschwangau,Agit#aldeg_cas02		// kRO : Hohensyubangawoo
-2,aldeg_cas03,Nuernberg,Agit#aldeg_cas03			// kRO : Nyirenverk
-3,aldeg_cas04,Wuerzburg,Agit#aldeg_cas04			// kRO : Byirtsburi
+// WOE FE castle
+0,aldeg_cas01,Neuschwanstein,Agit#aldeg_cas01	// kRO : Noisyubantian
+1,aldeg_cas02,Hohenschwangau,Agit#aldeg_cas02	// kRO : Hohensyubangawoo
+2,aldeg_cas03,Nuernberg,Agit#aldeg_cas03		// kRO : Nyirenverk
+3,aldeg_cas04,Wuerzburg,Agit#aldeg_cas04		// kRO : Byirtsburi
 4,aldeg_cas05,Rothenburg,Agit#aldeg_cas05		// kRO : Rotenburk
 5,gefg_cas01,Repherion,Agit#gefg_cas01			// kRO : Reprion
 6,gefg_cas02,Eeyolbriggar,Agit#gefg_cas02		// kRO : Yolbriger
 7,gefg_cas03,Yesnelph,Agit#gefg_cas03			// kRO : Isinlife
-8,gefg_cas04,Bergel,Agit#gefg_cas04			// kRO : Berigel
+8,gefg_cas04,Bergel,Agit#gefg_cas04				// kRO : Berigel
 9,gefg_cas05,Mersetzdeitz,Agit#gefg_cas05		// kRO : Melsedetsu
 10,payg_cas01,Bright Arbor,Agit#payg_cas01		// kRO : Mingting
-11,payg_cas02,Scarlet Palace,Agit#payg_cas02		// kRO : Tiantan
+11,payg_cas02,Scarlet Palace,Agit#payg_cas02	// kRO : Tiantan
 12,payg_cas03,Holy Shadow,Agit#payg_cas03		// kRO : Fuying
 13,payg_cas04,Sacred Altar,Agit#payg_cas04		// kRO : Honglou
 14,payg_cas05,Bamboo Grove Hill,Agit#payg_cas05	// kRO : Zhulinxian
@@ -29,17 +30,33 @@
 17,prtg_cas03,Fadhgridh,Agit#prtg_cas03			// kRO : Lazrigees
 18,prtg_cas04,Skoegul,Agit#prtg_cas04			// kRO : Squagul
 19,prtg_cas05,Gondul,Agit#prtg_cas05			// kRO : Guindull
+
+// WOE NGuild castle
 20,nguild_alde,Earth,Agit_N01
 21,nguild_gef,Air,Agit_N02
 22,nguild_pay,Water,Agit_N03
 23,nguild_prt,Fire,Agit_N04
+
+// WOE SE castle
 24,schg_cas01,Himinn,Manager#schg_cas01			// kRO : Himinn
-25,schg_cas02,Andlangr,Manager#schg_cas02			// kRO : Andlangr
-26,schg_cas03,Viblainn,Manager#schg_cas03			// kRO : Viblainn
+25,schg_cas02,Andlangr,Manager#schg_cas02		// kRO : Andlangr
+26,schg_cas03,Viblainn,Manager#schg_cas03		// kRO : Viblainn
 27,schg_cas04,Hljod,Manager#schg_cas04			// kRO : Hljod
-28,schg_cas05,Skidbladnir,Manager#schg_cas05			// kRO : Skidbladnir
+28,schg_cas05,Skidbladnir,Manager#schg_cas05	// kRO : Skidbladnir
 29,arug_cas01,Mardol,Manager#arug_cas01			// kRO : Mardol
 30,arug_cas02,Cyr,Manager#arug_cas02			// kRO : Cyr
 31,arug_cas03,Horn,Manager#arug_cas03			// kRO : Horn
 32,arug_cas04,Gefn,Manager#arug_cas04			// kRO : Gefn
 33,arug_cas05,Bandis,Manager#arug_cas05			// kRO : Bandis
+
+// WOE TE castle
+34,te_aldecas1,Kafragarten 1,Manager_TE#Glaris
+35,te_aldecas2,Kafragarten 2,Manager_TE#Defolty
+36,te_aldecas3,Kafragarten 3,Manager_TE#Sorin
+37,te_aldecas4,Kafragarten 4,Manager_TE#Bennit
+38,te_aldecas5,Kafragarten 5,Manager_TE#W
+39,te_prtcas01,Gloria 1,Manager_TE#Gaebolg
+40,te_prtcas02,Gloria 2,Manager_TE#Richard
+41,te_prtcas03,Gloria 3,Manager_TE#Wigner
+42,te_prtcas04,Gloria 4,Manager_TE#Heine
+43,te_prtcas05,Gloria 5,Manager_TE#Nerious

db/const.txt

@@ -14,460 +14,6 @@
 //                  in field Value. Depending on the implementation values assigned by scripts to parameters will affect
 //                  runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
 
-//Item Group ID
-IG_BlueBox	1
-IG_VioletBox	2
-IG_CardAlbum	3
-IG_GiftBox	4
-IG_ScrollBox	5
-IG_FingingOre	6
-IG_CookieBag	7
-IG_FirstAid	8
-IG_Herb	9
-IG_Fruit	10
-IG_Meat	11
-IG_Candy	12
-IG_Juice	13
-IG_Fish	14
-IG_Box	15
-IG_Gemstone	16
-IG_Resist	17
-IG_Ore	18
-IG_Food	19
-IG_Recovery	20
-IG_Mineral	21
-IG_Taming	22
-IG_Scroll	23
-IG_Quiver	24
-IG_Mask	25
-IG_Accesory	26
-IG_Jewel	27
-IG_GiftBox_1	28
-IG_GiftBox_2	29
-IG_GiftBox_3	30
-IG_GiftBox_4	31
-IG_EggBoy	32
-IG_EggGirl	33
-IG_GiftBoxChina	34
-IG_LottoBox	35
-IG_FoodBag	36
-IG_Potion	37
-IG_RedBox_2	38
-IG_BleuBox	39
-IG_RedBox	40
-IG_GreenBox	41
-IG_YellowBox	42
-IG_OldGiftBox	43
-IG_MagicCardAlbum	44
-IG_HometownGift	45
-IG_Masquerade	46
-IG_Tresure_Box_WoE	47
-IG_Masquerade_2	48
-IG_Easter_Scroll	49
-IG_Pierre_Treasurebox	50
-IG_Cherish_Box	51
-IG_Cherish_Box_Ori	52
-IG_Louise_Costume_Box	53
-IG_Xmas_Gift	54
-IG_Fruit_Basket	55
-IG_Improved_Coin_Bag	56
-IG_Intermediate_Coin_Bag	57
-IG_Minor_Coin_Bag	58
-IG_S_Grade_Coin_Bag	59
-IG_A_Grade_Coin_Bag	60
-IG_Advanced_Weapons_Box	61
-IG_Splendid_Box	62
-IG_CardAlbum_Armor	63
-IG_CardAlbum_Helm	64
-IG_CardAlbum_Acc	65
-IG_CardAlbum_Shoes	66
-IG_CardAlbum_Shield	67
-IG_CardAlbum_Weapon	68
-IG_CardAlbum_Garment	69
-IG_Flamel_Card	70
-IG_Special_Box	71
-IG_Tresure_Box_WoE_	72
-IG_RWC_Parti_Box	73
-IG_RWC_Final_Comp_Box	74
-IG_Gift_Bundle	75
-IG_Caracas_Ring_Box	76
-IG_Crumpled_Paper	77
-IG_Solo_Gift_Basket	78
-IG_Couple_Event_Basket	79
-IG_GM_Warp_Box	80
-IG_Fortune_Cookie1	81
-IG_Fortune_Cookie2	82
-IG_Fortune_Cookie3	83
-IG_New_Gift_Envelope	84
-IG_Passion_FB_Hat_Box	85
-IG_Cool_FB_Hat_Box	86
-IG_Victory_FB_Hat_Box	87
-IG_Glory_FB_Hat_Box	88
-IG_Passion_Hat_Box2	89
-IG_Cool_Hat_Box2	90
-IG_Victory_Hat_Box2	91
-IG_Aspersio_5_Scroll_Box	92
-IG_Pet_Egg_Scroll_Box1	93
-IG_Pet_Egg_Scroll_Box2	94
-IG_Pet_Egg_Scroll1	95
-IG_Pet_Egg_Scroll2	96
-IG_Pet_Egg_Scroll_Box3	97
-IG_Pet_Egg_Scroll_Box4	98
-IG_Pet_Egg_Scroll_Box5	99
-IG_Pet_Egg_Scroll3	100
-IG_Pet_Egg_Scroll4	101
-IG_Pet_Egg_Scroll5	102
-IG_Infiltrator_Box	103
-IG_Muramasa_Box	104
-IG_Excalibur_Box	105
-IG_Combat_Knife_Box	106
-IG_Counter_Dagger_Box	107
-IG_Kaiser_Knuckle_Box	108
-IG_Pole_Axe_Box	109
-IG_Mighty_Staff_Box	110
-IG_Right_Epsilon_Box	111
-IG_Balistar_Box	112
-IG_Diary_Of_Great_Sage_Box	113
-IG_Asura_Box	114
-IG_Apple_Of_Archer_Box	115
-IG_Bunny_Band_Box	116
-IG_Sahkkat_Box	117
-IG_Lord_Circlet_Box	118
-IG_Elven_Ears_Box	119
-IG_Steel_Flower_Box	120
-IG_Critical_Ring_Box	121
-IG_Earring_Box	122
-IG_Ring_Box	123
-IG_Necklace_Box	124
-IG_Glove_Box	125
-IG_Brooch_Box	126
-IG_Rosary_Box	127
-IG_Safety_Ring_Box	128
-IG_Vesper_Core01_Box	129
-IG_Vesper_Core02_Box	130
-IG_Vesper_Core03_Box	131
-IG_Vesper_Core04_Box	132
-IG_Pet_Egg_Scroll_Box6	133
-IG_Pet_Egg_Scroll_Box7	134
-IG_Pet_Egg_Scroll_Box8	135
-IG_Pet_Egg_Scroll_Box9	136
-IG_Pet_Egg_Scroll_Box10	137
-IG_Pet_Egg_Scroll_Box11	138
-IG_Pet_Egg_Scroll6	139
-IG_Pet_Egg_Scroll7	140
-IG_Pet_Egg_Scroll8	141
-IG_Pet_Egg_Scroll9	142
-IG_Pet_Egg_Scroll10	143
-IG_Pet_Egg_Scroll11	144
-IG_CP_Helm_Scroll_Box	145
-IG_CP_Shield_Scroll_Box	146
-IG_CP_Armor_Scroll_Box	147
-IG_CP_Weapon_Scroll_Box	148
-IG_Repair_Scroll_Box	149
-IG_Super_Pet_Egg1	150
-IG_Super_Pet_Egg2	151
-IG_Super_Pet_Egg3	152
-IG_Super_Pet_Egg4	153
-IG_Super_Card_Pet_Egg1	154
-IG_Super_Card_Pet_Egg2	155
-IG_Super_Card_Pet_Egg3	156
-IG_Super_Card_Pet_Egg4	157
-IG_Vigorgra_Package1	158
-IG_Vigorgra_Package2	159
-IG_Vigorgra_Package3	160
-IG_Vigorgra_Package4	161
-IG_Vigorgra_Package5	162
-IG_Vigorgra_Package6	163
-IG_Vigorgra_Package7	164
-IG_Vigorgra_Package8	165
-IG_Vigorgra_Package9	166
-IG_Vigorgra_Package10	167
-IG_Vigorgra_Package11	168
-IG_Vigorgra_Package12	169
-IG_Pet_Egg_Scroll12	170
-IG_Pet_Egg_Scroll13	171
-IG_Pet_Egg_Scroll14	172
-IG_Super_Pet_Egg5	173
-IG_Super_Pet_Egg6	174
-IG_Super_Pet_Egg7	175
-IG_Super_Pet_Egg8	176
-IG_Pet_Egg_Scroll_E	177
-IG_Ramen_Hat_Box	178
-IG_Mysterious_Travel_Sack1	179
-IG_Mysterious_Travel_Sack2	180
-IG_Mysterious_Travel_Sack3	181
-IG_Mysterious_Travel_Sack4	182
-IG_Magician_Card_Box	183
-IG_Acolyte_Card_Box	184
-IG_Archer_Card_Box	185
-IG_Swordman_Card_Box	186
-IG_Thief_Card_Box	187
-IG_Merchant_Card_Box	188
-IG_Hard_Core_Set_Box	189
-IG_Kitty_Set_Box	190
-IG_Soft_Core_Set_Box	191
-IG_Deviruchi_Set_Box	192
-IG_MVP_Hunt_Box	193
-IG_Brewing_Box	194
-IG_Xmas_Pet_Scroll	195
-IG_Lucky_Scroll08	196
-IG_Br_SwordPackage	197
-IG_Br_MagePackage	198
-IG_Br_AcolPackage	199
-IG_Br_ArcherPackage	200
-IG_Br_MerPackage	201
-IG_Br_ThiefPackage	202
-IG_Acidbomb_10_Box	203
-IG_Basic_Siege_Supply_Box	204
-IG_Adv_Siege_Supply_Box	205
-IG_Elite_Siege_Supply_Box	206
-IG_Sakura_Scroll	207
-IG_Beholder_Ring_Box	208
-IG_Hallow_Ring_Box	209
-IG_Clamorous_Ring_Box	210
-IG_Chemical_Ring_Box	211
-IG_Insecticide_Ring_Box	212
-IG_Fisher_Ring_Box	213
-IG_Decussate_Ring_Box	214
-IG_Bloody_Ring_Box	215
-IG_Satanic_Ring_Box	216
-IG_Dragoon_Ring_Box	217
-IG_Angel_Scroll	218
-IG_Devil_Scroll	219
-IG_Surprise_Scroll	220
-IG_July7_Scroll	221
-IG_Bacsojin_Scroll	222
-IG_Animal_Scroll	223
-IG_Heart_Scroll	224
-IG_New_Year_Scroll	225
-IG_Valentine_Pledge_Box	226
-IG_Ox_Tail_Scroll	227
-IG_Buddah_Scroll	228
-IG_Evil_Incarnation	229
-IG_F_Clover_Box_Mouth	230
-IG_Mouth_Bubble_Gum_Box	231
-IG_F_Clover_Box_Mouth2	232
-IG_F_Clover_Box_Mouth4	233
-IG_BGum_Box_In_Mouth2	234
-IG_BGum_Box_In_Mouth4	235
-IG_Tw_October_Scroll	236
-IG_My_Scroll1	237
-IG_Tw_Nov_Scroll	238
-IG_My_Scroll2	239
-IG_Pr_Reset_Stone_Box	240
-IG_FPr_Reset_Stone_Box	241
-IG_Majestic_Devil_Scroll	242
-IG_Life_Ribbon_Box	243
-IG_Life_Ribbon_Box2	244
-IG_Life_Ribbon_Box3	245
-IG_Magic_Candy_Box10	246
-IG_RWC2010_SuitcaseA	247
-IG_RWC2010_SuitcaseB	248
-IG_Sagittarius_Scroll	249
-IG_Sagittarius_Scr_Box	250
-IG_Sagittar_Diadem_Scroll	251
-IG_Sagittar_Di_Scroll_Box	252
-IG_Capri_Crown_Scroll	253
-IG_Capri_Crown_Scroll_Box	254
-IG_Capricon_Di_Scroll	255
-IG_Capricon_Di_Scroll_Box	256
-IG_Aquarius_Diadem_Scroll	257
-IG_Aquarius_Di_Scroll_Box	258
-IG_Lovely_Aquarius_Scroll	259
-IG_Lovely_Aquarius_Box	260
-IG_Pisces_Diadem_Scroll	261
-IG_Pisces_Diadem_Box	262
-IG_Energetic_Pisces_Scroll	263
-IG_Energetic_Pisces_Box	264
-IG_Aries_Scroll	265
-IG_Aries_Scroll_Box	266
-IG_Boarding_Halter_Box	267
-IG_Taurus_Diadem_Scroll	268
-IG_Taurus_Di_Scroll_Box	269
-IG_Umbala_Spirit_Box2	270
-IG_F_Umbala_Spirit_Box2	271
-IG_Taurus_Crown_Scroll	272
-IG_Taurus_Crown_Scroll_Box	273
-IG_Gemi_Diadem_Scroll	274
-IG_Gemi_Diadem_Scroll_Box	275
-IG_Super_Pet_Egg1_2	276
-IG_Super_Pet_Egg4_2	277
-IG_Fire_Brand_Box	278
-IG_BR_Independence_Scroll	279
-IG_All_In_One_Ring_Box	280
-IG_Gemi_Crown_Scroll	281
-IG_Gemi_Crown_Scroll_Box	282
-IG_RWC_Special_Scroll	283
-IG_RWC_Limited_Scroll	284
-IG_Asgard_Scroll	285
-IG_Ms_Cancer_Scroll	286
-IG_RWC_Super_Scroll	287
-IG_Leo_Scroll	288
-IG_Ms_Virgo_Scroll	289
-IG_Lucky_Egg_C6	290
-IG_Libra_Scroll	291
-IG_Hallo_Scroll	292
-IG_Ms_Scorpio_Scroll	293
-IG_TCG_Card_Scroll	294
-IG_Boitata_Scroll	295
-IG_Lucky_Egg_C2	296
-//IG_Lucky_Egg_C6	297
-IG_Lucky_Egg_C9	298
-IG_Lucky_Egg_C7	299
-IG_Lucky_Egg_C8	300
-IG_Lucky_Egg_C10	301
-IG_Wind_Type_Scroll	302
-IG_Lucky_Egg_C3	303
-IG_Lucky_Egg_C4	304
-IG_Lucky_Egg_C5	305
-IG_Weather_Report_Box	306
-IG_Comin_Actor_Box	307
-IG_Hen_Set_Box	308
-IG_Lucky_Egg_C	309
-IG_Water_Type_Scroll	310
-IG_Earth_Type_Scroll	311
-//IG_Earth_Type_Scroll	312
-IG_Splash_Scroll	313
-IG_Vocation_Scroll	314
-IG_Wisdom_Scroll	315
-IG_Patron_Scroll	316
-IG_Heaven_Scroll	317
-IG_Tw_Aug_Scroll	318
-IG_Tw_Nov_Scroll2	319
-IG_Illusion_Nothing	320
-IG_Tw_Sep_Scroll	321
-IG_Flame_Light	322
-IG_Tw_Rainbow_Scroll	323
-IG_Tw_Red_Scroll	324
-IG_Tw_Orange_Scroll	325
-IG_Tw_Yellow_Scroll	326
-IG_Scroll_Of_Death	327
-IG_Scroll_Of_Life	328
-IG_Scroll_Of_Magic	329
-IG_Scroll_Of_Thews	330
-IG_Scroll_Of_Darkness	331
-IG_Scroll_Of_Holiness	332
-IG_Horned_Scroll	333
-IG_Mercury_Scroll	334
-IG_Challenge_Kit	335
-IG_Tw_April_Scroll	336
-//IG_Tw_October_Scroll	337
-IG_Summer_Scroll3	338
-IG_C_Wing_Of_Fly_3Day_Box	339
-IG_RWC_2012_Set_Box	340
-IG_Ex_Def_Potion_Box	341
-IG_RWC_Scroll_2012	342
-IG_Old_Coin_Pocket	343
-IG_High_Coin_Pocket	344
-IG_Mid_Coin_Pocket	345
-IG_Low_Coin_Pocket	346
-IG_Sgrade_Pocket	347
-IG_Agrade_Pocket	348
-IG_Bgrade_Pocket	349
-IG_Cgrade_Pocket	350
-IG_Dgrade_Pocket	351
-IG_Egrade_Pocket	352
-IG_Ptotection_Seagod_Box	353
-IG_Hairtail_Box1	354
-IG_Hairtail_Box2	355
-IG_Spearfish_Box1	356
-IG_Spearfish_Box2	357
-IG_Saurel_Box1	358
-IG_Saurel_Box2	359
-IG_Tuna_Box1	360
-IG_Tuna_Box2	361
-IG_Malang_Crab_Box1	362
-IG_Malang_Crab_Box2	363
-IG_Brindle_Eel_Box1	364
-IG_Brindle_Eel_Box2	365
-IG_Ptotection_Seagod_Box2	366
-IG_Ptotection_Seagod_Box3	367
-IG_Octo_Hstick_Box	368
-IG_Octo_Hstick_Box2	369
-IG_Octo_Hstick_Box3	370
-IG_Silvervine_Fruit_Box10	371
-IG_Silvervine_Fruit_Box40	372
-IG_Silvervine_Fruit_Box4	373
-IG_Malang_Woe_Encard_Box	374
-IG_Xmas_Bless	375
-IG_Fire_Type_Scroll	376
-IG_Blue_Scroll	377
-IG_Good_Student_Gift_Box	378
-IG_Bad_Student_Gift_Box	379
-IG_Indigo_Scroll	380
-IG_Violet_Scroll	381
-IG_Bi_Hwang_Scroll	382
-IG_Jung_Bi_Scroll	383
-IG_Je_Un_Scroll	384
-IG_Yong_Kwang_Scroll	385
-IG_HALLOWEEN_G_BOX	386
-IG_Solo_Christmas_Gift	387
-IG_Sg_Weapon_Supply_Box	388
-IG_Candy_Holder	389
-IG_Lucky_Bag	390
-IG_Holy_Egg_2	391
-IG_Adventurer_Returns_Support_Box	392
-IG_Support_Package	393
-IG_Support_Package10	394
-IG_Event_Almighty_Box	395
-IG_Event_Almighty_Box10	396
-IG_LottoBox1	397
-IG_LottoBox2	398
-IG_LottoBox3	399
-IG_LottoBox4	400
-IG_LottoBox5	401
-IG_Support_Package_III	402
-IG_Support_Package_III10	403
-IG_Unlimited_Box	404
-IG_Unlimited_Box10	405
-IG_Unlimited_Box_II	406
-IG_Unlimited_Box_II10	407
-IG_Three_Master_Package_III	408
-IG_Three_Master_Package_III10	409
-IG_2013_RWC_Scroll	410
-IG_Support_Package_II	411
-IG_Support_Package_II10	412
-IG_Level_Up_Box100	413
-IG_Level_Up_Box120	414
-IG_Level_Up_Box130	415
-IG_Level_Up_Box140	416
-IG_Level_Up_Box150	417
-IG_Level_Up_Box160	418
-IG_Gift_Buff_Set        419
-IG_Lucky_Silvervine_Fruit_Box_III10        420
-IG_Lucky_Silvervine_Fruit_Box_III110        421
-IG_Old_Ore_Box	422
-IG_Blessing_Lucky_Egg	423
-IG_Sograt_Lucky_Egg	424
-IG_Garnet_Lucky_Egg	425
-IG_Amora_Lucky_Egg	426
-IG_Venus_Lucky_Egg	427
-IG_Erzulie_Lucky_Egg	428
-IG_Majestic_Lucky_Egg	429
-IG_Epic_Heroes_Lucky_Egg	430
-IG_Hero_Midgard_Egg	431
-IG_Midgard_Celebration_Lucky_Egg	432
-IG_Rune_Midgard_Imortal_Lucky_Egg	433
-IG_Rise_Midgard_Lucky_Egg	434
-IG_Time_Travel_Lucky_Egg	435
-IG_Solaris_Festival_Scroll	436
-IG_Midgard_Festival_Egg	437
-IG_Midgard_Egg	438
-IG_Sweet_Midgard_Egg	439
-IG_Winter_Midgard_Egg	440
-IG_Spring_Festival_Lucky_Egg	441
-IG_Birthday_IdRO10th_Scroll	442
-IG_Requiem_Egg	443
-IG_Holy_Spirit_Egg	444
-IG_Memorial_Garuda_Lucky_Egg	445
-IG_Miracle_Lucky_Egg	446
-IG_Legend_Hero_Lucky_Egg	447
-IG_Blessing_Midgard_Lucky_Egg	448
-IG_Chronosian_Lucky_Egg	449
-IG_Sanctuary_Lucky_Egg	450
-IG_Cyborg_Lucky_Egg	451
-IG_Undine_Lucky_Egg	452
-
 EF_NONE	-1
 EF_HIT1	0
 EF_HIT2	1
@@ -1568,6 +1114,252 @@ EF_TIME_ACCESSORY	1095
 EF_SPRITEMABLE	1096
 EF_TUNAPARTY	1097
 
+HAT_EF_BLOSSOM_FLUTTERING	1
+HAT_EF_MERMAID_LONGING	2
+HAT_EF_RL_BANISHING_BUSTER	3
+HAT_EF_LJOSALFAR	4
+HAT_EF_CLOCKING	5
+HAT_EF_SNOW	6
+HAT_EF_MAKEBLUR	7
+HAT_EF_SLEEPATTACK	8
+HAT_EF_GUMGANG	9
+HAT_EF_TALK_FROSTJOKE	10
+HAT_EF_DEMONSTRATION	11
+HAT_EF_FLUTTER_BUTTERFLY	12
+HAT_EF_ANGEL_FLUTTERING	13
+HAT_EF_BLESSING_OF_ANGELS	14
+HAT_EF_ELECTRIC	15
+HAT_EF_GREEN_FLOOR	16
+HAT_EF_SHRINK	17
+HAT_EF_VALHALLA_IDOL	18
+HAT_EF_ANGEL_STAIRS	19
+HAT_EF_GLOW_OF_NEW_YEAR	20
+HAT_EF_BOTTOM_FORTUNEKISS	21
+HAT_EF_PINKBODY	22
+HAT_EF_DOUBLEGUMGANG	23
+HAT_EF_GIANTBODY	24
+HAT_EF_GREEN99_6	25
+HAT_EF_CIRCLEPOWER	26
+HAT_EF_BOTTOM_BLOODYLUST	27
+HAT_EF_WATER_BELOW	28
+HAT_EF_LEVEL99_150	29
+HAT_EF_YELLOWFLY3	30
+HAT_EF_KAGEMUSYA	31
+HAT_EF_CHERRYBLOSSOM	32
+HAT_EF_STRANGELIGHTS	33
+HAT_EF_WL_TELEKINESIS_INTENSE	34
+HAT_EF_AB_OFFERTORIUM_RING	35
+HAT_EF_WHITEBODY2	36
+HAT_EF_SAKURA	37
+HAT_EF_CLOUD2	38
+HAT_EF_FEATHER_FLUTTERING	39
+HAT_EF_CAMELLIA_HAIR_PIN	40
+HAT_EF_JP_EV_EFFECT01	41
+HAT_EF_JP_EV_EFFECT02	42
+HAT_EF_JP_EV_EFFECT03	43
+HAT_EF_FLORAL_WALTZ	44
+HAT_EF_MAGICAL_FEATHER	45
+HAT_EF_HAT_EFFECT	46
+HAT_EF_BAKURETSU_HADOU	47
+HAT_EF_GOLD_SHOWER	48
+HAT_EF_WHITEBODY	49
+HAT_EF_WATER_BELOW2	50
+HAT_EF_FIREWORK  51
+
+RDMOPT_VAR_MAXHPAMOUNT	1
+RDMOPT_VAR_MAXSPAMOUNT	2
+RDMOPT_VAR_STRAMOUNT	3
+RDMOPT_VAR_AGIAMOUNT	4
+RDMOPT_VAR_VITAMOUNT	5
+RDMOPT_VAR_INTAMOUNT	6
+RDMOPT_VAR_DEXAMOUNT	7
+RDMOPT_VAR_LUKAMOUNT	8
+RDMOPT_VAR_MAXHPPERCENT	9
+RDMOPT_VAR_MAXSPPERCENT	10
+RDMOPT_VAR_HPACCELERATION	11
+RDMOPT_VAR_SPACCELERATION	12
+RDMOPT_VAR_ATKPERCENT	13
+RDMOPT_VAR_MAGICATKPERCENT	14
+RDMOPT_VAR_PLUSASPD	15
+RDMOPT_VAR_PLUSASPDPERCENT	16
+RDMOPT_VAR_ATTPOWER	17
+RDMOPT_VAR_HITSUCCESSVALUE	18
+RDMOPT_VAR_ATTMPOWER	19
+RDMOPT_VAR_ITEMDEFPOWER	20
+RDMOPT_VAR_MDEFPOWER	21
+RDMOPT_VAR_AVOIDSUCCESSVALUE	22
+RDMOPT_VAR_PLUSAVOIDSUCCESSVALUE	23
+RDMOPT_VAR_CRITICALSUCCESSVALUE	24
+RDMOPT_ATTR_TOLERACE_NOTHING	25
+RDMOPT_ATTR_TOLERACE_WATER	26
+RDMOPT_ATTR_TOLERACE_GROUND	27
+RDMOPT_ATTR_TOLERACE_FIRE	28
+RDMOPT_ATTR_TOLERACE_WIND	29
+RDMOPT_ATTR_TOLERACE_POISON	30
+RDMOPT_ATTR_TOLERACE_SAINT	31
+RDMOPT_ATTR_TOLERACE_DARKNESS	32
+RDMOPT_ATTR_TOLERACE_TELEKINESIS	33
+RDMOPT_ATTR_TOLERACE_UNDEAD	34
+RDMOPT_ATTR_TOLERACE_ALL	35
+RDMOPT_DAMAGE_PROPERTY_NOTHING_USER	36
+RDMOPT_DAMAGE_PROPERTY_NOTHING_TARGET	37
+RDMOPT_DAMAGE_PROPERTY_WATER_USER	38
+RDMOPT_DAMAGE_PROPERTY_WATER_TARGET	39
+RDMOPT_DAMAGE_PROPERTY_GROUND_USER	40
+RDMOPT_DAMAGE_PROPERTY_GROUND_TARGET	41
+RDMOPT_DAMAGE_PROPERTY_FIRE_USER	42
+RDMOPT_DAMAGE_PROPERTY_FIRE_TARGET	43
+RDMOPT_DAMAGE_PROPERTY_WIND_USER	44
+RDMOPT_DAMAGE_PROPERTY_WIND_TARGET	45
+RDMOPT_DAMAGE_PROPERTY_POISON_USER	46
+RDMOPT_DAMAGE_PROPERTY_POISON_TARGET	47
+RDMOPT_DAMAGE_PROPERTY_SAINT_USER	48
+RDMOPT_DAMAGE_PROPERTY_SAINT_TARGET	49
+RDMOPT_DAMAGE_PROPERTY_DARKNESS_USER	50
+RDMOPT_DAMAGE_PROPERTY_DARKNESS_TARGET	51
+RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_USER	52
+RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_TARGET	53
+RDMOPT_DAMAGE_PROPERTY_UNDEAD_USER	54
+RDMOPT_DAMAGE_PROPERTY_UNDEAD_TARGET	55
+RDMOPT_MDAMAGE_PROPERTY_NOTHING_USER	56
+RDMOPT_MDAMAGE_PROPERTY_NOTHING_TARGET	57
+RDMOPT_MDAMAGE_PROPERTY_WATER_USER	58
+RDMOPT_MDAMAGE_PROPERTY_WATER_TARGET	59
+RDMOPT_MDAMAGE_PROPERTY_GROUND_USER	60
+RDMOPT_MDAMAGE_PROPERTY_GROUND_TARGET	61
+RDMOPT_MDAMAGE_PROPERTY_FIRE_USER	62
+RDMOPT_MDAMAGE_PROPERTY_FIRE_TARGET	63
+RDMOPT_MDAMAGE_PROPERTY_WIND_USER	64
+RDMOPT_MDAMAGE_PROPERTY_WIND_TARGET	65
+RDMOPT_MDAMAGE_PROPERTY_POISON_USER	66
+RDMOPT_MDAMAGE_PROPERTY_POISON_TARGET	67
+RDMOPT_MDAMAGE_PROPERTY_SAINT_USER	68
+RDMOPT_MDAMAGE_PROPERTY_SAINT_TARGET	69
+RDMOPT_MDAMAGE_PROPERTY_DARKNESS_USER	70
+RDMOPT_MDAMAGE_PROPERTY_DARKNESS_TARGET	71
+RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_USER	72
+RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_TARGET	73
+RDMOPT_MDAMAGE_PROPERTY_UNDEAD_USER	74
+RDMOPT_MDAMAGE_PROPERTY_UNDEAD_TARGET	75
+RDMOPT_BODY_ATTR_NOTHING	76
+RDMOPT_BODY_ATTR_WATER	77
+RDMOPT_BODY_ATTR_GROUND	78
+RDMOPT_BODY_ATTR_FIRE	79
+RDMOPT_BODY_ATTR_WIND	80
+RDMOPT_BODY_ATTR_POISON	81
+RDMOPT_BODY_ATTR_SAINT	82
+RDMOPT_BODY_ATTR_DARKNESS	83
+RDMOPT_BODY_ATTR_TELEKINESIS	84
+RDMOPT_BODY_ATTR_UNDEAD	85
+RDMOPT_BODY_ATTR_ALL	86
+RDMOPT_RACE_TOLERACE_NOTHING	87
+RDMOPT_RACE_TOLERACE_UNDEAD	88
+RDMOPT_RACE_TOLERACE_ANIMAL	89
+RDMOPT_RACE_TOLERACE_PLANT	90
+RDMOPT_RACE_TOLERACE_INSECT	91
+RDMOPT_RACE_TOLERACE_FISHS	92
+RDMOPT_RACE_TOLERACE_DEVIL	93
+RDMOPT_RACE_TOLERACE_HUMAN	94
+RDMOPT_RACE_TOLERACE_ANGEL	95
+RDMOPT_RACE_TOLERACE_DRAGON	96
+RDMOPT_RACE_DAMAGE_NOTHING	97
+RDMOPT_RACE_DAMAGE_UNDEAD	98
+RDMOPT_RACE_DAMAGE_ANIMAL	99
+RDMOPT_RACE_DAMAGE_PLANT	100
+RDMOPT_RACE_DAMAGE_INSECT	101
+RDMOPT_RACE_DAMAGE_FISHS	102
+RDMOPT_RACE_DAMAGE_DEVIL	103
+RDMOPT_RACE_DAMAGE_HUMAN	104
+RDMOPT_RACE_DAMAGE_ANGEL	105
+RDMOPT_RACE_DAMAGE_DRAGON	106
+RDMOPT_RACE_MDAMAGE_NOTHING	107
+RDMOPT_RACE_MDAMAGE_UNDEAD	108
+RDMOPT_RACE_MDAMAGE_ANIMAL	109
+RDMOPT_RACE_MDAMAGE_PLANT	110
+RDMOPT_RACE_MDAMAGE_INSECT	111
+RDMOPT_RACE_MDAMAGE_FISHS	112
+RDMOPT_RACE_MDAMAGE_DEVIL	113
+RDMOPT_RACE_MDAMAGE_HUMAN	114
+RDMOPT_RACE_MDAMAGE_ANGEL	115
+RDMOPT_RACE_MDAMAGE_DRAGON	116
+RDMOPT_RACE_CRI_PERCENT_NOTHING	117
+RDMOPT_RACE_CRI_PERCENT_UNDEAD	118
+RDMOPT_RACE_CRI_PERCENT_ANIMAL	119
+RDMOPT_RACE_CRI_PERCENT_PLANT	120
+RDMOPT_RACE_CRI_PERCENT_INSECT	121
+RDMOPT_RACE_CRI_PERCENT_FISHS	122
+RDMOPT_RACE_CRI_PERCENT_DEVIL	123
+RDMOPT_RACE_CRI_PERCENT_HUMAN	124
+RDMOPT_RACE_CRI_PERCENT_ANGEL	125
+RDMOPT_RACE_CRI_PERCENT_DRAGON	126
+RDMOPT_RACE_IGNORE_DEF_PERCENT_NOTHING	127
+RDMOPT_RACE_IGNORE_DEF_PERCENT_UNDEAD	128
+RDMOPT_RACE_IGNORE_DEF_PERCENT_ANIMAL	129
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLANT	130
+RDMOPT_RACE_IGNORE_DEF_PERCENT_INSECT	131
+RDMOPT_RACE_IGNORE_DEF_PERCENT_FISHS	132
+RDMOPT_RACE_IGNORE_DEF_PERCENT_DEVIL	133
+RDMOPT_RACE_IGNORE_DEF_PERCENT_HUMAN	134
+RDMOPT_RACE_IGNORE_DEF_PERCENT_ANGEL	135
+RDMOPT_RACE_IGNORE_DEF_PERCENT_DRAGON	136
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_NOTHING	137
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_UNDEAD	138
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_ANIMAL	139
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLANT	140
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_INSECT	141
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_FISHS	142
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_DEVIL	143
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_HUMAN	144
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_ANGEL	145
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_DRAGON	146
+RDMOPT_CLASS_DAMAGE_NORMAL_TARGET	147
+RDMOPT_CLASS_DAMAGE_BOSS_TARGET	148
+RDMOPT_CLASS_DAMAGE_NORMAL_USER	149
+RDMOPT_CLASS_DAMAGE_BOSS_USER	150
+RDMOPT_CLASS_MDAMAGE_NORMAL	151
+RDMOPT_CLASS_MDAMAGE_BOSS	152
+RDMOPT_CLASS_IGNORE_DEF_PERCENT_NORMAL	153
+RDMOPT_CLASS_IGNORE_DEF_PERCENT_BOSS	154
+RDMOPT_CLASS_IGNORE_MDEF_PERCENT_NORMAL	155
+RDMOPT_CLASS_IGNORE_MDEF_PERCENT_BOSS	156
+RDMOPT_DAMAGE_SIZE_SMALL_TARGET	157
+RDMOPT_DAMAGE_SIZE_MIDIUM_TARGET	158
+RDMOPT_DAMAGE_SIZE_LARGE_TARGET	159
+RDMOPT_DAMAGE_SIZE_SMALL_USER	160
+RDMOPT_DAMAGE_SIZE_MIDIUM_USER	161
+RDMOPT_DAMAGE_SIZE_LARGE_USER	162
+RDMOPT_DAMAGE_SIZE_PERFECT	163
+RDMOPT_DAMAGE_CRI_TARGET	164
+RDMOPT_DAMAGE_CRI_USER	165
+RDMOPT_RANGE_ATTACK_DAMAGE_TARGET	166
+RDMOPT_RANGE_ATTACK_DAMAGE_USER	167
+RDMOPT_HEAL_VALUE	168
+RDMOPT_HEAL_MODIFY_PERCENT	169
+RDMOPT_DEC_SPELL_CAST_TIME	170
+RDMOPT_DEC_SPELL_DELAY_TIME	171
+RDMOPT_DEC_SP_CONSUMPTION	172
+RDMOPT_HP_DRAIN	173
+RDMOPT_SP_DRAIN	174
+RDMOPT_WEAPON_ATTR_NOTHING	175
+RDMOPT_WEAPON_ATTR_WATER	176
+RDMOPT_WEAPON_ATTR_GROUND	177
+RDMOPT_WEAPON_ATTR_FIRE	178
+RDMOPT_WEAPON_ATTR_WIND	179
+RDMOPT_WEAPON_ATTR_POISON	180
+RDMOPT_WEAPON_ATTR_SAINT	181
+RDMOPT_WEAPON_ATTR_DARKNESS	182
+RDMOPT_WEAPON_ATTR_TELEKINESIS	183
+RDMOPT_WEAPON_ATTR_UNDEAD	184
+RDMOPT_WEAPON_INDESTRUCTIBLE	185
+RDMOPT_BODY_INDESTRUCTIBLE	186
+RDMOPT_MDAMAGE_SIZE_SMALL_TARGET	187
+RDMOPT_MDAMAGE_SIZE_MIDIUM_TARGET	188
+RDMOPT_MDAMAGE_SIZE_LARGE_TARGET	189
+RDMOPT_MDAMAGE_SIZE_SMALL_USER	190
+RDMOPT_MDAMAGE_SIZE_MIDIUM_USER	191
+RDMOPT_MDAMAGE_SIZE_LARGE_USER	192
+//RDMOPT_ATTR_TOLERACE_ALL	193
+
 WARPNPC	45
 1_ETC_01	46
 1_M_01	47
@@ -2456,8 +2248,53 @@ THANATOS_KEEP	10009
 4_F_REBELLION3	10202
 4_M_ILYA	10203
 
-MOBG_Branch_Of_Dead_Tree	0
-MOBG_Poring_Box	1
-MOBG_Bloody_Dead_Branch	2
-MOBG_Red_Pouch_Of_Surprise	3
-MOBG_ClassChange	4
+4_ELDER	10205
+4_LUNATIC	10206
+4_F_NOVICE2	10207
+4_WICKEDNYMPH	10208
+4_F_PREMI	10209
+4_M_COSTELL	10210
+4_M_YATTWARP	10211
+4_M_EVOKASCUDI	10212
+4_M_JOHNNYJAMES	10213
+4_M_ALBERTFORD	10214
+4_M_SEANMCCURDY	10215
+4_M_KARAMPUCCI	10216
+4_M_CACTUSMAN1	10217
+4_M_CACTUSMAN2	10218
+4_M_CACTUSMAN3	10219
+4_M_CACTUSLADY	10220
+4_M_GAST	10221
+4_M_CACTUSCHILD	10222
+4_KING	10223
+4_F_BOMI	10224
+4_M_CACTUSCHIEF	10225
+4_F_CACTUSCHILD2	10226
+4_F_CACTUSLADY2	10227
+4_F_CACTUSLADY3	10228
+4_M_CACTUS	10229
+4_M_COWRAIDERS1	10230
+4_M_COWRAIDERS2	10231
+4_M_COWRAIDERS3	10232
+4_F_JP14THEVT	10233
+4_M_POORSCHOLAR	10234
+4_M_PEPPERROTI	10235
+JP_NPC01	10236
+4_PURPLE_WARP	10237
+4_F_NARIN	10238
+4_M_URGENT_MAN	10239
+4_M_KEEN_SOLDIER	10240
+4_F_SLOPPY_WOMAN	10241
+4_F_DRKAFRA01	10242
+4_M_DRZONDA01	10243
+4_M_SWD_RENO	10244
+4_M_KNG_RENO	10245
+4_M_AC_RUMIN	10246
+4_M_HIGH_WIZARD	10247
+4_SYSTEM_BOX	10248
+
+SWORDCLAN	1
+ARCWANDCLAN	2
+GOLDENMACECLAN	3
+CROSSBOWCLAN	4
+JUMPINGCLAN	5

db/import-tmpl/instance_db.txt

@@ -1,5 +1,6 @@
 // Instance Database
 //
 // Structure of Database:
-// ID,Name,LimitTime,EnterMap,EnterX,EnterY,Map1,Map2,Map3,Map4,Map5,Map6,Map7,Map8
-
+// ID,Name,LimitTime,IdleTimeOut,EnterMap,EnterX,EnterY,Map2,Map3,...,Map255
+//
+// EnterMap is considered as Map1

db/import-tmpl/item_bluebox.txt

@@ -0,0 +1,4 @@
+// Old Blue Box Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate

db/import-tmpl/item_cardalbum.txt

@@ -0,0 +1,4 @@
+// Old Card Album Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate

db/import-tmpl/item_cash_db.txt

@@ -13,6 +13,7 @@
 //    5: Buff
 //    6: Heal
 //    7: Other
+//    8: Sale
 //
 // Price:
 //    Item cost, in cash points (#CASHPOINTS).

db/import-tmpl/item_db.txt

@@ -61,3 +61,7 @@
 //==================================================================
 //2338,Wedding_Dress,Wedding Dress,4,43000,,500,,0,,0,0xFFFFFFFE,63,0,16,,0,1,0,{},{ sc_start SC_WEDDING,-1,0; },{ sc_end SC_WEDDING; }
 //7170,Tuxedo,Tuxedo,4,43000,,10,,0,,0,0xFFFFFFFE,63,1,16,,0,1,0,{},{ sc_start SC_WEDDING,-1,0; },{ sc_end SC_WEDDING; }
+
+// Non-kRO Eden Group Mark effect
+//=============================================================
+//22508,Para_Team_Mark_,Eden Group Mark,11,0,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ unitskilluseid getcharid(3),"AL_TELEPORT",3; },{},{}

db/import-tmpl/item_findingore.txt

@@ -0,0 +1,4 @@
+// Ore Discovery Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate

db/import-tmpl/item_giftbox.txt

@@ -0,0 +1,4 @@
+// Gift Box Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate

db/import-tmpl/item_misc.txt

@@ -0,0 +1,4 @@
+//
+// Structure of Database:
+// GroupID,ItemID,Rate
+//

db/import-tmpl/item_noequip.txt

@@ -18,10 +18,13 @@
 // 1024 - restricted in zone 6
 // 2048 - restricted in zone 7
 //
+// Passing negative value as flag will unset the flag instead.
+//
 // Examples:
 // 1201,1   // Knife can't be worn on normal maps
 // 608,4    // Yggdrasil Seed can't be consumed in both GvG and WoE Castles
 // 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
 // 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
 // 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
+// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
 

db/import-tmpl/item_package.txt

@@ -0,0 +1,4 @@
+// Item Package Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate{,Amount,Random,isAnnounced,Duration,GUID,isBound,isNamed}

db/import-tmpl/item_randomopt_db.txt

@@ -0,0 +1,4 @@
+// Items Random Option Database	
+//
+// Structure of Database:
+// ID,{ Bonus Script }

db/import-tmpl/item_violetbox.txt

@@ -0,0 +1,4 @@
+// Old Violet Box Obtainable Items Database
+//
+// Structure of Database:
+// GroupID,ItemID,Rate

db/import-tmpl/job_noenter_map.txt

@@ -0,0 +1,28 @@
+// Defines Job(s) that are restricted to enter map (by flag/zones)
+//
+// Structure of Database:
+// JobID,FlagZone,GroupLevelBypass
+//
+// JobID: See JOB_* constants or use job number
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
+//
+// NOTES:
+// - Restriction will be overwritten for multiple defines with the same Job ID
+// - The flag is used by 'jobcanentermap' script.

db/import-tmpl/map_index.txt

@@ -15,4 +15,4 @@
 //Example:
 //
 //mymap	1250
-//mymap-2
+//mymap-2

db/import-tmpl/mob_boss.txt

@@ -1,5 +1,4 @@
 // Bloody Branch Summonable Monsters Database
 //
 // Structure of Database:
-// MobID,DummyName,Rate
-
+// MobRandomGroupID,MobID,DummyName,Rate

db/import-tmpl/mob_branch.txt

@@ -1,5 +1,4 @@
 // Dead Branch Summonable Monsters Database
 //
 // Structure of Database:
-// MobID,DummyName,Rate
-
+// MobRandomGroupID,MobID,DummyName,Rate

db/import-tmpl/mob_classchange.txt

@@ -2,5 +2,4 @@
 // List of monsters generated through Abracadabra's SA_CLASSCHANGE ability.
 //
 // Structure of Database:
-// MobID,DummyName,Rate
-
+// MobRandomGroupID,MobID,DummyName,Rate

db/import-tmpl/mob_poring.txt

@@ -1,5 +1,4 @@
 // Poring Box Summonable Monsters Database
 //
 // Structure of Database:
-// MobID,DummyName,Rate
-
+// MobRandomGroupID,MobID,DummyName,Rate

db/import-tmpl/mob_pouch.txt

@@ -1,5 +1,4 @@
 // Red Pouch of Surprise Summonable Monsters Database
 //
 // Structure of Database:
-// MobID,DummyName,Rate
-
+// MobRandomGroupID,MobID,DummyName,Rate

db/import-tmpl/mob_race2_db.txt

@@ -1,5 +1,5 @@
 // Monster Racial Groups Database
 //
 // Structure of Database:
-// Race2ID,MobID1,MobID2,MobID3,...,MobID9
+// Race2ID,MobID1,MobID2,MobID3,...,MobID100
 

db/import-tmpl/skill_db.txt

@@ -16,7 +16,13 @@
 //    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)
+// 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)
@@ -36,23 +42,24 @@
 //    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 - free
+//    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 (e.g. arrow shower)
-//    0x00002 - skill that doesn't end camouflage
+//    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 blocked by statis
+//    0x00020 - skill ignores SC_STASIS
 //    0x00040 - skill blocked by kagehumi
 //    0x00080 - skill range affected by AC_VULTURE
 //    0x00100 - skill range affected by GS_SNAKEEYE
@@ -65,6 +72,8 @@
 //    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_tree.txt

@@ -1,2 +1,2 @@
-//JobNo,Skill-ID,MaxLV{,JobLV},Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name#
+//JobNo,Skill-ID,MaxLv{,BaseLvReq,JobLvReq},Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name#
 

db/item_avail.txt

@@ -24,4 +24,4 @@
 //Enable if you plan to use the quest.
 //12715,7721
 //7915,673
-//7916,675
+//7916,675

db/item_findingore.txt

@@ -3,23 +3,23 @@
 // Structure of Database:
 // GroupID,ItemID,Rate
 
-IG_FingingOre,714,3		//Emperium
-IG_FingingOre,756,20	//Rough Oridecon
-IG_FingingOre,757,20	//Rough Elunium
-IG_FingingOre,969,2		//Gold
-IG_FingingOre,984,10	//Oridecon
-IG_FingingOre,985,10	//Elunium
-IG_FingingOre,990,30	//Red Blood
-IG_FingingOre,991,30	//Crystal Blue
-IG_FingingOre,992,30	//Wind of Verdure
-IG_FingingOre,993,30	//Green Live
-IG_FingingOre,994,15	//Flame Heart
-IG_FingingOre,995,15	//Mystic Frozen
-IG_FingingOre,996,15	//Rough Wind
-IG_FingingOre,997,15	//Great Nature
-IG_FingingOre,998,80	//Iron
-IG_FingingOre,999,50	//Steel
-IG_FingingOre,1002,100	//Iron Ore
-IG_FingingOre,1003,60	//Coal
-IG_FingingOre,1010,95	//Phracon
-IG_FingingOre,1011,55	//Emveretarcon
+IG_FindingOre,714,3		//Emperium
+IG_FindingOre,756,20	//Rough Oridecon
+IG_FindingOre,757,20	//Rough Elunium
+IG_FindingOre,969,2		//Gold
+IG_FindingOre,984,10	//Oridecon
+IG_FindingOre,985,10	//Elunium
+IG_FindingOre,990,30	//Red Blood
+IG_FindingOre,991,30	//Crystal Blue
+IG_FindingOre,992,30	//Wind of Verdure
+IG_FindingOre,993,30	//Green Live
+IG_FindingOre,994,15	//Flame Heart
+IG_FindingOre,995,15	//Mystic Frozen
+IG_FindingOre,996,15	//Rough Wind
+IG_FindingOre,997,15	//Great Nature
+IG_FindingOre,998,80	//Iron
+IG_FindingOre,999,50	//Steel
+IG_FindingOre,1002,100	//Iron Ore
+IG_FindingOre,1003,60	//Coal
+IG_FindingOre,1010,95	//Phracon
+IG_FindingOre,1011,55	//Emveretarcon

db/item_nouse.txt

@@ -11,6 +11,7 @@
 // Group ID Override:
 //	Group ID necessary to override this setting.
 
+606,1,100	// Aloebera
 619,1,100	// Unripe_Apple
 620,1,100	// Orange_Juice
 621,1,100	// Bitter_Herb

db/job_db2.txt

@@ -291,3 +291,23 @@
 4215,0,5,0,4,0,3,5,4,2,6,0,0,3,4,0,2,5,4,3,6,0,0,3,5,1,4,2,0,0,6,3,0,5,4,1,0,0,5,0,2,6,0,5,3,4,0,0,0,0,1
 // Summoner
 4218,5,0,3,0,5,3,0,2,4,0,2,4,5,0,2,4,5,0,2,4,5,0,6,3,5,0,2,0,6,0,4,5,0,6,0,4,6,0,2,0,5,4,3,0,5,6,3,2,0,5
+// Baby Summoner
+4220,5,0,3,0,5,3,0,2,4,0,2,4,5,0,2,4,5,0,2,4,5,0,6,3,5,0,2,0,6,0,4,5,0,6,0,4,6,0,2,0,5,4,3,0,5,6,3,2,0,5
+// Baby Ninja
+4222,2,2,0,0,0,0,0,0,0,5,2,0,0,0,0,0,0,0,0,4,2,5,0,0,0,0,0,0,4,6,2,5,0,0,0,0,0,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0
+// Baby Kagerou
+4223,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
+// Baby Oboro
+4224,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
+// Baby Taekwon
+4225,1,1,1,1,1,1,0,0,0,5,5,5,5,5,5,0,0,0,0,2,2,2,2,2,2,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
+// Baby Star Gladiator
+4226,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 Linker
+4227,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 Gunslinger
+4228,5,6,0,6,0,5,0,0,0,0,5,6,0,0,0,0,5,0,0,0,6,0,0,0,5,0,0,0,0,0,6,1,0,0,5,0,0,0,0,0,1,0,0,0,5,0,0,0,0,1,6,4,0,0,5,0,0,0,2,3,4,5,6,1,0,0,0,0,0,0
+// Baby Rebellion
+4229,0,5,0,4,0,3,5,4,2,6,0,0,3,4,0,2,5,4,3,6,0,0,3,5,1,4,2,0,0,6,3,0,5,4,1,0,0,5,0,2,6,0,5,3,4,0,0,0,0,1
+// 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

db/packet_db.txt

@@ -1786,6 +1786,11 @@ packet_keys: 0x01581359,0x452D6FFA,0x6AFB6E2E // [Shakto]
 0x096E,-1,mergeitem_req,2:4 // CZ_REQ_MERGE_ITEM
 0x096F,7,ZC_ACK_MERGE_ITEM,2:4:6 // ZC_ACK_MERGE_ITEM
 0x0974,2,mergeitem_cancel,0 // CZ_CANCEL_MERGE_ITEM
+0x0844,2,cashshopopen,0
+0x0849,16 //clif_cashshop_result
+0x0848,-1,cashshopbuy,2:6:4:10
+0x084a,2,cashshopclose,0
+0x08c9,2,cashshopitemlist,0
 
 //2012-04-18aRagexeRE [Special Thanks to Judas!]
 packet_ver: 31
@@ -2322,7 +2327,6 @@ packet_keys: 0x631C511C,0x111C111C,0x111C111C // [Shakto]
 0x08A4,36,storagepassword,2:4:20
 //New Packets
 //0x097E,12 //ZC_UPDATE_RANKING_POINT
-0x09B4,6,dull,0 //Cash Shop - Special Tab
 0x09CE,102,itemmonster,2
 0x09D4,2,npcshopclosed,0
 //NPC Market
@@ -2330,6 +2334,25 @@ packet_keys: 0x631C511C,0x111C111C,0x111C111C // [Shakto]
 0x09D6,-1,npcmarketpurchase,2:4:6
 0x09D7,-1
 0x09D8,2,npcmarketclosed,0
+// Clan System
+0x0988,6
+0x0989,2
+0x098A,-1
+0x098D,-1,clanchat,2:4
+0x098E,-1
+// Sale
+0x09AC,-1,salesearch,2:4:8
+0x09AD,8
+0x09AE,17,saleadd,2:6:8:12:16
+0x09AF,4
+0x09B0,8,saleremove,2:6
+0x09B1,4
+0x09B2,8
+0x09B3,4
+0x09B4,6,saleopen,2
+0x09BC,6,saleclose,2
+0x09C3,8,salerefresh,2:6
+0x09C4,8
 
 // New Packet
 0x097A,-1		// ZC_ALL_QUEST_LIST2
@@ -2376,6 +2399,7 @@ packet_keys: 0x2DFF467C,0x444B37EE,0x2C1B634F // [YomRawr]
 0x0A00,269		// ZC_SHORTCUT_KEY_LIST_V3
 0x0A01,3,hotkeyrowshift,2	// CZ_SHORTCUTKEYBAR_ROTATE
 0x0A02,4			// ZC_DRESSROOM_OPEN
+0x0A0E,14		// ZC_BATTLEFIELD_NOTIFY_HP2
 0x09F7,75		// ZC_PROPERTY_HOMUN_2
 0x09E5,18		// ZC_DELETEITEM_FROM_MCSTORE2
 0x09E6,22		// ZC_UPDATE_ITEM_FROM_BUYING_STORE2
@@ -2468,6 +2492,9 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 0x0817,5,hommenu,2:4
 0x0923,36,storagepassword,2:4:20
 
+// New Packets
+0xA3B,-1		// ZC_HAT_EFFECT
+
 // RODEX Mail system
 0x09E7,3		// ZC_NOTIFY_UNREADMAIL
 0x09E8,11,dull,0	// CZ_OPEN_MAILBOX
@@ -2524,6 +2551,9 @@ packet_keys: 0x62C86D09,0x75944F17,0x112C133D // [YomRawr]
 0x09FB,-1,dull,0	// CZ_PET_EVOLUTION
 0x09FC,6		// ZC_PET_EVOLUTION_RESULT
 
+//2015-05-20aRagexe
+0x0A3D,18,saleadd,2:6:8:12:16
+
 //2015-09-16Ragexe
 packet_ver: 53
 packet_keys: 0x17F83A19,0x116944F4,0x1CC541E9 // [Napster]

db/pre-re/homunculus_db.txt

@@ -30,4 +30,4 @@
 6049,6049,Bayeri,6112,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
 6050,6050,Sera,6108,60000,1,1,4,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,5,15,5,15,4,10,1,10,1,3,1,4,1,5,1,5
 6051,6051,Dieter,6104,60000,1,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,10,1,10,1,10,1,10,1,10,1,10
-6052,6052,Eleanor,6115,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
+6052,6052,Eleanor,6115,60000,1,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5

db/pre-re/instance_db.txt

@@ -1,9 +1,11 @@
 // Instance Database
 //
 // Structure of Database:
-// ID,Name,LimitTime,EnterMap,EnterX,EnterY,Map1,Map2,Map3,Map4,Map5,Map6,Map7,Map8
+// ID,Name,LimitTime,IdleTimeOut,EnterMap,EnterX,EnterY,Map2,Map3,...,Map255
+//
+// EnterMap is considered as Map1
 
-1,Endless Tower,14400,1@tower,50,355,1@tower,2@tower,3@tower,4@tower,5@tower,6@tower
-2,Sealed Catacomb,7200,1@cata,100,224,1@cata,2@cata
-3,Orc's Memory,3600,1@orcs,179,15,1@orcs,2@orcs
-4,Nidhoggur's Nest,14400,1@nyd,32,36,1@nyd,2@nyd
+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/item_cash_db.txt

@@ -13,6 +13,7 @@
 //    5: Buff
 //    6: Heal
 //    7: Other
+//    8: Sale
 //
 // Price:
 //    Item cost, in cash points (#CASHPOINTS).

db/pre-re/item_combo_db.txt

@@ -66,7 +66,7 @@
 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,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FIREPILLAR",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; }

db/pre-re/item_db.txt

@@ -1340,7 +1340,7 @@
 2425,Black_Leather_Boots,Black Leather Boots,4,20,,500,,4,,0,0xFFFFFFFE,2,2,64,,55,1,0,{ bonus bAgi,1; if(getrefine()>=9) bonus bAgi,2; },{},{}
 2426,Shadow_Walk,Shadow Walk,4,20,,2000,,0,,0,0xFFFFFFFE,2,2,64,,75,1,0,{ bonus bMdef,10; if(getskilllv("AS_CLOAKING")<2){ bonus5 bAutoSpellWhenHit,"AS_CLOAKING",2,100,BF_MAGIC,0; } else bonus5 bAutoSpellWhenHit,"AS_CLOAKING",getskilllv("AS_CLOAKING"),100,BF_MAGIC,0; },{},{}
 2427,Golden_Shoes,Golden Shoes,4,20,,300,,4,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMdef,4; },{},{}
-//2428,Freyja_Boots,Freyja Boots,4,0,,300,,10,,0,0xFFFFFFFE,7,2,64,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; },{},{}
+2428,Freyja_Boots,Freyja Boots,4,0,,300,,10,,0,0xFFFFFFFE,7,2,64,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; },{},{}
 2429,Iron_Boots01,Iron Boots,4,0,,1500,,5,,0,0x000E5CEA,7,2,64,,0,1,0,{},{},{}
 2430,Iron_Boots02,Iron Boots,4,0,,800,,5,,0,0xFFFFFFFF,7,2,64,,0,1,0,{},{},{}
 2431,Valley_Shoes,Valley Shoes,4,20,,0,,10,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMaxHPRate,7; bonus bMaxSPRate,7; },{},{}
@@ -1397,7 +1397,7 @@
 2530,Rider_Insignia_,Rider Insignia,4,20,,500,,4,,1,0xFFFFFFFE,2,2,4,,55,1,0,{ bonus bAgi,2; },{},{}
 2531,Ulfhedinn,Ulfhedinn,4,20,,700,,3,,1,0x000654E2,2,2,4,,70,1,0,{ bonus3 bAutoSpellWhenHit,"NPC_STONESKIN",6,20; },{},{}
 2532,Mithril_Magic_Cape,Mithril Magic Cape,4,20,,400,,3,,1,0x00098B1C,2,2,4,,70,1,0,{ bonus bMdef,3; bonus5 bAutoSpellWhenHit,"NPC_ANTIMAGIC",6,200,BF_MAGIC,0; },{},{}
-//2533,Freyja_Cape,Freyja Cape,4,0,,200,,10,,0,0xFFFFFFFE,7,2,4,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; },{},{}
+2533,Freyja_Cape,Freyja Cape,4,0,,200,,10,,0,0xFFFFFFFE,7,2,4,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; },{},{}
 2534,Ruffler,Ruffler,4,20,,0,,10,,0,0xFFFFFFFF,7,2,4,,0,0,0,{ bonus2 bSubEle,Ele_Neutral,17; bonus bFlee,17; },{},{}
 2535,Cloak_Of_Survival_C,Cloak Of Survival,4,1,,0,,5,,0,0x00810204,7,2,4,,0,0,0,{ bonus bVit,10; bonus bMdef,10; },{},{}
 2536,Skin_Of_Ventus,Skin of Ventus,4,20,,250,,2,,1,0xFFFFFFFE,7,2,4,,60,1,0,{ bonus bMdef,2; bonus bMaxHP,200; bonus bFlee,10; },{},{}
@@ -2061,8 +2061,8 @@
 4424,Stapo_Card,Stapo Card,6,20,,10,,,,,,,,136,,,,,{ skill "TF_PICKSTONE",1; skill "TF_THROWSTONE",1; },{},{}
 4425,Atroce_Card,Atroce Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,25; autobonus "{ bonus bAspdRate,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 4426,Byorgue_Card,Byorgue Card,6,20,,10,,,,,,,,16,,,,,{ if(BaseJob==Job_Rogue) { bonus bMatkRate,10; bonus2 bAddClass,Class_All,10; } },{},{}
-4427,Sword_Guardian_Card,Sword Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==2||getiteminfo(getequipid(EQI_HAND_R),11)==3) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,62,25; } },{},{}
-4428,Bow_Guardian_Card,Bow Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==11) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,47,50; } },{},{}
+4427,Sword_Guardian_Card,Sword Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==W_1HSWORD||getiteminfo(getequipid(EQI_HAND_R),11)==W_2HSWORD) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,62,25; } },{},{}
+4428,Bow_Guardian_Card,Bow Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==W_BOW) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,47,50; } },{},{}
 4429,Salamander_Card,Salamander Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSkillAtk,"WZ_FIREPILLAR",40; bonus2 bSkillAtk,"WZ_METEOR",40; },{},{}
 4430,Ifrit_Card,Ifrit Card,6,20,,10,,,,,,,,136,,,,,{ bonus bBaseAtk,(JobLevel/10); bonus bCritical,(JobLevel/10); bonus bHit,(JobLevel/10); bonus3 bAutoSpellWhenHit,"NPC_EARTHQUAKE",2,10; },{},{}
 4431,Kasa_Card,Kasa Card,6,20,,10,,,,,,,,4,,,,,{ bonus3 bAutoSpell,"MG_FIREBALL",5,20; bonus3 bAutoSpell,"MG_FIREBOLT",5,20; },{},{}
@@ -2074,7 +2074,7 @@
 4437,Hell_Poodle_Card,Hell Poodle Card,6,20,,10,,,,,,,,136,,,,,{ bonus bHit,1; bonus2 bAddItemHealRate,517,100; bonus3 bAddEff,Eff_Bleeding,50,ATF_SHORT; },{},{}
 4438,Banshee_Card,Banshee Card,6,20,,10,,,,,,,,769,,,,,{ if(BaseClass==Job_Mage){ bonus bMaxSP,100; bonus bMaxHP,-100; bonus2 bSkillAtk,"MG_NAPALMBEAT",20; bonus2 bSkillAtk,"MG_SOULSTRIKE",20; bonus2 bSkillAtk,"HW_NAPALMVULCAN",20; } },{},{}
 4439,Flame_Skull_Card,Flame Skull Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bResEff,Eff_Stun,3000; bonus2 bResEff,Eff_Curse,3000; bonus2 bResEff,Eff_Stone,3000; bonus2 bAddEffWhenHit,Eff_Blind,500; bonus2 bAddEffWhenHit,Eff_Stun,500; bonus2 bAddEffWhenHit,Eff_Curse,500; bonus2 bAddEffWhenHit,Eff_Stone,500; },{},{}
-4440,Necromancer_Card,Necromancer Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==10) { bonus bInt,1; bonus2 bIgnoreMdefClassRate,Class_Normal,2; bonus2 bIgnoreMdefClassRate,Class_Boss,2; } },{},{}
+4440,Necromancer_Card,Necromancer Card,6,20,,10,,,,,,,,2,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),11)==W_STAFF) { bonus bInt,1; bonus2 bIgnoreMdefClassRate,Class_Normal,2; bonus2 bIgnoreMdefClassRate,Class_Boss,2; } },{},{}
 4441,Fallen_Bishop_Card,Fallen Bishop Hibram Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMatkRate,10; bonus bMaxSPrate,-50; bonus2 bMagicAddRace,RC_Angel,50; bonus2 bMagicAddRace,RC_DemiHuman,50; bonus2 bMagicAddRace,RC_Player,50; },{},{}
 4442,Tatacho_Card,Tatacho Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bAddEle,Ele_Neutral,5; },{},{}
 4443,Aqua_Elemental_Card,Aqua Elemental Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Water,20; bonus2 bAddEle,Ele_Water,5; },{},{}
@@ -2608,7 +2608,7 @@
 5429,Bogy_Cap,Bogy Cap,4,20,,100,,2,,1,0xFFFFFFFF,7,2,256,,0,1,430,{ bonus bHPrecovRate, 5; bonus bSPrecovRate, 5; },{},{}
 5430,Sacred_Torch_Coronet,Torch Cap,4,20,,0,,3,,0,0xFFFFFFFF,7,2,256,,0,0,431,{ bonus2 bSubEle,Ele_Fire,20; skill "MG_FIREBOLT",5; },{},{}
 5431,Chicken_Hat,Chicken Hat,4,20,,1000,,0,,1,0xFFFFFFFF,7,2,256,,30,1,432,{ bonus3 bAutoSpell,"MC_LOUD",1,30; bonus bAspdRate,5; },{},{}
-5432,Brazil_Baseball_Cap,bRO 4th Anniversary Hat,4,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,433,{ if(gettime(6)==9&&gettime(5)>=10&&gettime(5)<=24) bonus bAllStats, 4; },{},{}
+5432,Brazil_Baseball_Cap,bRO 4th Anniversary Hat,4,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,433,{ if(gettime(DT_MONTH)==SEPTEMBER&&gettime(DT_DAYOFMONTH)>=10&&gettime(DT_DAYOFMONTH)<=24) bonus bAllStats, 4; },{},{}
 5433,Golden_Wreath,Golden Laurel,4,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,434,{},{},{}
 //5434,Cola_Can,Cola Can,4,20,,100,,2,,1,0xFFFFFFFF,7,2,256,,0,1,435,{},{},{}
 5435,Coke_Hat,Red Minstrel Hat,4,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,40,1,436,{ bonus bInt,1; bonus bMaxSP,80; bonus bMdef,3; if(getrefine()>5) { bonus bMdef,getrefine()-5; bonus bMaxSP,(getrefine()-5)*10; } },{},{}
@@ -2990,8 +2990,8 @@
 5812,Hat_Of_Expert,Hat Of Expert,4,0,,0,,2,,0,0xFFFFFFFF,7,2,256,,0,1,16,{},{},{}
 //5813,Red_Ph.D_Hat,Red Ph.D Hat,4,1000,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,481,{ bonus bInt,1; },{},{}
 //5814,Ati_Atihan_Hat3
-5815,Cowboy_Hat_J,Purple Cowboy Hat,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,475,{ bonus bStr,1; bonus2 bSubSize, 0, 5; bonus2 bSubSize, 1, 5; bonus2 bSubSize, 2, 5; },{},{}
-5816,Classic_Hat_J,Classic Hat,4,20,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,411,{},{},{}
+5815,Classic_Hat_J,Classic Hat,4,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,475,{ bonus bStr,1; bonus2 bSubSize, 0, 5; bonus2 bSubSize, 1, 5; bonus2 bSubSize, 2, 5; },{},{}
+5816,Cowboy_Hat_J,Purple Cowboy Hat,4,20,,500,,0,,0,0xFFFFFFFF,7,2,256,,0,1,411,{ bonus bBaseAtk,15; bonus bFlee,-5; },{},{}
 5817,Valentine_Pledge,Valentine Pledge,4,20,,0,,3,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,2; bonus bMdef,3; },{},{}
 5818,Carnival_Hat,Carnival Hat,4,0,,0,,6,,0,0xFFFFFFFF,7,2,256,,0,1,505,{ bonus bAllStats, 3; },{},{}
 5819,Carnival_Circlet,Carnival Circlet,4,0,,0,,6,,0,0xFFFFFFFF,7,2,256,,0,1,506,{ bonus bAllStats, 3; },{},{}
@@ -4552,7 +4552,7 @@
 11530,Jujube,Jujube,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 30,0; },{},{}
 11531,Coffee,Coffee,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,10; },{},{}
 11701,Girl_Bunch_Of_Flower_,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(105,145),0; },{},{}
-11702,Moon_Cookie,Moon Cookie,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ },{},{}
+11702,Moon_Cookie,Moon Cookie,0,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 11703,Mysterious_Blood,Mystery Blood,0,0,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,rand(25,35); },{},{}
 11704,KETUPAT_F,Ketupat,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,90),0; },{},{}
 11705,Special_White_Potion,Children's Potion,0,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(425,425),0; },{},{}
@@ -4681,10 +4681,10 @@
 12115,Elemental_Water,Elemental Converter,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ITEM_ENCHANTARMS",2; },{},{}
 12116,Elemental_Earth,Elemental Converter,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ITEM_ENCHANTARMS",3; },{},{}
 12117,Elemental_Wind,Elemental Converter,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ITEM_ENCHANTARMS",5; },{},{}
-12118,Resist_Fire,Fireproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1200000,-15,0,20,0; },{},{}
-12119,Resist_Water,Coldproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1200000,20,0,0,-15; },{},{}
-12120,Resist_Earth,Earthproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1200000,0,20,-15,0; },{},{}
-12121,Resist_Wind,Thunderproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1200000,0,-15,0,20; },{},{}
+12118,Resist_Fire,Fireproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT_FIRE,1200000,-15,0,20,0; },{},{}
+12119,Resist_Water,Coldproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT_WATER,1200000,20,0,0,-15; },{},{}
+12120,Resist_Earth,Earthproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT_EARTH,1200000,0,20,-15,0; },{},{}
+12121,Resist_Wind,Thunderproof Potion,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT_WIND,1200000,0,-15,0,20; },{},{}
 12122,Sesame_Pastry,Sesame Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_HITFOOD,1200000,30; },{},{}
 12123,Honey_Pastry,Honey Pastry,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FLEEFOOD,1200000,30; },{},{}
 12124,Rainbow_Cake,Rainbow Cake,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_BATKFOOD,1200000,10; sc_start SC_MATKFOOD,120000,10; },{},{}
@@ -4696,7 +4696,7 @@
 12130,Cookie_Bag,Cookie Bag,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_CookieBag),1; getrandgroupitem(IG_CookieBag),1; getrandgroupitem(IG_CookieBag),1; },{},{}
 12131,Lucky_Potion,Lucky Potion,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12132,Red_Bag,Santa's Bag,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Xmas,600000,0; },{},{}
-12133,Ice_Cream_,McDonald's Ice Cone,0,0,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ if(gettime(5)!=MDiceCone) { set MDiceCone,gettime(5); percentheal 50,50; } },{},{}
+12133,Ice_Cream_,McDonald's Ice Cone,0,0,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ if(gettime(DT_DAYOFMONTH)!=MDiceCone) { set MDiceCone,gettime(DT_DAYOFMONTH); percentheal 50,50; } },{},{}
 12134,Red_Envelope,Red Envelope,2,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(1000,10000); },{},{}
 12135,Green_Ale,Green Ale,2,20,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; sc_start SC_Confusion,10000,0,1000,0; },{},{}
 12136,Women's_Bundle,Women's Bundle,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem callfunc("F_Rand",558,529,2668,7518),1; },{},{}
@@ -4784,8 +4784,8 @@
 12217,Aspersio_5_Scroll,LV5 Aspersio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(countitem(523)>0) { skilleffect "PR_ASPERSIO",0; sc_start SC_ASPERSIO,180000,5; delitem 523,1; } },{},{}
 12218,Assumptio_5_Scroll,LV5 Assumptio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASSUMPTIO,100000,5; skilleffect "HP_ASSUMPTIO",0; },{},{}
 12219,Wind_Walk_10_Scroll,LV10 Wind Walker Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect "SN_WINDWALK",0; sc_start SC_WINDWALK,250000,5; },{},{}
-12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set .@type,getiteminfo(getequipid(EQI_HAND_R),11); if (.@type==6||.@type==7||.@type==8) { skilleffect "BS_ADRENALINE",0; sc_start SC_ADRENALINE,150000,5; } },{},{}
-12221,Megaphone_,Megaphone,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @megaphone$; announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000; end; },{},{}
+12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set .@type,getiteminfo(getequipid(EQI_HAND_R),11); if (.@type==W_1HAXE||.@type==W_2HAXE||.@type==W_MACE) { skilleffect "BS_ADRENALINE",0; sc_start SC_ADRENALINE,150000,5; } },{},{}
+12221,Megaphone_,Megaphone,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @megaphone$; announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000; },{},{}
 12225,Sweet_Candy_Striper,Sweet Candy Cane,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1245; },{},{}
 12226,Examination1,Examination 1,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPEEDUP0,5400000,25; percentheal 100,100; sc_start SC_STRFOOD,5400000,10; sc_start SC_DEXFOOD,5400000,5; sc_start SC_ATKPOTION,5400000,22; sc_start SC_MATKFOOD,5400000,15; },{},{}
 12227,Examination2,Examination 2,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPEEDUP0,5400000,25; percentheal 100,100; sc_start SC_INTFOOD,5400000,8; sc_start SC_VITFOOD,5400000,7; sc_start SC_LUKFOOD,5400000,7; sc_start SC_ATKPOTION,5400000,10; },{},{}
@@ -4820,9 +4820,9 @@
 12256,PRO_Gift_Box,PRO Gift Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12257,Cold_Medicine,Cold Medicine,0,20,,100,,,,,0xFFFFFFFF,7,2,,,50,,,{ percentheal 25,25; },{},{}
 12258,Bombring_Box,Bomb Poring Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3)=="job3_rang02") { monster "this",-1,-1,"--ja--",1904,1,""; } },{},{}
-12259,Miracle_Medicine,Miracle Tonic,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getexp 3000000,1500000; },{},{}
+12259,Miracle_Medicine,Miracle Tonic,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getexp2(3000000,1500000); },{},{}
 12260,Cool_Summer_Outfit,Cool Summer Outfit,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Summer,600000,0; },{},{}
-12261,Secret_Medicine,Leap of Fantasy,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getexp 2000000,1000000; },{},{}
+12261,Secret_Medicine,Leap of Fantasy,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getexp2(2000000,1000000); },{},{}
 12262,Inspector_Certificate_,Authoritative Badge,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPEEDUP0,540000,25; },{},{}
 12263,Comp_Battle_Manual,Field Manual,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{}
 12264,Comp_Bubble_Gum,Bubble Gum,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,200; },{},{}
@@ -4878,7 +4878,7 @@
 12314,Noive_Box,Noive Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12315,Goddess_Bless,Goddess Of Blessing,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12316,Angel_Bless,Angel Of Blessing,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12317,Powder_Snow,Snow Powder,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
+12317,Powder_Snow,Snow Powder,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12318,Little_Heart,Small Hearts,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12319,Strawberry_Cake,Rune Strawberry Cake,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,600000,5; sc_start SC_MATKPOTION,600000,5; },{},{}
 12320,Pineapple_Juice,Schwartzwald Pine Jubilee,2,0,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,600000,10; sc_start SC_INCFLEE2,600000,20; },{},{}
@@ -4957,11 +4957,11 @@
 12393,Repair_B,Repair B,2,500,,140,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(300,400),0; } },{},{}
 12394,Repair_C,Repair C,2,1100,,180,,,,,0x00000400,8,2,,,,,,{ if ( checkmadogear() ) { itemheal rand(400,500),0; } },{},{}
 12395,Tantanmen,Tantan Noodle,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1519; },{},{}
-12396,Fools_Day_Box,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 247; else if(.@rnd==9) specialeffect2 338; else specialeffect2 10; },{},{}
-12397,Fools_Day_Box2,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 328; else if(.@rnd==9) specialeffect2 68; else specialeffect2 196; },{},{}
+12396,Fools_Day_Box,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "AL_TELEPORT",1; else if(.@rnd==2) itemskill "AL_TELEPORT",3; else if(.@rnd==3) percentheal 50,0; else if(.@rnd==4) percentheal 0,50; else if(.@rnd==5) end; else if(.@rnd==6) getitem 512,1; else if(.@rnd==7) itemskill "ALL_REVERSEORCISH",1; else if(.@rnd==8) specialeffect2 EF_MAPPILLAR2; else if(.@rnd==9) specialeffect2 EF_ANGEL2; else specialeffect2 EF_COIN; },{},{}
+12397,Fools_Day_Box2,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ .@rnd = rand(1,10); if(.@rnd==1) itemskill "TF_DETOXIFY",1; else if(.@rnd==2) itemskill "TF_PICKSTONE",1; else if(.@rnd==3) itemskill "BA_FROSTJOKER",1; else if(.@rnd==4) itemskill "DC_SCREAM",1; else if(.@rnd==5) end; else if(.@rnd==6) getitem 909,1; else if(.@rnd==7) itemskill "AL_RUWACH",1; else if(.@rnd==8) specialeffect2 EF_BEGINASURA; else if(.@rnd==9) specialeffect2 EF_MVP; else specialeffect2 EF_CURSEATTACK; },{},{}
 12398,PCBang_Gift_Box,PCBang Gift Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12399,Castle_Treasure_Box,Castle Treasure Box,2,20,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12400,Water_Of_Blessing_,Water Of Blessing ,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12400,Water_Of_Blessing_,Water Of Blessing,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12401,Rune_Kn_Test_Int,Rune Kn Test Int,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,300000,40; },{},{}
 12402,29Fruit,29Fruit,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,5; },{},{}
 12403,Lucky_Egg2,Lucky Egg2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -4982,7 +4982,7 @@
 12418,Full_SwingK,Full SwingK,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FULL_SWING_K,500000,50; },{},{}
 12419,Mana_Plus,Mana Plus,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MANA_PLUS,500000,50; },{},{}
 12420,Stamina_Up_M,Stamina Up M,2,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MUSTLE_M,500000,5; },{},{}
-12421,Falmons_F,Falmons F,3,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
+12421,Falmons_F,Falmons F,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
 12422,HP_Increase_Potion_(Small),HP Increase Potion (Small),2,100,,20,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,1; percentheal 1,0; },{},{}
 12423,HP_Increase_Potion_(Medium),HP Increase Potion (Medium),2,100,,40,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,2; percentheal 2,0; },{},{}
 12424,HP_Increase_Potion_(Large),HP Increase Potion (Large),2,100,,80,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_PROMOTE_HEALTH_RESERCH,500000,1,3; percentheal 5,0; },{},{}
@@ -5221,7 +5221,7 @@
 12771,Passion_Hat_Box2,Passion Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12772,Cool_Hat_Box2,Cool Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12773,Victory_Hat_Box2,Victory Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{}
+12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(!checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon (!checkfalcon()); } },{},{}
 12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{}
 12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{}
 12902,Bubble_Gum_Box,Bubble Gum Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12210,10; },{},{}
@@ -5290,9 +5290,9 @@
 12965,Emergency_Box1,Emergency Level 1 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12968,1; },{},{}
 12966,Emergency_Box2,Emergency Level 2 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12969,1; },{},{}
 12967,Emergency_Box3,Emergency Level 3 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12970,1; },{},{}
-12968,Emergency_Scroll1,Emergency Level 1 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",1; },{},{}
-12969,Emergency_Scroll2,Emergency Level 2 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",2; },{},{}
-12970,Emergency_Scroll3,Emergency Level 3 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",3; },{},{}
+12968,Emergency_Scroll1,Emergency Level 1 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",1; },{},{}
+12969,Emergency_Scroll2,Emergency Level 2 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",2; },{},{}
+12970,Emergency_Scroll3,Emergency Level 3 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",3; },{},{}
 12971,Teleport_Box1,Teleport Scroll Box 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12977,10; },{},{}
 12972,Teleport_Box2,Teleport Scroll Box 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12978,10; },{},{}
 12973,Teleport_Box3,Teleport Scroll Box 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12979,10; },{},{}
@@ -5449,29 +5449,29 @@
 13265,Black_Lump,Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
 13266,Black_Hard_Lump,Hard Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
 13267,Very_Hard_Lump,Extremely Hard Black Lump,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13268,Mysterious_Powder,Mysterious Powder,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13269,Boost500_To_Throw,Throwing Boost 500,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13270,Full_SwingK_To_Throw,Throwing Full Swing K,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13271,Mana_Plus_To_Throw,Throwing Mana Plus,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13272,Cure_Free_To_Throw,Throwing Cure Free,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13273,Stamina_Up_M_To_Throw,Throwing Muramura M,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13274,Digestive_F_To_Throw,Throwing Falmons F,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13275,HP_Inc_PotS_To_Throw,Throwing Increase HP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13276,HP_Inc_PotM_To_Throw,Throwing Increase HP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13277,HP_Inc_PotL_To_Throw,Throwing Increase HP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13278,SP_Inc_PotS_To_Throw,Throwing Increase SP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13279,SP_Inc_PotM_To_Throw,Throwing Increase SP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13280,SP_Inc_PotL_To_Throw,Throwing Increase SP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13281,En_White_PotZ_To_Throw,Throwing Concentrated White Potion Z,10,100,,70,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13282,Vitata500_To_Throw,Throwing Vitata 500,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13283,En_Cel_Juice_To_Throw,Throwing Ceromain Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13284,Savage_BBQ_To_Throw,Throwing Savage Full Roast,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13285,Wug_Cocktail_To_Throw,Throwing Cocktail Warg Blood,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13286,M_Brisket_To_Throw,Throwing Minor Stew,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13287,Siroma_Icetea_To_Throw,Throwing Siroma Iced Tea,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13288,Drocera_Stew_To_Throw,Throwing Drosera Herb Salad,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13289,Petti_Noodle_To_Throw,Throwing Petite Tail Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
-13290,Black_Thing_To_Throw,Throwing Black Mass,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{},{},{}
+13268,Mysterious_Powder,Mysterious Powder,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MYSTERIOUS_POWDER,10000,2; },{},{}
+13269,Boost500_To_Throw,Throwing Boost 500,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_BOOST500,500000,10; },{},{}
+13270,Full_SwingK_To_Throw,Throwing Full Swing K,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_FULL_SWING_K,500000,50; },{},{}
+13271,Mana_Plus_To_Throw,Throwing Mana Plus,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MANA_PLUS,500000,50; },{},{}
+13272,Cure_Free_To_Throw,Throwing Cure Free,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_end SC_BLEEDING; sc_end SC_CURSE; sc_end SC_SILENCE; sc_end SC_POISON; sc_end SC_ORCISH; sc_end SC_CHANGEUNDEAD; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_DPOISON; itemheal 500,0; },{},{}
+13273,Stamina_Up_M_To_Throw,Throwing Muramura M,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MUSTLE_M,500000,5; },{},{}
+13274,Digestive_F_To_Throw,Throwing Falmons F,10,100,,10,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_LIFE_FORCE_F,500000,5; },{},{}
+13275,HP_Inc_PotS_To_Throw,Throwing Increase HP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_PROMOTE_HEALTH_RESERCH,500000,(500+(BaseLevel*10/3)); percentheal 1,0; },{},{}
+13276,HP_Inc_PotM_To_Throw,Throwing Increase HP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_PROMOTE_HEALTH_RESERCH,500000,(1500+(BaseLevel*10/3)); percentheal 2,0; },{},{}
+13277,HP_Inc_PotL_To_Throw,Throwing Increase HP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_PROMOTE_HEALTH_RESERCH,500000,(2500+(BaseLevel*10/3)); percentheal 5,0; },{},{}
+13278,SP_Inc_PotS_To_Throw,Throwing Increase SP Potion (Small),10,100,,20,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_ENERGY_DRINK_RESERCH,500000,((BaseLevel/10)-5); percentheal 0,2; },{},{}
+13279,SP_Inc_PotM_To_Throw,Throwing Increase SP Potion (Medium),10,100,,40,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_ENERGY_DRINK_RESERCH,500000,((BaseLevel/10)); percentheal 0,4; },{},{}
+13280,SP_Inc_PotL_To_Throw,Throwing Increase SP Potion (Large),10,100,,80,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_ENERGY_DRINK_RESERCH,500000,((BaseLevel/10)+5); percentheal 0,8; },{},{}
+13281,En_White_PotZ_To_Throw,Throwing Concentrated White Potion Z,10,100,,70,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_EXTRACT_WHITE_POTION_Z,500000,20; itemheal 1000,0; },{},{}
+13282,Vitata500_To_Throw,Throwing Vitata 500,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start2 SC_VITATA_500,500000,20,5; itemheal 0,200; },{},{}
+13283,En_Cel_Juice_To_Throw,Throwing Ceromain Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10; },{},{}
+13284,Savage_BBQ_To_Throw,Throwing Savage Full Roast,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_SAVAGE_STEAK,300000,20; },{},{}
+13285,Wug_Cocktail_To_Throw,Throwing Cocktail Warg Blood,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_COCKTAIL_WARG_BLOOD,300000,20; },{},{}
+13286,M_Brisket_To_Throw,Throwing Minor Stew,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_MINOR_BBQ,300000,20; },{},{}
+13287,Siroma_Icetea_To_Throw,Throwing Siroma Iced Tea,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_SIROMA_ICE_TEA,300000,20; },{},{}
+13288,Drocera_Stew_To_Throw,Throwing Drosera Herb Salad,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_DROCERA_HERB_STEAMED,300000,20; },{},{}
+13289,Petti_Noodle_To_Throw,Throwing Petite Tail Soup,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_PUTTI_TAILS_NOODLES,300000,20; },{},{}
+13290,Black_Thing_To_Throw,Throwing Black Mass,10,100,,50,0,,,,0x00040000,8,2,32768,,99,,9,{ sc_start SC_STOMACHACHE,60000,rand(5,10); },{},{}
 13294,Explosive_Kunai,Explosive Kunai,10,100,,30,50,,,,0x02000000,63,2,32768,,100,,7,{ bonus bAtkEle,Ele_Neutral; },{},{}
 // Ninja Fuuma Shurikens
 13300,Huuma_Bird_Wing,Huuma Wing Shuriken,5,90000,,3000,150,,1,0,0x02000000,7,2,34,4,65,1,22,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Wind; bonus bDex,-2; bonus bAgi,-1; },{},{}
@@ -6364,23 +6364,23 @@
 14531,Accuracy_30_Scroll,Concentration Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHIT,1800000,30; },{},{}
 14532,Battle_Manual25,Field Manual 25%,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,25; },{},{}
 14533,Battle_Manual100,Field Manual 100%,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,100; },{},{}
-14534,Small_Life_Potion,Small Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0; },{},{}
-14535,Med_Life_Potion,Medium Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0; },{},{}
-14536,Abrasive,Abrasive,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 182; sc_start SC_INCCRI,300000,30; },{},{}
-14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 348; sc_start SC_INCHEALRATE,1800000,20; },{},{}
+14534,Small_Life_Potion,Small Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_HEAL3; sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0; },{},{}
+14535,Med_Life_Potion,Medium Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_HEAL3; sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0; },{},{}
+14536,Abrasive,Abrasive,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_MAGICALATTHIT; sc_start SC_INCCRI,300000,30; },{},{}
+14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_LIGHTSPHERE; sc_start SC_INCHEALRATE,1800000,20; },{},{}
 14538,Glass_Of_Illusion,Glass of Illusion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_STEAL; sc_start SC_INCFLEE2,60000,20; },{},{}
 14539,Shadow_Armor_S,Shadow Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_CLOAKING; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Dark,1,0; },{},{}
-14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Holy,1,0; },{},{}
+14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_BENEDICTIO; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Holy,1,0; },{},{}
 14541,S_Def_Potion,Small Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,60000,3; },{},{}
 14542,B_Def_Potion,Big Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,180000,3; },{},{}
 14543,S_Mdef_Potion,Small Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,60000,3; },{},{}
 14544,B_Mdef_Potion,Big Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,180000,3; },{},{}
 14545,Battle_Manual_X3,Field Manual 300%,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,300; },{},{}
-14546,Fire_Cracker_Love,I Love You Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
-14547,Fire_Cracker_Wday,Whiteday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
-14548,Fire_Cracker_Valentine,Valentine's Day Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
-14549,Fire_Cracker_Bday,Birthday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
-14550,Fire_Cracker_Xmas,Xmas Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
+14546,Fire_Cracker_Love,I Love You Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14547,Fire_Cracker_Wday,Whiteday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14548,Fire_Cracker_Valentine,Valentine's Day Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14549,Fire_Cracker_Bday,Birthday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14550,Fire_Cracker_Xmas,Xmas Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 14551,Str_Dish01_,Fried Grasshopper Legs,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD,1200000,1; percentheal 5,0; },{},{}
 14552,Str_Dish02_,Seasoned Sticky Webfoot,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD,1200000,2; percentheal 5,0; },{},{}
 14553,Str_Dish03_,Bomber Steak,0,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFOOD,1200000,3; percentheal 5,0; },{},{}
@@ -6561,7 +6561,7 @@
 //
 18595,Horn_Of_Ancient,Horn of Ancient,4,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 18596,Sprout_Hat,Sprout Hat,4,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE",3; },{},{}
-18597,Mercury_Riser,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
+18597,Mercury_Riser,Mercury Riser,4,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,1,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
 //
 18600,Cat_Ear_Beret,Cat Ear Beret,4,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); bonus2 bAddRace,RC_Player,(getrefine() - 5); bonus2 bSubRace,RC_Player,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bAddRace,RC_Player,7; bonus2 bSubRace,RC_DemiHuman,7; bonus2 bSubRace,RC_Player,7; } },{},{}
 //

db/pre-re/item_group_db.txt

@@ -1,6 +0,0 @@
-import: db/pre-re/item_bluebox.txt
-import: db/pre-re/item_violetbox.txt
-import: db/pre-re/item_cardalbum.txt
-import: db/item_findingore.txt
-import: db/pre-re/item_giftbox.txt
-import: db/pre-re/item_misc.txt

db/pre-re/item_misc.txt

@@ -559,3 +559,98 @@ IG_Xmas_Gift,12354,24	// Buche_De_Noel
 IG_Xmas_Gift,12702,36	// Old_Bleu_Box
 IG_Xmas_Gift,14546,6	// Fire_Cracker_Love
 IG_Xmas_Gift,14550,6	// Fire_Cracker_Xmas
+// Runes
+IG_Rune,12725,1 // Runstone_Nosiege
+IG_Rune,12726,1 // Runstone_Rhydo
+IG_Rune,12727,1 // Runstone_Verkana
+IG_Rune,12728,1 // Runstone_Isia
+IG_Rune,12729,1 // Runstone_Asir
+IG_Rune,12730,1 // Runstone_Urj
+IG_Rune,12731,1 // Runstone_Turisus
+IG_Rune,12732,1 // Runstone_Pertz
+IG_Rune,12733,1 // Runstone_Hagalas
+// Elemental Points
+IG_Element,6360,1 // Scarlet_Pts
+IG_Element,6361,1 // Indigo_Pts
+IG_Element,6362,1 // Yellow_Wish_Pts
+IG_Element,6363,1 // Lime_Green_Pts
+// Poisons
+IG_Poison,12717,1 // Poison_Paralysis
+IG_Poison,12718,1 // Poison_Leech
+IG_Poison,12719,1 // Poison_Oblivion
+IG_Poison,12720,1 // Poison_Disheart
+IG_Poison,12721,1 // Poison_Numb
+IG_Poison,12722,1 // Poison_Fever
+IG_Poison,12723,1 // Poison_Laughing
+IG_Poison,12724,1 // Poison_Fatigue
+// Cash Foods
+IG_Cash_Food,12202,1 // Str_Dish10_
+IG_Cash_Food,12203,1 // Agi_Dish10_
+IG_Cash_Food,12204,1 // Int_Dish10_
+IG_Cash_Food,12205,1 // Dex_Dish10_
+IG_Cash_Food,12206,1 // Luk_Dish10_
+IG_Cash_Food,12207,1 // Vit_Dish10_
+// Bombs
+IG_Bomb,13260,1 // Apple_Bomb
+IG_Bomb,13261,1 // Coconut_Bomb
+IG_Bomb,13262,1 // Melon_Bomb
+IG_Bomb,13263,1 // Pineapple_Bomb
+IG_Bomb,13264,1 // Banana_Bomb
+IG_Bomb,13265,1 // Black_Lump
+IG_Bomb,13266,1 // Black_Hard_Lump
+IG_Bomb,13267,1 // Very_Hard_Lump
+// Throwable Items
+IG_Throwable,13268,1 // Mysterious_Powder
+IG_Throwable,13269,1 // Boost500_To_Throw
+IG_Throwable,13270,1 // Full_SwingK_To_Throw
+IG_Throwable,13271,1 // Mana_Plus_To_Throw
+IG_Throwable,13272,1 // Cure_Free_To_Throw
+IG_Throwable,13273,1 // Stamina_Up_M_To_Throw
+IG_Throwable,13274,1 // Digestive_F_To_Throw
+IG_Throwable,13275,1 // HP_Inc_PotS_To_Throw
+IG_Throwable,13276,1 // HP_Inc_PotM_To_Throw
+IG_Throwable,13277,1 // HP_Inc_PotL_To_Throw
+IG_Throwable,13278,1 // SP_Inc_PotS_To_Throw
+IG_Throwable,13279,1 // SP_Inc_PotM_To_Throw
+IG_Throwable,13280,1 // SP_Inc_PotL_To_Throw
+IG_Throwable,13281,1 // En_White_PotZ_To_Throw
+IG_Throwable,13282,1 // Vitata500_To_Throw
+IG_Throwable,13283,1 // En_Cel_Juice_To_Throw
+IG_Throwable,13284,1 // Savage_BBQ_To_Throw
+IG_Throwable,13285,1 // Wug_Cocktail_To_Throw
+IG_Throwable,13286,1 // M_Brisket_To_Throw
+IG_Throwable,13287,1 // Siroma_Icetea_To_Throw
+IG_Throwable,13288,1 // Drocera_Stew_To_Throw
+IG_Throwable,13289,1 // Petti_Noodle_To_Throw
+IG_Throwable,13290,1 // Black_Thing_To_Throw
+// Mercenary Scrolls
+IG_Mercenary,12153,1 // Bow_Mercenary_Scroll1
+IG_Mercenary,12154,1 // Bow_Mercenary_Scroll2
+IG_Mercenary,12155,1 // Bow_Mercenary_Scroll3
+IG_Mercenary,12156,1 // Bow_Mercenary_Scroll4
+IG_Mercenary,12157,1 // Bow_Mercenary_Scroll5
+IG_Mercenary,12158,1 // Bow_Mercenary_Scroll6
+IG_Mercenary,12159,1 // Bow_Mercenary_Scroll7
+IG_Mercenary,12160,1 // Bow_Mercenary_Scroll8
+IG_Mercenary,12161,1 // Bow_Mercenary_Scroll9
+IG_Mercenary,12162,1 // Bow_Mercenary_Scroll10
+IG_Mercenary,12163,1 // SwordMercenary_Scroll1
+IG_Mercenary,12164,1 // SwordMercenary_Scroll2
+IG_Mercenary,12165,1 // SwordMercenary_Scroll3
+IG_Mercenary,12166,1 // SwordMercenary_Scroll4
+IG_Mercenary,12167,1 // SwordMercenary_Scroll5
+IG_Mercenary,12168,1 // SwordMercenary_Scroll6
+IG_Mercenary,12169,1 // SwordMercenary_Scroll7
+IG_Mercenary,12170,1 // SwordMercenary_Scroll8
+IG_Mercenary,12171,1 // SwordMercenary_Scroll9
+IG_Mercenary,12172,1 // SwordMercenary_Scroll10
+IG_Mercenary,12173,1 // SpearMercenary_Scroll1
+IG_Mercenary,12174,1 // SpearMercenary_Scroll2
+IG_Mercenary,12175,1 // SpearMercenary_Scroll3
+IG_Mercenary,12176,1 // SpearMercenary_Scroll4
+IG_Mercenary,12177,1 // SpearMercenary_Scroll5
+IG_Mercenary,12178,1 // SpearMercenary_Scroll6
+IG_Mercenary,12179,1 // SpearMercenary_Scroll7
+IG_Mercenary,12180,1 // SpearMercenary_Scroll8
+IG_Mercenary,12181,1 // SpearMercenary_Scroll9
+IG_Mercenary,12182,1 // SpearMercenary_Scroll10

db/pre-re/item_noequip.txt

@@ -9,6 +9,7 @@
 // 2    - restricted in PVP
 // 4    - restricted in GVG
 // 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
 // Restricted zones - configured by 'restricted <number>' mapflag
 // 32   - restricted in zone 1
 // 64   - restricted in zone 2
@@ -17,6 +18,9 @@
 // 512  - restricted in zone 5
 // 1024 - restricted in zone 6
 // 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// Passing negative value as flag will unset the flag instead.
 //
 // Examples:
 // 1201,1   // Knife can't be worn on normal maps
@@ -24,6 +28,7 @@
 // 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
 // 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
 // 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
+// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
 
 //----------------------------------------------------------------------------
 // Normal maps

db/pre-re/item_randomopt_db.txt

@@ -0,0 +1,4 @@
+// Items Random Option Database	
+//
+// Structure of Database:
+// ID,{ Bonus Script }

db/pre-re/job_db1.txt

@@ -283,3 +283,23 @@
 4215,	28000,89   ,  0  ,469  ,500  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 700 , 750 , 700 ,1500 ,1500 ,2000 ,2000
 // Summoner - Placeholder
 4218,	20000,0    ,500  ,100  ,500  ,650  ,700  ,2000 ,2000 ,2000 ,800  ,2000 ,700  ,700  ,650  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 650
+// Baby Summoner - Placeholder
+4220,	20000,0    ,500  ,100  ,500  ,650  ,700  ,2000 ,2000 ,2000 ,800  ,2000 ,700  ,700  ,650  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 650
+// Baby Ninja - Placeholder
+4222,	26000,80   ,  0  ,540  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000
+// Baby Kagerou - Placeholder
+4223,	26000,80   ,  0  ,540  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000
+// Baby Oboro - Placeholder
+4224,	26000,80   ,  0  ,540  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000
+// Baby Taekwon - Placeholder
+4225,	28000,70   ,500  ,200  ,400  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000
+// Baby Star Gladiator - Placeholder
+4226,	28000,90   ,650  ,470  ,400  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000
+// Baby Soul Linker - Placeholder
+4227,	24000,75   ,500  ,900  ,500  ,575  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,625  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 625
+// Baby Gunslinger - Placeholder
+4228,	28000,89   ,  0  ,469  ,500  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 700 , 750 , 700 ,1500 ,1500 ,2000 ,2000
+// Baby Rebellion - Placeholder
+4229,	28000,89   ,  0  ,469  ,500  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 700 , 750 , 700 ,1500 ,1500 ,2000 ,2000
+// Baby Star Gladiator (Union) - Placeholder
+4238,	28000,90   ,650  ,470  ,400  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000

db/pre-re/job_exp.txt

@@ -47,7 +47,7 @@
 //================================
 
 //Base - 3rd Jobs, Baby 3rds, Expanded Super Novice, Kagerou/Oboro, Rebellion and Summoner
-99,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215:4218,0,10,18,28,40,85,123,168,220,278,400,481,613,731,875,1038,1213,1400,1575,1775,2268,2604,2786,3136,3506,4130,4796,5508,6264,9645,12392,14220,16159,18209,21649,24451,27401,30499,33748,47342,58160,64711,71573,78749,90144,99312,108870,118816,129154,174196,213220,238080,264150,291427,329640,363155,398116,434526,472381,610848,731828,806448,884232,965180,1073896,1170382,1270556,1374422,1481976,1850800,3389616,3666333,3953534,4251217,4559382,5129260,5488173,5859059,6241919,7374168,9570662,10458427,11380262,12336168,13326144,14994907,16130400,17304206,18516326,19766760,29216160,34949880,40930560,55017900,71510400,106974000,146061000,174405000,343210000,99999999
+99,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215:4218:4220:4222:4223:4224:4225:4226:4227:4228:4229:4238,0,10,18,28,40,85,123,168,220,278,400,481,613,731,875,1038,1213,1400,1575,1775,2268,2604,2786,3136,3506,4130,4796,5508,6264,9645,12392,14220,16159,18209,21649,24451,27401,30499,33748,47342,58160,64711,71573,78749,90144,99312,108870,118816,129154,174196,213220,238080,264150,291427,329640,363155,398116,434526,472381,610848,731828,806448,884232,965180,1073896,1170382,1270556,1374422,1481976,1850800,3389616,3666333,3953534,4251217,4559382,5129260,5488173,5859059,6241919,7374168,9570662,10458427,11380262,12336168,13326144,14994907,16130400,17304206,18516326,19766760,29216160,34949880,40930560,55017900,71510400,106974000,146061000,174405000,343210000,99999999
 
 //Job - 3rd Jobs, Baby 3rds, Expanded Super Novice, Kagerou/Oboro, Rebellion and Summoner
-50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215:4218,1,288,368,568,696,1206,1774,2192,3196,5080,7352,8580,9892,13358,18984,31925,35860,40013,51605,68585,87770,96443,105515,131770,167428,206720,223860,241673,294553,362303,479053,513362,548856,656197,787507,927154,985696,1046034,1231134,1449220,1678177,1773024,2182221,2534978,3043585,3782865,4461912,4672971,5971896,6250158,6875174,7562691,8318960,9150856,10065942,11877812,14015818,16538665,19515624,23028437,28094693,34275525,41816141,51015692,62239144,79666104,101972614,130524946,167071930,213852071,999999999
+50,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4190:4191:4211:4212:4215:4218:4220:4222:4223:4224:4225:4226:4227:4228:4229:4238,1,288,368,568,696,1206,1774,2192,3196,5080,7352,8580,9892,13358,18984,31925,35860,40013,51605,68585,87770,96443,105515,131770,167428,206720,223860,241673,294553,362303,479053,513362,548856,656197,787507,927154,985696,1046034,1231134,1449220,1678177,1773024,2182221,2534978,3043585,3782865,4461912,4672971,5971896,6250158,6875174,7562691,8318960,9150856,10065942,11877812,14015818,16538665,19515624,23028437,28094693,34275525,41816141,51015692,62239144,79666104,101972614,130524946,167071930,213852071,999999999

db/pre-re/job_noenter_map.txt

@@ -0,0 +1,28 @@
+// Defines Job(s) that are restricted to enter map (by flag/zones)
+//
+// Structure of Database:
+// JobID,FlagZone,GroupLevelBypass
+//
+// JobID: See JOB_* constants or use job number
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
+//
+// NOTES:
+// - Restriction will be overwritten for multiple defines with the same Job ID
+// - The flag is used by 'jobcanentermap' script.

db/pre-re/mob_race2_db.txt

@@ -1,23 +1,23 @@
 // Monster Racial Groups Database
 //
 // Structure of Database:
-// Race2ID,MobID1,MobID2,MobID3,...,MobID50
+// Race2ID,MobID1,MobID2,MobID3,...,MobID100
 
 // Goblins
-1,1122,1123,1124,1125,1126,1258,1299
+RC2_GOBLIN,1122,1123,1124,1125,1126,1258,1299
 // Kobolds
-2,1133,1134,1135,1282,1296
+RC2_KOBOLD,1133,1134,1135,1282,1296
 // Orcs
-3,1023,1152,1153,1189,1213,1273
+RC2_ORC,1023,1152,1153,1189,1213,1273
 // Golems
-4,1040,1278,1366,1497,2024
+RC2_GOLEM,1040,1278,1366,1497,2024
 // Guardians
-5,1285,1286,1287,2081
+RC2_GUARDIAN,1285,1286,1287,2081
 // Ninja Classes (Pirate's_Pride)
-6,1315,1364,1401,1560
+RC2_NINJA,1315,1364,1401,1560
 // GvG
-7,1143,1905,1906,1907
+RC2_GVG,1143,1905,1906,1907
 // Battlefield
-8,1906,1909,1914,1915
+RC2_BATTLEFIELD,1906,1909,1914,1915
 // Treasure Chests
-9,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
+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

db/pre-re/mob_random_db.txt

@@ -1,5 +0,0 @@
-import: db/pre-re/mob_branch.txt
-import: db/pre-re/mob_poring.txt
-import: db/pre-re/mob_boss.txt
-import: db/mob_pouch.txt
-import: db/mob_classchange.txt

db/pre-re/mob_skill_db.txt

@@ -2936,7 +2936,7 @@
 1639,Kathryne Keyron@MG_COLDBOLT,chase,14,10,3000,1000,10000,no,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBALL,attack,17,44,3000,500,10000,no,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBALL,chase,17,44,3000,500,10000,no,target,always,0,,,,,,,
-1639,Kathryne Keyron@WZ_SIGHTRASHER,attack,81,20,3000,0,10000,yes,self,always,0,,,,,,,
+1639,Kathryne Keyron@WZ_SIGHTRASHER,attack,81,10,3000,0,10000,yes,self,always,0,,,,,,,
 1639,Kathryne Keyron@WZ_QUAGMIRE,chase,92,5,3000,0,10000,yes,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_SAFETYWALL,attack,12,10,3000,0,10000,yes,self,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBOLT,chase,19,10,3000,1000,10000,no,target,always,0,,,,,,,
@@ -3648,7 +3648,7 @@
 1705,Thanatos Despero@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_STUNATTACK,attack,179,4,1000,0,5000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,21,
-1705,Thanatos Despero@WZ_SIGHTRASHER,attack,81,20,1000,0,10000,yes,target,attackpcge,2,,,,,,,
+1705,Thanatos Despero@WZ_SIGHTRASHER,attack,81,10,1000,0,10000,yes,target,attackpcge,2,,,,,,,
 //1705,Thanatos Despero@KN_BOWLINGBASH,attack,62,4,1000,0,10000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_AGIUP,attack,350,5,1000,0,60000,yes,self,always,0,,,,,,,
 1705,Thanatos Despero@NPC_AGIUP,attack,350,5,2000,0,10000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -3714,7 +3714,7 @@
 1710,Thanatos Despero@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_STUNATTACK,attack,179,4,1000,0,5000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,21,
-1710,Thanatos Despero@WZ_SIGHTRASHER,attack,81,20,1000,0,10000,yes,target,attackpcge,2,,,,,,,
+1710,Thanatos Despero@WZ_SIGHTRASHER,attack,81,10,1000,0,10000,yes,target,attackpcge,2,,,,,,,
 //1710,Thanatos Despero@KN_BOWLINGBASH,attack,62,5,1000,0,10000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_AGIUP,attack,350,5,1000,0,60000,yes,self,always,0,,,,,,,
 1710,Thanatos Despero@NPC_AGIUP,attack,350,5,2000,0,10000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -4090,7 +4090,7 @@
 1768,Gloom Under Night@NPC_POWERUP,attack,349,5,2000,700,50000,no,self,always,0,,,,,,,
 1768,Gloom Under Night@NPC_FIREBREATH,chase,654,10,2000,500,10000,no,target,myhpltmaxrate,80,,,,,,,
 1768,Gloom Under Night@SM_MAGNUM,attack,7,25,10000,0,5000,yes,self,attackpcge,2,,,,,,,
-1768,Gloom Under Night@WZ_SIGHTRASHER,attack,81,20,2000,0,5000,yes,self,always,0,,,,,,,
+1768,Gloom Under Night@WZ_SIGHTRASHER,attack,81,10,2000,0,5000,yes,self,always,0,,,,,,,
 1768,Gloom Under Night@MG_FIREBALL,attack,17,44,1000,500,20000,no,target,always,0,,,,,,,
 1768,Gloom Under Night@MG_FIREBALL,chase,17,44,10000,500,20000,no,target,always,0,,,,,,,
 1768,Gloom Under Night@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
@@ -4522,7 +4522,7 @@
 1833,Kasa@MG_FIREBALL,idle,17,44,10000,500,10000,no,target,always,0,,,,,,,
 1833,Kasa@MG_FIREBALL,chase,17,44,10000,500,10000,no,target,always,0,,,,,,,
 1833,Kasa@MG_FIREBALL,attack,17,44,5000,500,10000,no,target,always,0,,,,,,,
-1833,Kasa@WZ_SIGHTRASHER,attack,81,20,1000,0,20000,yes,self,always,0,,,,,,,
+1833,Kasa@WZ_SIGHTRASHER,attack,81,10,1000,0,20000,yes,self,always,0,,,,,,,
 1833,Kasa@LK_SPIRALPIERCE,attack,397,1,1500,1000,10000,no,target,always,0,,,,,,,
 1833,Kasa@WZ_METEOR,chase,83,1,5000,1000,10000,no,target,always,0,,,,,,,
 1833,Kasa@WZ_METEOR,attack,83,1,5000,1000,10000,no,target,always,0,,,,,,,
@@ -4566,7 +4566,7 @@
 1837,Imp@NPC_FIREATTACK,attack,186,5,1000,0,5000,yes,target,always,0,,,,,,,
 1837,Imp@NPC_PULSESTRIKE,attack,661,3,1000,1000,5000,no,self,always,0,,,,,,,
 1837,Imp@MG_SIGHT,idle,10,1,500,0,5000,yes,self,always,0,,,,,,,
-1837,Imp@WZ_SIGHTRASHER,attack,81,20,3000,0,10000,yes,self,always,0,,,,,,,
+1837,Imp@WZ_SIGHTRASHER,attack,81,10,3000,0,10000,yes,self,always,0,,,,,,,
 1837,Imp@RG_STRIPARMOR,attack,217,1,2000,0,5000,yes,target,always,0,,,,,,29,
 1838,Knocker@HT_LANDMINE,idle,116,2,4000,1000,18000,yes,around2,always,0,,,,,,5,
 1838,Knocker@NPC_GROUNDATTACK,attack,185,2,2000,0,5000,yes,target,always,0,,,,,,,
@@ -4859,45 +4859,45 @@
 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 Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpinrate,6,10,,,,,,16
-1916,Satan Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpinrate,6,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 Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpinrate,11,30,,,,,,6
-1916,Satan Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpinrate,11,30,,,,,,6
-1916,Satan Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,afterskill,684,,,,,,,
-1916,Satan Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,afterskill,684,,,,,,,
-1916,Satan Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,afterskill,678,,,,,,,
-1916,Satan Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,afterskill,678,,,,,,,
+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 Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpinrate,31,40,,,,,,14
-1916,Satan Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpinrate,31,40,,,,,,14
-1916,Satan Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,afterskill,661,,,,,,,
-1916,Satan Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,afterskill,661,,,,,,,
-1916,Satan Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,afterskill,666,,,,,,,
-1916,Satan Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,afterskill,666,,,,,,,
+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 Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpinrate,41,50,,,,,,15
-1916,Satan Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpinrate,41,50,,,,,,15
-1916,Satan Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,afterskill,679,,,,,,,
-1916,Satan Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,afterskill,679,,,,,,,
-1916,Satan Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,afterskill,680,,,,,,,
-1916,Satan Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,afterskill,680,,,,,,,
+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 Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpinrate,51,60,,,,,,3
-1916,Satan Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpinrate,51,60,,,,,,3
-1916,Satan Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,afterskill,668,,,,,,,
-1916,Satan Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,afterskill,668,,,,,,,
-1916,Satan Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,afterskill,683,,,,,,,
-1916,Satan Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,afterskill,683,,,,,,,
+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 Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpinrate,61,80,,,,,,2
-1916,Satan Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpinrate,61,80,,,,,,2
-1916,Satan Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,afterskill,16,,,,,,,
-1916,Satan Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,afterskill,16,,,,,,,
-1916,Satan Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,afterskill,19,,,,,,,
-1916,Satan Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,afterskill,19,,,,,,,
-1916,Satan Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,afterskill,15,,,,,,,
-1916,Satan Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,afterskill,15,,,,,,,
+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,,,,,,,,
@@ -4908,53 +4908,51 @@
 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@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,onspawn,0,1922,1923,1924,1925,,,
-1916,Satan Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,
 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 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 Morroc@NPC_TALK,chase,682,10,10000,0,600000,no,self,myhpinrate,6,10,,,,,,16
-1917,Wounded Morroc@NPC_TALK,attack,682,10,10000,0,600000,no,self,myhpinrate,6,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 Morroc@NPC_WIDEHELLDIGNITY,chase,684,1,10000,2000,180000,no,self,myhpinrate,11,30,,,,,,6
-1917,Wounded Morroc@NPC_WIDEHELLDIGNITY,attack,684,1,10000,2000,180000,no,self,myhpinrate,11,30,,,,,,6
-1917,Wounded Morroc@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,afterskill,684,,,,,,,
-1917,Wounded Morroc@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,afterskill,684,,,,,,,
-1917,Wounded Morroc@NPC_EARTHQUAKE,chase,653,10,10000,2000,180000,no,self,afterskill,678,,,,,,,
-1917,Wounded Morroc@NPC_EARTHQUAKE,attack,653,10,10000,2000,180000,no,self,afterskill,678,,,,,,,
+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 Morroc@NPC_PULSESTRIKE,chase,661,5,10000,800,60000,no,self,myhpinrate,31,40,,,,,,14
-1917,Wounded Morroc@NPC_PULSESTRIKE,attack,661,5,10000,800,60000,no,self,myhpinrate,31,40,,,,,,14
-1917,Wounded Morroc@NPC_WIDESTONE,chase,666,5,10000,0,60000,no,self,afterskill,661,,,,,,,
-1917,Wounded Morroc@NPC_WIDESTONE,attack,666,5,10000,0,60000,no,self,afterskill,661,,,,,,,
-1917,Wounded Morroc@WZ_METEOR,chase,83,5,10000,800,60000,no,target,afterskill,666,,,,,,,
-1917,Wounded Morroc@WZ_METEOR,attack,83,5,10000,800,60000,no,target,afterskill,666,,,,,,,
+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 Morroc@NPC_VAMPIRE_GIFT,chase,679,9,10000,1000,50000,no,self,myhpinrate,41,50,,,,,,15
-1917,Wounded Morroc@NPC_VAMPIRE_GIFT,attack,679,9,10000,1000,50000,no,self,myhpinrate,41,50,,,,,,15
-1917,Wounded Morroc@NPC_WIDESOULDRAIN,chase,680,10,10000,1000,50000,no,self,afterskill,679,,,,,,,
-1917,Wounded Morroc@NPC_WIDESOULDRAIN,attack,680,10,10000,1000,50000,no,self,afterskill,679,,,,,,,
-1917,Wounded Morroc@NPC_EVILLAND,chase,670,10,10000,1000,50000,no,target,afterskill,680,,,,,,,
-1917,Wounded Morroc@NPC_EVILLAND,attack,670,10,10000,1000,50000,no,target,afterskill,680,,,,,,,
+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 Morroc@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,myhpinrate,51,60,,,,,,3
-1917,Wounded Morroc@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpinrate,51,60,,,,,,3
-1917,Wounded Morroc@NPC_HELLPOWER,chase,683,1,10000,800,35000,no,target,afterskill,668,,,,,,,
-1917,Wounded Morroc@NPC_HELLPOWER,attack,683,1,10000,800,35000,no,target,afterskill,668,,,,,,,
-1917,Wounded Morroc@NPC_HELLJUDGEMENT,chase,662,5,10000,800,35000,no,self,afterskill,683,,,,,,,
-1917,Wounded Morroc@NPC_HELLJUDGEMENT,attack,662,5,10000,800,35000,no,self,afterskill,683,,,,,,,
+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 Morroc@MG_STONECURSE,chase,16,10,10000,1000,20000,no,target,myhpinrate,61,80,,,,,,2
-1917,Wounded Morroc@MG_STONECURSE,attack,16,10,10000,1000,20000,no,target,myhpinrate,61,80,,,,,,2
-1917,Wounded Morroc@MG_FIREBOLT,chase,19,10,10000,300,20000,no,target,afterskill,16,,,,,,,
-1917,Wounded Morroc@MG_FIREBOLT,attack,19,10,10000,300,20000,no,target,afterskill,16,,,,,,,
-1917,Wounded Morroc@MG_FROSTDIVER,chase,15,40,10000,1000,20000,no,target,afterskill,19,,,,,,,
-1917,Wounded Morroc@MG_FROSTDIVER,attack,15,40,10000,1000,20000,no,target,afterskill,19,,,,,,,
-1917,Wounded Morroc@WZ_JUPITEL,chase,84,28,10000,1000,20000,no,target,afterskill,15,,,,,,,
-1917,Wounded Morroc@WZ_JUPITEL,attack,84,28,10000,1000,20000,no,target,afterskill,15,,,,,,,
+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,,,,,,,,
@@ -4965,8 +4963,6 @@
 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@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,onspawn,0,1922,1923,1924,1925,,,
-1917,Wounded Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,,
 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,,,,,,,,

db/pre-re/pet_db.txt

@@ -50,7 +50,7 @@
 1023,ORK_WARRIOR,Orc Warrior,635,9017,10009,537,80,60,20,100,250,20,500,150,1,0,600,200,300,{ petskillattack2 "NPC_PIERCINGATT",100,1,0,10; },{ bonus bAtk,10; bonus bDef,-3; }
 1026,MUNAK,Munak,636,9018,10008,537,80,60,20,100,250,20,500,150,0,0,300,750,300,{ petskillattack2 "NPC_DARKNESSATTACK",444,1,0,10; },{ bonus bInt,1; bonus bDef,1; }
 1110,DOKEBI,Dokebi,637,9019,10005,537,80,60,20,100,250,20,500,150,0,0,300,300,800,{ petskillattack "BS_HAMMERFALL",1,0,10; },{ bonus bMatkRate,1; bonus bAtkRate,-1; }
-1170,SOHEE,Sohee,638,9020,10016,537,80,60,10,100,250,20,500,150,0,0,100,1000,200,{ petheal 400,60,33,100; },{ bonus bStr,1; bonus bDex,1; }
+1170,SOHEE,Sohee,638,9020,10016,537,80,60,10,100,250,20,500,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,33,100; },{ bonus bStr,1; bonus bDex,1; }
 1029,ISIS,Isis,639,9021,10006,537,80,60,10,100,250,20,500,150,0,0,650,450,150,{ petskillsupport "PR_MAGNIFICAT",2,60,50,50; },{ bonus bMatkRate,-1; bonus bAtkRate,1; }
 1155,PETIT,Petite,640,9022,10011,537,80,60,20,100,250,20,500,150,0,0,800,400,100,{ petskillattack2 "WZ_HEAVENDRIVE",500,1,0,10; },{ bonus bDef,-2; bonus bMdef,-2; bonus bAspdRate,1; }
 1109,DEVIRUCHI,Deviruchi,641,9023,10004,711,80,60,10,100,250,20,500,150,0,0,800,200,100,{ petskillbonus bAgiDexStr,6,20,40; },{ bonus bMatkRate,1; bonus bAtkRate,1; bonus bMaxHPrate,-3; bonus bMaxSPrate,-3; }

db/pre-re/quest_db.txt

@@ -3111,6 +3111,9 @@
 
 60200,604800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Endless Tower Effect"
 60201,14400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Endless Tower Time Limit"
+60211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Thor Volcano base camp"
+60212,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Thor Volcano base camp"
+60213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Thor Volcano base camp"
 60301,0,1155,100,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dragon Hunting"
 60302,0,1155,200,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dragon Hunting"
 60303,0,1714,100,0,0,0,0,0,0,0,0,0,0,0,0,0,"Dragon Hunting"

db/pre-re/skill_cast_db.txt

@@ -37,8 +37,8 @@
 13,500,1200:1000:1400:1200:1600:1400:1800:1600:2000:1800,0,0,0,0
 //-- MG_COLDBOLT
 14,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
-//-- MG_FROSTDRIVER
-15,800,1500,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,0
+//-- MG_FROSTDIVER
+15,800,1500,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000:30000,0
 //-- MG_STONECURSE
 16,1000,0,0,5000,20000,0
 //-- MG_FIREBALL
@@ -96,7 +96,7 @@
 //-- TF_HIDING
 51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0
 //-- TF_POISON
-52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
+52,0,0,0,0,60000,0
 //==========================================
 
 
@@ -235,9 +235,9 @@
 //-- AS_POISONREACT
 139,0,0,0,20000:25000:30000:35000:40000:45000:50000:55000:60000:65000,0,0
 //-- AS_VENOMDUST
-140,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
+140,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,60000,0
 //-- AS_SPLASHER
-141,1000,0,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
+141,1000,0,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,60000,0
 
 //==========================================
 
@@ -319,7 +319,7 @@
 //-- NPC_LICK
 206,0,0,0,0,5000,0
 //-- NPC_HALLUCINATION
-207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0
+207,0,0,0,0,30000,0
 //==========================================
 
 
@@ -378,7 +378,7 @@
 //-- CR_HOLYCROSS
 253,0,0,0,0,30000,0
 //-- CR_GRANDCROSS
-254,2000,1500,900,900,30000,0
+254,3000,1500,800,800,30000,0
 //-- CR_DEVOTION
 255,3000,0,0,0,30000:45000:60000:75000:90000,0
 //-- CR_PROVIDENCE
@@ -517,7 +517,7 @@
 //-- NPC_GRANDDARKNESS
 339,0,0,900,900,30000,0
 //-- NPC_STOP
-342,0,0,0,10000,0,0
+342,0,0,0,15000,0,0
 //-- NPC_CHANGEUNDEAD
 348,0,0,0,30000,0,0
 //-- NPC_POWERUP
@@ -645,7 +645,7 @@
 //-- LK_JOINTBEAT
 399,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,30000,0
 //-- HW_NAPALMVULCAN
-400,1000,1000,0,0,45000,0
+400,1000,1000,0,0,30000,0
 //-- CH_SOULCOLLECT
 401,2000,0,0,600000,0,0
 //-- PF_MINDBREAKER
@@ -655,7 +655,7 @@
 //-- PF_FOGWALL
 404,0,0,0,20000,10000,0
 //-- PF_SPIDERWEB
-405,0,0,0,30000,8000,0
+405,0,0,0,16000,8000,0
 //-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3))
 406,500,500,0,0,30000:5000:120000,0
 //-- ASC_CDP
@@ -999,9 +999,9 @@
 
 //===== New Monster Skills (12.1) ==========
 //-- NPC_HELLPOWER
-683,0,0,0,0,300000,0
+683,0,0,0,0,180000,0
 //-- NPC_WIDEHELLDIGNITY
-684,0,0,0,0,300000,0
+684,0,0,0,0,180000,0
 //-- NPC_INVINCIBLE
 685,0,0,0,-1,0,0
 //-- NPC_INVINCIBLEOFF
@@ -1026,6 +1026,10 @@
 698,0,20000,0,0,0,0
 //==========================================
 
+//===== New Monster Skills (12.1) ==========
+//-- NPC_MAXPAIN
+716,0,0,0,10000,0,0,0
+
 //===== 2nd Jobs Quest Skills ==============
 //-- KN_CHARGEATK
 1001,500,0,0,0,0,0
@@ -1084,7 +1088,7 @@
 //-- RK_MILLENNIUMSHIELD
 2011,0,1000,0,180000,60000,0
 //-- RK_CRUSHSTRIKE
-2012,0,0,0,180000,30000,0
+2012,0,0,0,30000,30000,0
 //-- RK_REFRESH
 2013,0,0,0,60000,120000,0
 //-- RK_GIANTGROWTH
@@ -1248,13 +1252,13 @@
 //-- RA_CAMOUFLAGE
 2247,0,0,0,10000,0,0
 //-- RA_MAGENTATRAP
-2249,0,2000,0,15000,10000,0
+2249,0,2000,0,15000,0,0
 //-- RA_COBALTTRAP
-2250,0,2000,0,15000,10000,0
+2250,0,2000,0,15000,0,0
 //-- RA_MAIZETRAP
-2251,0,2000,0,15000,10000,0
+2251,0,2000,0,15000,0,0
 //-- RA_VERDURETRAP
-2252,0,2000,0,15000,10000,0
+2252,0,2000,0,15000,0,0
 //-- RA_FIRINGTRAP
 2253,0,0,0,15000,15000,0
 //-- RA_ICEBOUNDTRAP
@@ -1534,7 +1538,7 @@
 //-- SO_STRIKING
 2451,1000,1000,0,60000,0,2000
 //-- SO_WARMER
-2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000
+2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,0,35000:40000:45000:50000:55000
 //-- SO_VACUUM_EXTREME
 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,2000,5000
 //-- SO_VARETYR_SPEAR

db/pre-re/skill_db.txt

@@ -16,7 +16,13 @@
 //    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)
+// 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)
@@ -49,7 +55,7 @@
 // 15 Blowcount (amount of tiles skill knockbacks)
 // 16 inf3 (skill information 3):
 //    0x00001 - skill ignores land protector
-//    0x00002 - skill that doesn't end camouflage
+//    0x00002 - free
 //    0x00004 - usable skills while hiding
 //    0x00008 - skill that can be use while in dancing state
 //    0x00010 - skill that could hit emperium
@@ -184,7 +190,7 @@
 85,9,8,2,4,0,0,10,-10,yes,0,0x2000,0,magic,0,0x0,		WZ_VERMILION,Lord of Vermilion
 86,9,8,1,1,0,0,5,1,yes,0,0x2000,0,magic,0,0x0,		WZ_WATERBALL,Water Ball
 87,9,6,2,1,0x1,0,10,1,yes,0,0,0,magic,0,0x0,		WZ_ICEWALL,Ice Wall
-88,0,6,4,1,0x2,2,10,1,yes,0,0x2000,0,magic,0,0x0,		WZ_FROSTNOVA,Frost Nova
+88,0,6,4,1,0x2,3,10,1,yes,0,0x2000,0,magic,0,0x0,		WZ_FROSTNOVA,Frost Nova
 89,9,6,2,1,0,0,10,1,yes,0,0x2000,0,magic,2,0x0,		WZ_STORMGUST,Storm Gust
 90,9,8,1,2,0,0,5,1:2:3:4:5,yes,0,0x2000,0,magic,0,0x0,	WZ_EARTHSPIKE,Earth Spike
 91,9,8,2,2,0,0,5,1:2:3:4:5,yes,0,0x2000,0,magic,0,0x10000,	WZ_HEAVENDRIVE,Heaven's Drive
@@ -318,7 +324,7 @@
 204,0,0,4,0,0x1,0,1,1,no,0,0x2,0,magic,0,0x0,	NPC_BARRIER,Barrier
 205,0,0,4,0,0x1,0,1,1,no,0,0x2,0,weapon,0,0x0,	NPC_DEFENDER,Defender
 206,1,6,1,-1,0x1,0,5,1,no,0,0x2,0,weapon,0,0x0,	NPC_LICK,Lick
-207,9,0,1,0,0x1,0,10,1,no,0,0x2,0,magic,0,0x0,	NPC_HALLUCINATION,Hallucination
+207,9,0,1,0,0x1,0,5,1,no,0,0x2,0,magic,0,0x0,	NPC_HALLUCINATION,Hallucination
 208,0,0,4,0,0x1,0,1,1,no,0,0x2,0,magic,0,0x0,	NPC_REBIRTH,Rebirth
 209,0,0,4,0,0x1,0,10,1,no,0,0x2,0,magic,0,0x0,	NPC_SUMMONMONSTER,Monster Summons
 
@@ -415,7 +421,7 @@
 286,2,6,2,1,0x1,0,5,1,yes,0,0,0,magic,0,0x1000,		SA_DELUGE,Deluge
 287,2,6,2,4,0x1,0,5,1,yes,0,0,0,magic,0,0x1000,		SA_VIOLENTGALE,Whirlwind
 288,2,6,2,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,		SA_LANDPROTECTOR,Magnetic Earth
-289,9,6,1,0,0x1,0:0:0:0:0:-1,5,1,yes,0,0xE00,0,magic,0,0x20,	SA_DISPELL,Dispell
+289,9,6,1,0,0x1,0:0:0:0:0:-1,5,1,yes,0,0xE00,0,magic,0,0x10020,	SA_DISPELL,Dispell
 290,0,6,4,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0,	SA_ABRACADABRA,Hocus-pocus
 291,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0,0x0,	SA_MONOCELL,Monocell
 292,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0,0x0,	SA_CLASSCHANGE,Class Change
@@ -549,7 +555,7 @@
 //****
 // Sniper
 380,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,0x0,	SN_SIGHT,Falcon Eyes
-381,9,8,1,-3,0x40,0,5,1,yes,0,0,0,misc,0,0x0,		SN_FALCONASSAULT,Falcon Assault
+381,9,8,1,0,0x40,0,5,1,yes,0,0,0,misc,0,0x0,		SN_FALCONASSAULT,Falcon Assault
 382,9,8,1,-1,0,1,5,1,yes,0,0x40000,14,weapon,0,0x0,	SN_SHARPSHOOTING,Focused Arrow Strike
 383,0,6,4,0,0x3,-1,10,1,yes,0,0,0,weapon,0,0x0,	SN_WINDWALK,Wind Walker
 
@@ -576,7 +582,7 @@
 // Clown & Gypsy
 394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0,0x0,	CG_ARROWVULCAN,Vulcan Arrow
 395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x0,	CG_MOONLIT,Sheltering Bliss
-396,1,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40,	CG_MARIONETTE,Marionette Control
+396,7,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40,	CG_MARIONETTE,Marionette Control
 
 //****
 // Lord Knight
@@ -814,7 +820,7 @@
 //****
 // Additional NPC skill (Episode 12)
 682,0,0,4,0,0x1,0,1,1,no,0,0x2,0,none,0,0x0,	NPC_TALK,Talk
-683,-9,6,1,-1,0,0,1,1,no,0,0x2,0,none,0,0x0,	NPC_HELLPOWER,Hell Power
+683,-9,0,1,0,0x1,0,5,1,no,0,0x2,0,none,0,0x0,	NPC_HELLPOWER,Hell Power
 684,0,6,4,0,0x3,-1,1,1,no,0,0x2,0,none,0,0x0,	NPC_WIDEHELLDIGNITY,Hell Dignity
 685,0,0,4,0,0x1,0,1,1,no,0,0x2,0,none,0,0x0,	NPC_INVINCIBLE,Invincible
 686,0,0,4,0,0x1,0,1,1,no,0,0x2,0,none,0,0x0,	NPC_INVINCIBLEOFF,Invincible off
@@ -853,8 +859,8 @@
 //713,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DANCINGBLADE,Dancing Blade
 //714,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DANCINGBLADE_ATK,Dancing Blade Attack
 //715,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DARKPIERCING,Dark Piercing
-//716,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAXPAIN,Max Pain
-//717,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAXPAIN_ATK,Max Pain Attack
+716,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0,0x0,		NPC_MAXPAIN,Max Pain
+717,0,6,1,0,0xD2,18,10,1,no,0,0x2,0,misc,0,0x0,		NPC_MAXPAIN_ATK,Max Pain Attack
 //718,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DEATHSUMMON,Death Summon
 //719,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_HELLBURNING,Hell Burning
 //720,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_JACKFROST,Jack Frost 2
@@ -865,6 +871,28 @@
 //725,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION,Reverberation 2
 //726,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION_ATK,Reverberation Attack
 //727,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEX_AETERNA,Lex Aeterna 2
+//728,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ARROWSTORM,NPC Arrow Storm
+//729,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CHEAL,NPC Coluceo Heal
+//730,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_SR_CURSEDCIRCLE,NPC 
+//731,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DRAGONBREATH,NPC Dragon Breath
+//732,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FATALMENACE,NPC Fatal Menace
+//733,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION,NPC Magma Eruption
+//734,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION_DOTDAMAGE,NPC Magma Eruption Dot Damage
+//735,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MANDRAGORA,NPC Howling of Mandragora
+//736,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PSYCHIC_WAVE,NPC Psychic Wave
+//737,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_RAYOFGENESIS,NPC Ray of Genesis
+//738,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_VENOMIMPRESS,NPC Venom Impress
+//739,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CLOUD_KILL,NPC Cloud Kill
+//740,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_IGNITIONBREAK,NPC Ignition Break
+//741,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PHANTOMTHRUST,NPC Phantom Thrust
+//742,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_POISON_BUSTER,NPC Poison Blaster
+//743,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_HALLUCINATIONWALK,NPC Hallucination Walk
+//744,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ELECTRICWALK,NPC Electric Walk
+//745,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FIREWALK,NPC Fire Walk
+//746,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDEDISPEL,Wide Dispell
+//747,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEASH,Leash
+//748,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDELEASH,Wide Leash
+//749,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDECRITICALWOUND,Wide Critical Wound
 
 //****
 // 2nd Quest Skills
@@ -876,7 +904,7 @@
 1006,0,6,4,3,0,1,1,1,yes,0,0x40001,0,magic,3,0x0,	WZ_SIGHTBLASTER,Sight Blaster
 1007,0,6,4,0,0x1,0,1,0,no,0,0x1,0,none,0,0x0,	SA_CREATECON,Create Elemental Converter
 1008,9,6,1,1,0x1,0,1,1,yes,0,0x1,0,magic,0,0x0,	SA_ELEMENTWATER,Elemental Change Water
-1009,-9,6,1,0,0,0,1,1,no,0,0x1,0,weapon,3,0x0,	HT_PHANTASMIC,Phantasmic Arrow
+1009,-9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,3,0x0,	HT_PHANTASMIC,Phantasmic Arrow
 1010,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0,	BA_PANGVOICE,Pang Voice
 1011,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0,0x0,	DC_WINKCHARM,Wink of Charm
 1012,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,0x4000,	BS_UNFAIRLYTRICK,Unfair Trick
@@ -909,7 +937,7 @@
 2017,0,6,4,-1,0x2,3,1,1,no,0,0x40000,0,weapon,7,0x0,	RK_STORMBLAST,Storm Blast
 2018,0,6,4,0,0x3,-1,1,1,yes,0,0,0,none,0,0x0,	RK_FIGHTINGSPIRIT,Fighting Spirit //CHECK Is this splash needed?
 2019,9,6,4,6,0x1,0,1,1,yes,0,0,0,none,0,0x0,	RK_ABUNDANCE,Abundance
-2020,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	RK_PHANTOMTHRUST,Phantom Thrust
+2020,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0x400,0,weapon,0,0x0,	RK_PHANTOMTHRUST,Phantom Thrust
 
 //****
 // WL Warlock
@@ -983,7 +1011,7 @@
 2049,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		AB_EUCHARISTICA,Eucharistica
 2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0,0x0,	AB_RENOVATIO,Renovatio
 2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,0x0,	AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack.
-2052,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x20,	AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why?
+2052,11,6,1,0,0x1,0,5,1,yes,0,0x400,0,magic,0,0x10020,	AB_CLEARANCE,Clearance
 2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0,	AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members?
 2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0,0x0,	AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later.
 2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0,	AB_DUPLELIGHT_MELEE,Duple Light Melee
@@ -1008,7 +1036,7 @@
 2244,9,6,1,0,0x98,0,5,1,no,0,0,0,weapon,0,0x40080,	RA_WUGBITE,Warg Bite
 2245,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0,		RA_TOOTHOFWUG,Tooth of Warg
 2246,0,6,4,0,0x2,3:4:5:6:7,5,1,no,0,0x40000,0,weapon,0,0x0,	RA_SENSITIVEKEEN,Sensitive Keen
-2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x80042,		RA_CAMOUFLAGE,Camouflage
+2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x80040,		RA_CAMOUFLAGE,Camouflage
 2248,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0,		RA_RESEARCHTRAP,Research Trap
 2249,3,6,2,3,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000,	RA_MAGENTATRAP,Magenta Trap
 2250,3,6,2,1,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000,	RA_COBALTTRAP,Cobalt Trap
@@ -1065,7 +1093,7 @@
 2295,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_LAZINESS,Masquerade - Laziness
 2296,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_UNLUCKY,Masquerade - Unlucky
 2297,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0,0x0,	SC_WEAKNESS,Masquerade - Weakness
-2298,3,6,1,0,0x1,0,5,1,yes,0,0,0,none,0,0x8000,	SC_STRIPACCESSARY,Strip Accessory
+2298,3,6,1,0,0x1,0,5,1,yes,0,0,0,none,0,0x0,	SC_STRIPACCESSARY,Strip Accessory
 2299,7,6,2,0,0x1,0,3,1,yes,0,0,3,magic,0,0x0,	SC_MANHOLE,Man Hole
 2300,7,6,2,0,0x1,0,3,1,yes,0,0,1,magic,0,0x0,	SC_DIMENSIONDOOR,Dimension Door
 2301,7,6,2,0,0x1,0,3,1,yes,0,0x20000,0,magic,0,0x0,	SC_CHAOSPANIC,Chaos Panic
@@ -1215,7 +1243,7 @@
 2490,9,6,2,0,0x3,1,5,1,yes,0,0x80,2:3:4:5:6,misc,0,0x0,	GN_HELLS_PLANT,Hell's Plant
 2491,0,6,1,0,0x90,0,5,1,no,0,0,0,misc,0,0x0,	GN_HELLS_PLANT_ATK,Hell's Plant Attack
 2492,0,6,4,0,0x3,5:6:6:7:7,5,1,yes,0,0,0,none,0,0x0,	GN_MANDRAGORA,Howling of Mandragora
-2493,11,6,16,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	GN_SLINGITEM,Sling Item
+2493,11,6,16,0,0x1,0,1,1,no,0,0x200,0,none,0,0x0,	GN_SLINGITEM,Sling Item
 2494,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,		GN_CHANGEMATERIAL,Change Material
 2495,0,6,4,0,0x1,0,2,1,no,0,0,0,none,0,0x0,		GN_MIX_COOKING,Mix Cooking
 2496,0,6,4,0,0x1,0,2,1,no,0,0,0,none,0,0x0,		GN_MAKEBOMB,Create Bomb
@@ -1242,7 +1270,7 @@
 //2551,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0,	RL_GLITTERING_GREED,Flip The Coin Greed
 2552,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0,	RL_RICHS_COIN,Rich's Coin
 2553,15,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0,	RL_MASS_SPIRAL,Mass Spiral
-2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x20,	RL_BANISHING_BUSTER,Banishing Buster
+2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x10020,	RL_BANISHING_BUSTER,Banishing Buster
 2555,3,6,2,0,0x1,1,5,1,no,0,0,3,misc,0,0x0,	RL_B_TRAP,Bind Trap
 2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,0x0,	RL_FLICKER,Flicker
 2557,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,0x0,	RL_S_STORM,Shatter Storm
@@ -1274,7 +1302,7 @@
 3006,7:8:9:10:11,6,2,-1,0x42,2,5,1,no,0,0,0,weapon,0,0x0,	KO_BAKURETSU,Kunai Explosion
 3007,0,6,4,-1,0x42,4:4:4:4:5,5,1,no,0,0,0,weapon,0,0x0,	KO_HAPPOKUNAI,Kunai Splash
 3008,11,8,2,0,0x56,1:1:1:1:1:1:1:1:1:2,10,-10,no,0,0,0,misc,0,0x0,	KO_MUCHANAGE,Rapid Throw
-3009,9:10:11:12:13,8,2,-1,0x2,3,5,2,no,0,0,0,weapon,0,0x0,	KO_HUUMARANKA,Swirling Petal
+3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0,0x0,	KO_HUUMARANKA,Swirling Petal
 3010,3,6,4,0,0x52,0,5,1,no,0,0x80,0,weapon,0,0x10,	KO_MAKIBISHI,Makibishi
 3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0,0x0,	KO_MEIKYOUSISUI,Pure Soul
 3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,3:4:5:6:7,0x0,	KO_ZANZOU,Illusion - Shadow
@@ -1389,7 +1417,7 @@
 8035,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		MH_ANGRIFFS_MODUS,Attack Mode
 8036,3:4:5:6:7,6,1,0,0,0,5,1,no,0,0x0200,0,weapon,0,0x0,	MH_TINDER_BREAKER,Tinder Breaker
 8037,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,0x0,	MH_CBC,Continual Break Combo
-8038,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,0x0,	MH_EQC,Eternal Quick Combo
+8038,1,6,4,0,0,0,5,1,no,0,0x200,0,misc,0,0x0,	MH_EQC,Eternal Quick Combo
 8039,0,6,4,3,0x2,1:1:1:2:2,5,1,no,0,0,0,weapon,0,0x0,	MH_MAGMA_FLOW,Magma Flow
 8040,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		MH_GRANITIC_ARMOR,Granitic Armor
 8041,7,6,2,3,0x2,0,5,1,no,0,0,1,weapon,0,0x0,		MH_LAVA_SLIDE,Lava Slide

db/pre-re/skill_nocast_db.txt

@@ -9,7 +9,7 @@
 // 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
 // 4    - cannot be used in GvG maps
 // 8    - cannot be used in Battleground maps
-// 16   - cannot be cloned (clones will not copy this skill)
+// 16   - cannot be used in WOE:TE castles
 // Restricted zones - configured by 'restricted <number>' mapflag
 // 32   - cannot be used in zone 1 maps
 // 64   - cannot be used in zone 2 maps
@@ -18,6 +18,7 @@
 // 512  - cannot be used in zone 5 maps
 // 1024 - cannot be used in zone 6 maps
 // 2048 - cannot be used in zone 7 maps
+// 4096 - cannot be used in zone 8 maps
 //
 // Example:
 // 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
@@ -99,12 +100,6 @@
 488,3	//CG_HERMODE
 3013,3	//KO_KYOUGAKU
 
-//----------------------------------------------------------------------------
-// Clone Forbidden/pointless skills
-//----------------------------------------------------------------------------
-77,16	//PR_TURNUNDEAD
-79,16	//PR_MAGNUS
-
 //----------------------------------------------------------------------------
 // Zone 1 - Aldebaran Turbo Track
 //----------------------------------------------------------------------------

db/pre-re/skill_require_db.txt

@@ -555,12 +555,12 @@
 // RK Rune Knight
 2001,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//RK_ENCHANTBLADE
 2002,0,0,30:35:40:45:50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//RK_SONICWAVE
-2003,0,0,28:31:34:37:40:43:46:49:52:55,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_DEATHBOUND
+2003,0,0,50:60:65:70:75:80:85:90:95:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_DEATHBOUND
 2004,0,0,60,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//RK_HUNDREDSPEAR
 2005,0,0,20:24:28:32:36,0,0,0,1:2:3:4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0			//RK_WINDCUTTER
 2006,0,0,35:40:45:50:55,0,0,0,1:2:3:4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0			//RK_IGNITIONBREAK
 2008,0,0,30:35:40:45:50:55:60:65:70:75,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_DRAGONBREATH
-2009,0,0,70,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//RK_DRAGONHOWLING
+2009,0,0,30,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//RK_DRAGONHOWLING
 2011,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//RK_MILLENNIUMSHIELD
 2012,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//RK_CRUSHSTRIKE
 2013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//RK_REFRESH
@@ -631,7 +631,7 @@
 // AB Arch Bishop
 2038,0,0,20:23:26:29:32,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//AB_JUDEX
 2039,0,0,30,0,-30,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//AB_ANCILLA
-2040,0,0,20:24:28:32:36:40:44:48:52:56,0,0,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AB_ADORAMUS
+2040,0,0,22:28:34:40:46:52:58:64:70:76,0,0,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AB_ADORAMUS
 2041,0,0,280:320:360,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//AB_CLEMENTIA
 2042,0,0,200:220:240,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//AB_CANTO
 2043,0,0,200:220:240,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//AB_CHEAL
@@ -684,13 +684,13 @@
 2258,0,0,2:4:6,0,0,0,99,0,0,mado,0,0,6145,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_VULCANARM
 2259,0,0,20,0,0,0,99,0,0,mado,0,0,2139,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_FLAMELAUNCHER
 2260,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,6147,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_COLDSLOWER
-2261,0,0,40:45:50,0,0,0,99,8,1,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//NC_ARMSCANNON
+2261,0,0,30:45:60,0,0,0,99,8,1,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//NC_ARMSCANNON
 2262,0,0,20:40:60,0,0,0,99,0,0,mado,0,0,2800,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//NC_ACCELERATION
 2263,0,0,25,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_HOVERING
 2264,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_F_SIDESLIDE
 2265,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_B_SIDESLIDE
 
-2267,0,0,1,0,0,0,99,0,0,mado,0,0,2802,0,6146,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_SELFDESTRUCTION
+2267,0,0,200,0,0,0,99,0,0,mado,0,0,2802,0,6146,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_SELFDESTRUCTION
 2268,0,0,100,0,0,0,99,0,0,mado,0,0,6360,3,6363,3,6362,3,6361,3,2803,0,0,0,0,0,0,0,0,0,6146,2,0			//NC_SHAPESHIFT
 2269,0,0,20,0,0,0,99,0,0,mado,0,0,2804,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0						//NC_EMERGENCYCOOL
 2270,0,0,45,0,0,0,99,0,0,mado,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//NC_INFRAREDSCAN
@@ -709,7 +709,7 @@
 
 //****
 // SC Shadow Chaser
-2284,0,0,20:25:30:35:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//SC_FATALMENACE
+2284,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//SC_FATALMENACE
 2285,0,0,40:45:50:55:60:65:70:75:80:85,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SC_REPRODUCE
 2286,0,0,40:45:50:55:60:65:70:75:80:85,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SC_AUTOSHADOWSPELL
 2287,0,0,40:50:60:70:80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//SC_SHADOWFORM
@@ -764,7 +764,7 @@
 2332,0,0,150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//SR_RAMPAGEBLASTER
 2333,0,0,80,0,0,0,99,0,0,none,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_CRESCENTELBOW
 2334,0,0,40:60:80:100:120,-1:-2:-3:-4:-5,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SR_CURSEDCIRCLE
-2335,0,0,80:70:60:50:40,-5:-4:-3:-2:-1,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SR_LIGHTNINGWALK
+2335,0,0,40,-5:-4:-3:-2:-1,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//SR_LIGHTNINGWALK
 2336,0,0,10:15:20:25:30,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//SR_KNUCKLEARROW
 2337,0,0,45,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_WINDMILL
 2338,0,0,120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//SR_RAISINGDRAGON
@@ -772,7 +772,7 @@
 2340,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_ASSIMILATEPOWER
 2341,0,0,50,0,0,0,99,0,0,none,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_POWERVELOCITY
 2342,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//SR_CRESCENTELBOW_AUTOSPELL
-2343,0,0,11:12:13:14:15:16:17:18:19:20,0,-11:-12:-13:-14:-15:-16:-17:-18:-19:-20,0,99,0,0,none,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SR_GATEOFHELL
+2343,0,0,30,0,-11:-12:-13:-14:-15:-16:-17:-18:-19:-20,0,99,0,0,none,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SR_GATEOFHELL
 2344,0,0,20:25:30:35:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//SR_GENTLETOUCH_QUIET
 2345,0,0,40:50:60:70:80,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//SR_GENTLETOUCH_CURE
 2346,0,0,40:50:60:70:80,-1:-2:-3:-4:-5,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SR_GENTLETOUCH_ENERGYGAIN
@@ -780,7 +780,7 @@
 2348,0,0,40:50:60:70:80,0,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0			//SR_GENTLETOUCH_REVITALIZE
 //More from SR Sura (but not following ID order)
 2517,0,0,80:90:100:110:120,0,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//SR_HOWLINGOFLION
-2518,0,0,22:24:26:28:30,0,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0			//SR_RIDEINLIGHTNING
+2518,0,0,40:50:60:70:80,0,0,0,99,0,0,none,0,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0			//SR_RIDEINLIGHTNING
 
 //****
 // WA Wanderer
@@ -918,7 +918,7 @@
 3004,0,0,10:12:14:16:18,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0			//KO_JYUMONJIKIRI
 3005,0,0,12:16:20:24:28,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_SETSUDAN
 3006,0,0,5:6:7:8:9,0,0,0,99,0,0,none,0,0,13294,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_BAKURETSU
-3007,0,0,8:9:10:11:12,0,0,0,99,7,8,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_HAPPOKUNAI
+3007,0,0,12:14:16:18:20,0,0,0,99,7,8,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_HAPPOKUNAI
 3008,0,0,50,0,0,10000:20000:30000:40000:50000:60000:70000:80000:90000:100000,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KO_MUCHANAGE
 3009,0,0,24:28:32:36:40,0,0,0,22,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_HUUMARANKA
 3010,0,0,9:12:15:18:21,0,0,0,99,0,0,none,0,0,6493,3,6493,4,6493,5,6493,6,6493,7,0,0,0,0,0,0,0,0,0,0,0		//KO_MAKIBISHI
@@ -934,9 +934,9 @@
 3020,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//KO_ZENKAI
 3021,0,0,40:44:48:52:56,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_GENWAKU
 3022,0,0,70:75:80:85:90,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KO_IZAYOI
-3023,0,0,60:65:70:75:80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KG_KAGEHUMI
+3023,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//KG_KAGEHUMI
 3024,0,0,50,0,0,0,99,0,0,none,0,0,7524,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//KG_KYOMU
-3025,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,0,6499,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0				//KG_KAGEMUSYA
+3025,0,0,60:65:70:75:80,0,0,0,99,0,0,none,0,0,6499,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0				//KG_KAGEMUSYA
 3026,0,0,60:70:80:90:100 ,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0				//OB_ZANGETSU
 3027,0,0,55:60:65:70:75 ,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0				//OB_OBOROGENSOU
 3029,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0					//OB_AKAITSUKI
@@ -1035,7 +1035,7 @@
 8232,0,0,4:5:6:7:8:9:10:11:12:13,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//MER_PROVOKE
 8233,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//MER_AUTOBERSERK
 8234,0,0,15:17:19:21:23:25:27:29:31:33,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MER_DECAGI
-8235,0,0,10,100,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//MER_SCAPEGOAT
+8235,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//MER_SCAPEGOAT
 8236,0,0,20:20:20:20:20:18:16:14:12:10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MER_LEXDIVINA
 8237,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//MER_ESTIMATION
 8238,0,0,20:20:20:25:25:25:30:30:30:35,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MER_KYRIE
@@ -1090,4 +1090,4 @@
 10010,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_BATTLEORDER
 10011,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_REGENERATION
 10012,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_RESTORE
-10013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_EMERGENCYCALL
+10013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//GD_EMERGENCYCALL

db/pre-re/skill_tree.txt

@@ -1,4 +1,4 @@
-//JobNo,Skill-ID,MaxLV{,JobLV},Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name#
+//JobNo,Skill-ID,MaxLv{,BaseLvReq,JobLvReq},Prerequisite Skill-ID-1,Prerequisite Skill-ID-1-Lv,PrereqSkill-ID-2,PrereqSkill-ID-2-Lv,PrereqSkill-ID-3,PrereqSkill-ID-3-Lv,PrereqSkill-ID-4,PrereqSkill-ID-4-Lv,PrereqSkill-ID-5,PrereqSkill-ID-5-Lv//CLASS_SKILLNAME#Skill Name#
 //Novice
 0,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 0,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
@@ -80,7 +80,7 @@
 5,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 5,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 5,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-5,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+5,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 5,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Thief
 6,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -231,7 +231,7 @@
 10,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 10,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 10,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-10,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+10,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 10,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Hunter
 11,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -496,7 +496,7 @@
 18,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 18,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 18,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-18,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+18,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 18,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Bard
 19,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -594,8 +594,8 @@
 //WeddingClass
 22,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
 22,334,1,0,0,0,0,0,0,0,0,0,0 //WE_MALE#I Will Protect You#
-22,335,5,0,0,0,0,0,0,0,0,0,0 //WE_FEMALE#I Look up to You#
-22,336,5,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARTNER#I miss You#
+22,335,1,0,0,0,0,0,0,0,0,0,0 //WE_FEMALE#I Look up to You#
+22,336,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARTNER#I miss You#
 22,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 //SuperNovice
 23,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -650,7 +650,7 @@
 23,52,10,0,0,0,0,0,0,0,0,0,0 //TF_POISON#Envenom#
 23,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 23,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-23,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+23,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 23,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Gunslinger
 24,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -786,7 +786,7 @@
 4006,154,1,0,0,0,0,0,0,0,0,0,0 //MC_CHANGECART#Change Cart#
 4006,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4006,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
-4006,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4006,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4006,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //ThiefHigh
 4007,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -962,7 +962,7 @@
 4011,486,5,113,5,0,0,0,0,0,0,0,0 //WS_OVERTHRUSTMAX#Maximum Power Thrust#
 4011,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 4011,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-4011,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4011,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4011,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Sniper
 4012,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -1270,7 +1270,7 @@
 4019,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4019,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4019,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-4019,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4019,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4019,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Clown
 4020,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -1302,7 +1302,7 @@
 4020,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4020,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
 4020,394,10,47,5,316,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4020,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4020,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4020,396,1,45,5,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4020,487,5,315,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4020,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -1338,7 +1338,7 @@
 4021,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4021,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
 4021,394,10,47,5,324,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4021,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4021,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4021,396,1,45,5,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4021,487,5,323,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4021,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -1468,7 +1468,7 @@
 4028,155,1,0,0,0,0,0,0,0,0,0,0 //MC_LOUD#Crazy Uproar#
 4028,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4028,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
-4028,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4028,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4028,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Thief
 4029,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -1623,7 +1623,7 @@
 4033,1012,1,0,0,0,0,0,0,0,0,0,0 //BS_UNFAIRLYTRICK#Unfair Trick#
 4033,1013,1,0,0,0,0,0,0,0,0,0,0 //BS_GREED#Greed#
 4033,459,1,111,5,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#Full Adrenaline Rush#
-4033,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4033,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4033,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Hunter
 4034,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -1896,7 +1896,7 @@
 4041,496,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#Twilight Alchemy 1#
 4041,497,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#Twilight Alchemy 2#
 4041,498,1,228,10,0,0,0,0,0,0,0,0	//AM_TWILIGHT3#Twilight Alchemy 3#
-4041,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4041,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4041,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Bard
 4042,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -2048,7 +2048,7 @@
 4045,53,1,52,3,0,0,0,0,0,0,0,0 //TF_DETOXIFY#Detoxify#
 4045,408,1,0,0,0,0,0,0,0,0,0,0 //WE_BABY#Baby#
 4045,409,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLPARENT#Call Parent#
-4045,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4045,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4045,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Taekwon
 4046,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -2515,7 +2515,7 @@
 4056,2241,3,2240,1,0,0,0,0,0,0,0,0 //RA_WUGRIDER#Warg Rider#
 4056,2242,1,2241,1,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
 4056,2243,5,2245,1,0,0,0,0,0,0,0,0 //RA_WUGSTRIKE#Warg Strike#
-4056,2244,5,2240,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
+4056,2244,5,2243,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
 4056,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg#
 4056,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen#
 4056,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage#
@@ -2568,7 +2568,7 @@
 4057,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 4057,2038,5,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex#
 4057,2039,1,2041,3,0,0,0,0,0,0,0,0 //AB_ANCILLA#Ancilla#
-4057,2040,10,79,1,2038,1,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus#
+4057,2040,10,79,1,2038,5,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus#
 4057,2041,3,34,1,0,0,0,0,0,0,0,0 //AB_CLEMENTIA#Crementia#
 4057,2042,3,29,1,0,0,0,0,0,0,0,0 //AB_CANTO#Canto Candidus#
 4057,2043,3,28,1,0,0,0,0,0,0,0,0 //AB_CHEAL#Coluceo Heal#
@@ -2629,7 +2629,7 @@
 4058,2256,5,2255,1,0,0,0,0,0,0,0,0 //NC_BOOSTKNUCKLE#Boost Knuckle#
 4058,2257,3,2256,2,0,0,0,0,0,0,0,0 //NC_PILEBUNKER#Pile Bunker#
 4058,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
-4058,2259,3,2258,3,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
+4058,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
 4058,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
 4058,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
 4058,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
@@ -2645,18 +2645,18 @@
 4058,2272,3,2269,1,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
 4058,2273,3,2272,2,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
 4058,2274,3,2271,3,2273,2,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
-4058,2275,5,2255,1,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
+4058,2275,5,2255,2,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
 4058,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training#
 4058,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth#
 4058,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang#
 4058,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing#
 4058,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
 4058,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
-4058,2282,5,2277,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
+4058,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
 4058,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
-4058,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
+4058,5006,5,2277,1,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4058,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4058,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4058,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4058,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Guillotine Cross (Regular)
 4059,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -2858,7 +2858,7 @@
 4062,2241,3,2240,1,0,0,0,0,0,0,0,0 //RA_WUGRIDER#Warg Rider#
 4062,2242,1,2241,1,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
 4062,2243,5,2245,1,0,0,0,0,0,0,0,0 //RA_WUGSTRIKE#Warg Strike#
-4062,2244,5,2240,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
+4062,2244,5,2243,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
 4062,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg#
 4062,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen#
 4062,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage#
@@ -2915,7 +2915,7 @@
 4063,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby#
 4063,2038,5,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex#
 4063,2039,1,2041,3,0,0,0,0,0,0,0,0 //AB_ANCILLA#Ancilla#
-4063,2040,10,79,1,2038,1,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus#
+4063,2040,10,79,1,2038,5,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus#
 4063,2041,3,34,1,0,0,0,0,0,0,0,0 //AB_CLEMENTIA#Crementia#
 4063,2042,3,29,1,0,0,0,0,0,0,0,0 //AB_CANTO#Canto Candidus#
 4063,2043,3,28,1,0,0,0,0,0,0,0,0 //AB_CHEAL#Coluceo Heal#
@@ -2981,7 +2981,7 @@
 4064,2256,5,2255,1,0,0,0,0,0,0,0,0 //NC_BOOSTKNUCKLE#Boost Knuckle#
 4064,2257,3,2256,2,0,0,0,0,0,0,0,0 //NC_PILEBUNKER#Pile Bunker#
 4064,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
-4064,2259,3,2258,3,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
+4064,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
 4064,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
 4064,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
 4064,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
@@ -2997,18 +2997,18 @@
 4064,2272,3,2269,1,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
 4064,2273,3,2272,2,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
 4064,2274,3,2271,3,2273,2,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
-4064,2275,5,2255,1,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
+4064,2275,5,2255,2,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
 4064,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training#
 4064,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth#
 4064,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang#
 4064,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing#
 4064,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
 4064,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
-4064,2282,5,2277,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
+4064,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
 4064,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
-4064,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
+4064,5006,5,2277,1,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4064,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4064,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4064,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4064,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Guillotine Cross (Trans)
 4065,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -3239,7 +3239,7 @@
 4068,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4068,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4068,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4068,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
+4068,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4068,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Wanderer (Regular)
 4069,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -3295,7 +3295,7 @@
 4069,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4069,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4069,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4069,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
+4069,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4069,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Sura (Regular)
 4070,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -3412,7 +3412,7 @@
 4071,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4071,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4071,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4071,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4071,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4071,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Shadow Chaser (Regular)
 4072,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -3639,7 +3639,7 @@
 4075,313,5,321,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4075,1010,1,0,0,0,0,0,0,0,0,0,0 //BA_PANGVOICE#Pang Voice#
 4075,394,10,47,5,316,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4075,395,5,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4075,395,1,45,5,315,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4075,396,1,45,5,315,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4075,487,5,315,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4075,488,5,45,10,315,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3669,7 +3669,7 @@
 4075,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4075,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4075,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4075,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
+4075,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4075,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Wanderer (Trans)
 4076,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -3701,7 +3701,7 @@
 4076,313,5,329,10,0,0,0,0,0,0,0,0 //BD_SIEGFRIED#Acoustic Rhythm#
 4076,1011,1,0,0,0,0,0,0,0,0,0,0 //DC_WINKCHARM#Wink of Charm#
 4076,394,10,47,5,324,1,0,0,0,0,0,0 //CG_ARROWVULCAN#Vulcan Arrow#
-4076,395,5,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
+4076,395,1,45,5,323,7,0,0,0,0,0,0 //CG_MOONLIT#Sheltering Bliss#
 4076,396,1,45,5,323,5,0,0,0,0,0,0 //CG_MARIONETTE#Marionette Control#
 4076,487,5,323,10,396,1,0,0,0,0,0,0 //CG_LONGINGFREEDOM#Longing for Freedom#
 4076,488,5,45,10,323,10,0,0,0,0,0,0 //CG_HERMODE#Wand of Hermod#
@@ -3731,7 +3731,7 @@
 4076,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4076,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4076,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4076,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG# 
+4076,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4076,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Sura (Trans)
 4077,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -3854,9 +3854,9 @@
 4078,2495,2,2497,1,0,0,0,0,0,0,0,0 //GN_MIX_COOKING#Mix Cooking#
 4078,2496,2,2495,1,0,0,0,0,0,0,0,0 //GN_MAKEBOMB#Create Bomb#
 4078,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
-4078,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug# 
+4078,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4078,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4078,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4078,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4078,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Shadow Chaser (Trans)
 4079,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -4159,7 +4159,7 @@
 4084,2241,3,2240,1,0,0,0,0,0,0,0,0 //RA_WUGRIDER#Warg Rider#
 4084,2242,1,2241,1,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
 4084,2243,5,2245,1,0,0,0,0,0,0,0,0 //RA_WUGSTRIKE#Warg Strike#
-4084,2244,5,2240,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
+4084,2244,5,2243,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
 4084,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg#
 4084,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen#
 4084,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage#
@@ -4217,7 +4217,7 @@
 4085,2241,3,2240,1,0,0,0,0,0,0,0,0 //RA_WUGRIDER#Warg Rider#
 4085,2242,1,2241,1,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
 4085,2243,5,2245,1,0,0,0,0,0,0,0,0 //RA_WUGSTRIKE#Warg Strike#
-4085,2244,5,2240,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
+4085,2244,5,2243,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
 4085,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg#
 4085,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen#
 4085,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage#
@@ -4272,7 +4272,7 @@
 4086,2256,5,2255,1,0,0,0,0,0,0,0,0 //NC_BOOSTKNUCKLE#Boost Knuckle#
 4086,2257,3,2256,2,0,0,0,0,0,0,0,0 //NC_PILEBUNKER#Pile Bunker#
 4086,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
-4086,2259,3,2258,3,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
+4086,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
 4086,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
 4086,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
 4086,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
@@ -4288,18 +4288,18 @@
 4086,2272,3,2269,1,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
 4086,2273,3,2272,2,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
 4086,2274,3,2271,3,2273,2,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
-4086,2275,5,2255,1,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
+4086,2275,5,2255,2,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
 4086,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training#
 4086,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth#
 4086,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang#
 4086,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing#
 4086,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
 4086,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
-4086,2282,5,2277,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
+4086,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
 4086,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
-4086,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
+4086,5006,5,2277,1,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4086,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4086,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4086,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4086,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Mechanic (Mado) (Trans)
 4087,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -4348,7 +4348,7 @@
 4087,2256,5,2255,1,0,0,0,0,0,0,0,0 //NC_BOOSTKNUCKLE#Boost Knuckle#
 4087,2257,3,2256,2,0,0,0,0,0,0,0,0 //NC_PILEBUNKER#Pile Bunker#
 4087,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
-4087,2259,3,2258,3,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
+4087,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
 4087,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
 4087,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
 4087,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
@@ -4364,18 +4364,18 @@
 4087,2272,3,2269,1,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
 4087,2273,3,2272,2,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
 4087,2274,3,2271,3,2273,2,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
-4087,2275,5,2255,1,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
+4087,2275,5,2255,2,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
 4087,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training#
 4087,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth#
 4087,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang#
 4087,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing#
 4087,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
 4087,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
-4087,2282,5,2277,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
+4087,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
 4087,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
-4087,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
+4087,5006,5,2277,1,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4087,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4087,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4087,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4087,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Rune Knight
 4096,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -4517,7 +4517,7 @@
 4098,2241,3,2240,1,0,0,0,0,0,0,0,0 //RA_WUGRIDER#Warg Rider#
 4098,2242,1,2241,1,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
 4098,2243,5,2245,1,0,0,0,0,0,0,0,0 //RA_WUGSTRIKE#Warg Strike#
-4098,2244,5,2240,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
+4098,2244,5,2243,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
 4098,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg#
 4098,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen#
 4098,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage#
@@ -4571,7 +4571,7 @@
 4099,1014,1,0,0,0,0,0,0,0,0,0,0 //PR_REDEMPTIO#Redemptio#
 4099,2038,5,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex#
 4099,2039,1,2041,3,0,0,0,0,0,0,0,0 //AB_ANCILLA#Ancilla#
-4099,2040,10,79,1,2038,1,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus#
+4099,2040,10,79,1,2038,5,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus#
 4099,2041,3,34,1,0,0,0,0,0,0,0,0 //AB_CLEMENTIA#Crementia#
 4099,2042,3,29,1,0,0,0,0,0,0,0,0 //AB_CANTO#Canto Candidus#
 4099,2043,3,28,1,0,0,0,0,0,0,0,0 //AB_CHEAL#Coluceo Heal#
@@ -4633,7 +4633,7 @@
 4100,2256,5,2255,1,0,0,0,0,0,0,0,0 //NC_BOOSTKNUCKLE#Boost Knuckle#
 4100,2257,3,2256,2,0,0,0,0,0,0,0,0 //NC_PILEBUNKER#Pile Bunker#
 4100,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
-4100,2259,3,2258,3,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
+4100,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
 4100,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
 4100,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
 4100,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
@@ -4649,18 +4649,18 @@
 4100,2272,3,2269,1,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
 4100,2273,3,2272,2,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
 4100,2274,3,2271,3,2273,2,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
-4100,2275,5,2255,1,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
+4100,2275,5,2255,2,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
 4100,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training#
 4100,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth#
 4100,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang#
 4100,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing#
 4100,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
 4100,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
-4100,2282,5,2277,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
+4100,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
 4100,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
-4100,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
+4100,5006,5,2277,1,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4100,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4100,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4100,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4100,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Guillotine Cross
 4101,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -4761,7 +4761,7 @@
 4102,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive#
 4102,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit#
 4102,2325,5,2315,3,2321,4,2322,5,0,0,0,0 //LG_INSPIRATION#Inspiration#
-4102,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace# 
+4102,5013,5,2311,5,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
 4102,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Baby Sorcerer
 4103,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -4890,7 +4890,7 @@
 4104,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4104,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4104,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4104,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG# 
+4104,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4104,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Baby Wanderer
 4105,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -4947,7 +4947,7 @@
 4105,2432,5,2427,1,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody Of Sink#
 4105,2433,5,2431,1,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry Of Beyond#
 4105,2434,5,2429,1,2433,1,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
-4105,5007,5,2412,1,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
+4105,5007,5,2412,2,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#
 4105,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
 //Baby Sura
 4106,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -5066,7 +5066,7 @@
 4107,2497,10,0,0,0,0,0,0,0,0,0,0 //GN_S_PHARMACY#Special Pharmacy#
 4107,5003,5,2497,1,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOOPING#Hallucination Drug#
 4107,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4107,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4107,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4107,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Baby Shadow Chaser
 4108,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -5264,7 +5264,7 @@
 4111,2241,3,2240,1,0,0,0,0,0,0,0,0 //RA_WUGRIDER#Warg Rider#
 4111,2242,1,2241,1,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
 4111,2243,5,2245,1,0,0,0,0,0,0,0,0 //RA_WUGSTRIKE#Warg Strike#
-4111,2244,5,2240,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
+4111,2244,5,2243,1,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
 4111,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg#
 4111,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen#
 4111,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage#
@@ -5320,7 +5320,7 @@
 4112,2256,5,2255,1,0,0,0,0,0,0,0,0 //NC_BOOSTKNUCKLE#Boost Knuckle#
 4112,2257,3,2256,2,0,0,0,0,0,0,0,0 //NC_PILEBUNKER#Pile Bunker#
 4112,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
-4112,2259,3,2258,3,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
+4112,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
 4112,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
 4112,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
 4112,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
@@ -5336,18 +5336,18 @@
 4112,2272,3,2269,1,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
 4112,2273,3,2272,2,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
 4112,2274,3,2271,3,2273,2,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
-4112,2275,5,2255,1,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
+4112,2275,5,2255,2,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
 4112,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training#
 4112,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth#
 4112,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang#
 4112,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing#
 4112,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
 4112,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
-4112,2282,5,2277,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
+4112,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
 4112,2283,1,2281,1,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
-4112,5006,5,0,0,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
+4112,5006,5,2277,1,0,0,0,0,0,0,0,0 //NC_MAGMA_ERUPTION#Magma Eruption#
 4112,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
-4112,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4112,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4112,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Super Novice (Expanded)
 4190,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -5431,7 +5431,7 @@
 4190,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4190,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4190,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
-4190,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4190,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4190,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Super Baby (Expanded)
 4191,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
@@ -5516,7 +5516,7 @@
 4191,261,5,259,2,0,0,0,0,0,0,0,0 //MO_CALLSPIRITS#Summon Spirit Sphere#
 4191,262,1,261,5,0,0,0,0,0,0,0,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere#
 4191,365,1,9,1,0,0,0,0,0,0,0,0 //HW_MAGICCRASHER#Stave Crasher#
-4191,2535,2,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
+4191,2535,1,41,1,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store#
 4191,2544,1,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
 //Kagerou
 4211,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#

db/pre-re/skill_unit_db.txt

@@ -20,7 +20,7 @@
 //      0x00800(UF_DUALMODE)			Spell has effects both at an interval and when you step in/out
 //      0x01000(UF_NOKNOCKBACK)			Cannot be knocked back (only unit that can be damaged)
 //      0x02000(UF_RANGEDSINGLEUNIT)	Layout hack, use layout range propriety but only display center.
-//      0x04000(UF_REM_CRAZYWEED)		Removed if be overlapped by GN_CRAZYWEED
+//      0x04000(UF_CRAZYWEED_IMMUNE)	Immune to GN_CRAZYWEED removal
 //      0x08000(UF_REM_FIRERAIN)		Removed if be overlapped by RL_FIRE_RAIN
 //      0x10000(UF_KNOCKBACK_GROUP) 	Knock back a whole skill group (by default, skill unit is knocked back each unit)
 //      0x20000(UF_HIDDEN_TRAP) 		Hidden trap, see 'traps_setting' skill config to enable this flag
@@ -32,14 +32,14 @@
 //    u1   u2 lay  r intr target  flag
 //
 
- 12,0x7e,    ,  0, 0,  -1,all,   0x4003	//MG_SAFETYWALL
+ 12,0x7e,    ,  0, 0,  -1,all,   0x003	//MG_SAFETYWALL
  18,0x7f,    , -1, 0,  20,enemy, 0x8010	//MG_FIREWALL
  21,0x86,    ,  0, 2:2:2:2:2:2:2:2:2:2:3,1000,enemy, 0x010	//MG_THUNDERSTORM
- 25,0x85,    ,  1, 0,  -1,all,   0x6003	//AL_PNEUMA
+ 25,0x85,    ,  1, 0,  -1,all,   0x2003	//AL_PNEUMA
  27,0x81,0x80,  0, 0,  -1,all,   0x00E	//AL_WARP
  70,0x83,    , -1, 1,1000,all,   0x018	//PR_SANCTUARY
  79,0x84,    , -1, 1,3000,enemy, 0x8018	//PR_MAGNUS
- 80,0x87,0x88,  0, 1,2000,enemy, 0x4006	//WZ_FIREPILLAR
+ 80,0x87,0x88,  0, 1,2000,enemy, 0x006	//WZ_FIREPILLAR
  83,0x86,    ,  0, 3,1000,enemy, 0x010	//WZ_METEOR
  85,0x86,    ,  5:5:5:5:5:5:5:5:5:5:7, 1,1250,enemy,0x018	//WZ_VERMILION
  86,0x86,    ,  0:1:1:2:2:2:2:2:2:2, 0,-1,noone, 0x010	//WZ_WATERBALL
@@ -61,10 +61,10 @@
 220,0xb0,    ,  0, 0,  -1,all,   0x8002	//RG_GRAFFITI
 229,0xb1,    ,  0, 1,1000,enemy, 0x006	//AM_DEMONSTRATION
 254,0x86,    , -1, 0, 300,enemy, 0x010	//CR_GRANDCROSS
-285,0x9a,    ,  3, 0,  -1,all,   0xC010	//SA_VOLCANO
-286,0x9b,    ,  3, 0,  -1,all,   0xC010	//SA_DELUGE
-287,0x9c,    ,  3, 0,  -1,all,   0xC010	//SA_VIOLENTGALE
-288,0x9d,    ,  3:3:4:4:5,0, -1,all,   0xC010	//SA_LANDPROTECTOR
+285,0x9a,    ,  3, 0,  -1,all,   0x8010	//SA_VOLCANO
+286,0x9b,    ,  3, 0,  -1,all,   0x8010	//SA_DELUGE
+287,0x9c,    ,  3, 0,  -1,all,   0x8010	//SA_VIOLENTGALE
+288,0x9d,    ,  3:3:4:4:5,0, -1,all,   0x8010	//SA_LANDPROTECTOR
 306,0x9e,    ,  4, 0,6000,enemy,   0x200	//BD_LULLABY
 307,0x9f,    ,  4, 0,  -1,enemy, 0x220	//BD_RICHMANKIM
 308,0xa0,    ,  4, 0,  -1,enemy, 0x200	//BD_ETERNALCHAOS
@@ -127,13 +127,13 @@
 2254,0xd7,    ,  0, 1,1000,enemy, 0x8002	//RA_ICEBOUNDTRAP
 
 2273,0xe2,    ,  2, 0,  -1,all,   0x000	//NC_NEUTRALBARRIER
-2274,0xe3,    ,  2, 0,  -1,ally,  0x000	//NC_STEALTHFIELD
+2274,0xe3,    ,  2, 0,  -1,all,   0x000	//NC_STEALTHFIELD
 
 2299,0xcc,    ,  0, 1,1000,all,   0x8006 //SC_MANHOLE
-2300,0xcd,    ,  0, 0,1000,all,   0xC006 //SC_DIMENSIONDOOR
-2301,0xce,    ,  2, 0,1000,all,   0xE00E //SC_CHAOSPANIC
-2302,0xcf,    ,  2, 0,  -1,all,   0xE002 //SC_MAELSTROM
-2303,0xd0,    ,  3, 0,  -1,all,   0xE058 //SC_BLOODYLUST
+2300,0xcd,    ,  0, 0,1000,all,   0x8006 //SC_DIMENSIONDOOR
+2301,0xce,    ,  2, 0,1000,all,   0xA00E //SC_CHAOSPANIC
+2302,0xcf,    ,  2, 0,  -1,all,   0xA002 //SC_MAELSTROM
+2303,0xd0,    ,  3, 0,  -1,all,   0xA058 //SC_BLOODYLUST
 2304,0xd1,    ,  0, 2, 500,enemy, 0x018  //SC_FEINTBOMB
 
 2319,0xec,    ,  0, 3,5000,all,   0x000	//LG_BANDING
@@ -147,21 +147,21 @@
 2446,0x86,    ,  0, 3:3:3:4:4,1000,enemy, 0x018	//SO_EARTHGRAVE
 2447,0x86,    ,  0, 3:3:3:4:4,1000,enemy, 0x018	//SO_DIAMONDDUST
 2449,0xdf,    ,  0, 3:3:4:4:5,500,enemy,  0x018	//SO_PSYCHIC_WAVE
-2450,0xe0,    ,  0, 3, 500,enemy, 0x8010	//SO_CLOUD_KILL
-2452,0xe4,    ,  0, 3,3000,all,   0x8010	//SO_WARMER
+2450,0xe0,    ,  3, 0,  -1,enemy, 0xA010	//SO_CLOUD_KILL
+2452,0xe4,    ,  3, 0,  -1,all,   0xA010	//SO_WARMER
 2453,0xeb,    ,  0, 1:1:2:2:3,500,enemy,0x8010	//SO_VACUUM_EXTREME
 2465,0xf1,    ,  0, 1,1000,all,   0x010	//SO_FIRE_INSIGNIA
 2466,0xf2,    ,  0, 1,1000,all,   0x010	//SO_WATER_INSIGNIA
 2467,0xf3,    ,  0, 1,1000,all,   0x010	//SO_WIND_INSIGNIA
 2468,0xf4,    ,  0, 1,1000,all,   0x010	//SO_EARTH_INSIGNIA
 
-2479,0xe5,    ,  0, 1,1000,enemy, 0xC006	//GN_THORNS_TRAP
-2482,0xe6,0x7f, -1, 1, 300,enemy, 0xC000	//GN_WALLOFTHORN
+2479,0xe5,    ,  0, 1,1000,enemy, 0x8006	//GN_THORNS_TRAP
+2482,0xe6,0x7f, -1, 1, 300,enemy, 0x8000	//GN_WALLOFTHORN
 2484,0x86,    ,  0, 1, 100,enemy, 0x080	//GN_CRAZYWEED_ATK
 2485,0xe7,    ,  0, 2,2000,enemy, 0x8098	//GN_DEMONIC_FIRE
 2487,0xe8,    ,  2, 0,  -1,all,   0x2000	//GN_FIRE_EXPANSION_SMOKE_POWDER
 2488,0xe9,    ,  2, 0,  -1,all,   0x2000	//GN_FIRE_EXPANSION_TEAR_GAS
-2490,0xea,    ,  0, 1,1000,enemy, 0xC002	//GN_HELLS_PLANT
+2490,0xea,    ,  0, 1,1000,enemy, 0x8002	//GN_HELLS_PLANT
 
 2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x6	//RL_B_TRAP
 2567,0x105,   , -1, 0,1000,enemy, 0x98	//RL_FIRE_RAIN

db/re/instance_db.txt

@@ -1,18 +1,23 @@
 // Instance Database
 //
 // Structure of Database:
-// ID,Name,LimitTime,EnterMap,EnterX,EnterY,Map1,Map2,Map3,Map4,Map5,Map6,Map7,Map8
+// ID,Name,LimitTime,IdleTimeOut,EnterMap,EnterX,EnterY,Map2,...,Map255
+//
+// EnterMap is considered as Map1
 
-1,Endless Tower,14400,1@tower,50,355,1@tower,2@tower,3@tower,4@tower,5@tower,6@tower
-2,Sealed Catacomb,7200,1@cata,100,224,1@cata,2@cata
-3,Orc's Memory,3600,1@orcs,179,15,1@orcs,2@orcs
-4,Nidhoggur's Nest,14400,1@nyd,32,36,1@nyd,2@nyd
-5,Mistwood Maze,7200,1@mist,89,29,1@mist
-6,Culvert,3600,1@pump,63,98,1@pump,2@pump
-7,Octopus Cave,3600,1@cash,199,99,1@cash
-8,Bangungot Hospital 2F,3600,1@ma_h,40,157,1@ma_h
-9,Buwaya Cave,3600,1@ma_c,35,57,1@ma_c
-10,Bakonawa Lake,7200,1@ma_b,64,51,1@ma_b
-11,Wolfchev's Laboratory,14400,1@lhz,45,148,1@lhz
-12,Old Glast Heim,3600,1@gl_k,150,20,1@gl_k,2@gl_k
-13,Eclage Interior,1200,1@ecl,60,50,1@ecl
+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
+5,Mistwood Maze,7200,300,1@mist,89,29
+6,Culvert,3600,300,1@pump,63,98,2@pump
+7,Octopus Cave,3600,300,1@cash,199,99
+8,Bangungot Hospital 2F,3600,300,1@ma_h,40,157
+9,Buwaya Cave,3600,300,1@ma_c,35,57
+10,Bakonawa Lake,7200,300,1@ma_b,64,51
+11,Wolfchev's Laboratory,14400,300,1@lhz,45,148
+12,Old Glast Heim,3600,300,1@gl_k,150,20,2@gl_k
+13,Eclage Interior,1200,300,1@ecl,60,50
+14,Sara's Memories,3600,300,1@sara,250,155
+15,Geffen Magic Tournament,7200,300,1@gef,119,209,1@gef_in,1@ge_st
+16,Horror Toy Factory,3600,300,1@xm_d,111,22

db/re/item_buyingstore.txt

@@ -8,7 +8,724 @@
 //  Items are in same order as data\buyingstoreitemlist.txt, which
 //  must be edited as well for the client to accept added items.
 
-//--- 2014 / 04 / 21 - 최종수정일
+//--- 2015 / 12 / 16 - 전사자무덤
+//25127
+//25128
+//25129
+//25130
+//25131
+22687	//Fragments_Vicious_Mind
+//23016
+//23080
+4671	//V_B_Celia_Card
+4672	//V_B_Chen_Card
+4673	//V_B_Alphoccio_Card
+4674	//V_B_Eremes_Card
+4675	//V_B_Magaleta_Card
+4676	//V_B_Shecil_Card
+4677	//V_B_Howard_Card
+4678	//V_B_Katrinn_Card
+4679	//V_B_Seyren_Card
+4680	//V_B_Randel_Card
+4681	//V_B_Flamel_Card
+4682	//V_B_Gertie_Card
+4683	//V_B_Trentini_Card
+4684	//V_Eremes_Card
+4685	//V_Magaleta_Card
+4686	//V_Katrinn_Card
+4687	//V_Shecil_Card
+4688	//V_Harword_Card
+4689	//V_Seyren_Card
+4690	//V_Randel_Card
+4691	//V_Flamel_Card
+4692	//V_Celia_Card
+4693	//V_Chen_Card
+4694	//V_Gertie_Card
+4695	//V_Trentini_Card
+4696	//V_Alphoccio_Card
+//--- 2015 / 11 19 - 부서진 마법석 추가
+6905	//Broken_Magic_Stone
+//--- 2015 / 11 / 30 - 카드 추가
+4001	//Poring_Card
+4002	//Fabre_Card
+4003	//Pupa_Card
+4004	//Drops_Card
+4005	//Poring__Card
+4006	//Lunatic_Card
+4007	//Pecopeco_Egg_Card
+4008	//Picky_Card
+4009	//Chonchon_Card
+4010	//Wilow_Card
+4011	//Picky__Card
+4012	//Thief_Bug_Egg_Card
+4013	//Andre_Egg_Card
+4014	//Roda_Frog_Card
+4015	//Condor_Card
+4016	//Thief_Bug_Card
+4017	//Savage_Babe_Card
+4018	//Andre_Larva_Card
+4019	//Hornet_Card
+4020	//Farmiliar_Card
+4021	//Rocker_Card
+4022	//Spore_Card
+4023	//Desert_Wolf_Babe_Card
+4024	//Plankton_Card
+4025	//Skeleton_Card
+4026	//Thief_Bug_Female_Card
+4027	//Kukre_Card
+4028	//Tarou_Card
+4029	//Wolf_Card
+4030	//Mandragora_Card
+4031	//Pecopeco_Card
+4032	//Ambernite_Card
+4033	//Poporing_Card
+4034	//Worm_Tail_Card
+4035	//Hydra_Card
+4036	//Muka_Card
+4037	//Snake_Card
+4038	//Zombie_Card
+4039	//Stainer_Card
+4040	//Creamy_Card
+4041	//Coco_Card
+4042	//Steel_Chonchon_Card
+4043	//Andre_Card
+4044	//Smokie_Card
+4045	//Horn_Card
+4046	//Martin_Card
+4047	//Ghostring_Card
+4048	//Poison_Spore_Card
+4049	//Vadon_Card
+4050	//Thief_Bug_Male_Card
+4051	//Yoyo_Card
+4052	//Elder_Wilow_Card
+4053	//Vitata_Card
+4054	//Angeling_Card
+4055	//Marina_Card
+4056	//Dustiness_Card
+4057	//Metaller_Card
+4058	//Thara_Frog_Card
+4059	//Soldier_Andre_Card
+4060	//Goblin_Card
+4061	//Cornutus_Card
+4062	//Anacondaq_Card
+4063	//Caramel_Card
+4064	//Zerom_Card
+4065	//Kaho_Card
+4066	//Orc_Warrior_Card
+4067	//Megalodon_Card
+4068	//Scorpion_Card
+4069	//Drainliar_Card
+4070	//Eggyra_Card
+4071	//Orc_Zombie_Card
+4072	//Golem_Card
+4073	//Pirate_Skel_Card
+4074	//BigFoot_Card
+4075	//Argos_Card
+4076	//Magnolia_Card
+4077	//Phen_Card
+4078	//Savage_Card
+4079	//Mantis_Card
+4080	//Flora_Card
+4081	//Hode_Card
+4082	//Desert_Wolf_Card
+4083	//Rafflesia_Card
+4084	//Marine_Sphere_Card
+4085	//Orc_Skeleton_Card
+4086	//Soldier_Skeleton_Card
+4087	//Giearth_Card
+4088	//Frilldora_Card
+4089	//Sword_Fish_Card
+4090	//Munak_Card
+4091	//Kobold_Card
+4092	//Skel_Worker_Card
+4093	//Obeaune_Card
+4094	//Archer_Skeleton_Card
+4095	//Marse_Card
+4096	//Zenorc_Card
+4097	//Matyr_Card
+4098	//Dokebi_Card
+4099	//Pasana_Card
+4100	//Sohee_Card
+4101	//Sand_Man_Card
+4102	//Whisper_Card
+4103	//Horong_Card
+4104	//Requiem_Card
+4105	//Marc_Card
+4106	//Mummy_Card
+4107	//Verit_Card
+4108	//Myst_Card
+4109	//Jakk_Card
+4110	//Ghoul_Card
+4111	//Strouf_Card
+4112	//Marduk_Card
+4113	//Marionette_Card
+4114	//Argiope_Card
+4115	//Hunter_Fly_Card
+4116	//Isis_Card
+4117	//Side_Winder_Card
+4118	//Petit_Card
+4119	//Bathory_Card
+4120	//Petit__Card
+4121	//Phreeoni_Card
+4122	//Deviruchi_Card
+4123	//Eddga_Card
+4124	//Medusa_Card
+4125	//Deviace_Card
+4126	//Minorous_Card
+4127	//Nightmare_Card
+4128	//Golden_Bug_Card
+4129	//Baphomet__Card
+4130	//Scorpion_King_Card
+4131	//Moonlight_Flower_Card
+4132	//Mistress_Card
+4133	//Daydric_Card
+4134	//Dracula_Card
+4135	//Orc_Load_Card
+4136	//Khalitzburg_Card
+4137	//Drake_Card
+4138	//Anubis_Card
+4139	//Joker_Card
+4140	//Knight_Of_Abyss_Card
+4141	//Evil_Druid_Card
+4142	//Doppelganger_Card
+4143	//Orc_Hero_Card
+4144	//Osiris_Card
+4145	//Berzebub_Card
+4146	//Maya_Card
+4147	//Baphomet_Card
+4148	//Pharaoh_Card
+4149	//Gargoyle_Card
+4150	//Goat_Card
+4151	//Gajomart_Card
+4152	//Galapago_Card
+4153	//Crab_Card
+4154	//Rice_Cake_Boy_Card
+4155	//Goblin_Leader_Card
+4156	//Steam_Goblin_Card
+4157	//Goblin_Archer_Card
+4158	//Flying_Deleter_Card
+4159	//Nine_Tail_Card
+4160	//Antique_Firelock_Card
+4161	//Grand_Peco_Card
+4162	//Grizzly_Card
+4163	//Gryphon_Card
+4164	//Gullinbursti_Card
+4165	//Gig_Card
+4166	//Nightmare_Terror_Card
+4167	//Neraid_Card
+4168	//Dark_Lord_Card
+4169	//Dark_Illusion_Card
+4170	//Dark_Frame_Card
+4171	//Dark_Priest_Card
+4172	//The_Paper_Card
+4173	//Demon_Pungus_Card
+4174	//Deviling_Card
+4175	//Poison_Toad_Card
+4176	//Dullahan_Card
+4177	//Dryad_Card
+4178	//Dragon_Tail_Card
+4179	//Dragon_Fly_Card
+4180	//Driller_Card
+4181	//Disguise_Card
+4182	//Diabolic_Card
+4183	//Vagabond_Wolf_Card
+4184	//Lava_Golem_Card
+4185	//Rideword_Card
+4186	//Raggler_Card
+4187	//Raydric_Archer_Card
+4188	//Leib_Olmai_Card
+4189	//Wraith_Dead_Card
+4190	//Wraith_Card
+4191	//Loli_Ruri_Card
+4192	//Rotar_Zairo_Card
+4193	//Lude_Card
+4194	//Rybio_Card
+4195	//Leaf_Cat_Card
+4196	//Marin_Card
+4197	//Mastering_Card
+4198	//Maya_Puple_Card
+4199	//Merman_Card
+4200	//Megalith_Card
+4201	//Majoruros_Card
+4202	//Civil_Servant_Card
+4203	//Mutant_Dragon_Card
+4204	//Mini_Demon_Card
+4205	//Mimic_Card
+4206	//Mystcase_Card
+4207	//Mysteltainn_Card
+4208	//Miyabi_Ningyo_Card
+4209	//Violy_Card
+4210	//Wander_Man_Card
+4211	//Vocal_Card
+4212	//Bon_Gun_Card
+4213	//Brilight_Card
+4214	//Bloody_Murderer_Card
+4215	//Blazzer_Card
+4216	//Sasquatch_Card
+4217	//Live_Peach_Tree_Card
+4218	//Succubus_Card
+4219	//Sageworm_Card
+4220	//Solider_Card
+4221	//Skeleton_General_Card
+4222	//Skel_Prisoner_Card
+4223	//Stalactic_Golem_Card
+4224	//Stem_Worm_Card
+4225	//Stone_Shooter_Card
+4226	//Sting_Card
+4227	//Spring_Rabbit_Card
+4228	//Sleeper_Card
+4229	//C_Tower_Manager_Card
+4230	//Shinobi_Card
+4231	//Increase_Soil_Card
+4232	//Wild_Ginseng_Card
+4233	//Baby_Leopard_Card
+4234	//Anolian_Card
+4235	//Cookie_XMAS_Card
+4236	//Amon_Ra_Card
+4237	//Owl_Duke_Card
+4238	//Owl_Baron_Card
+4239	//Iron_Fist_Card
+4240	//Arclouse_Card
+4241	//Archangeling_Card
+4242	//Apocalips_Card
+4243	//Antonio_Card
+4244	//Alarm_Card
+4245	//Am_Mut_Card
+4246	//Assulter_Card
+4247	//Aster_Card
+4248	//Ancient_Mummy_Card
+4249	//Ancient_Worm_Card
+4250	//Executioner_Card
+4251	//Elder_Card
+4252	//Alligator_Card
+4253	//Alice_Card
+4254	//Tirfing_Card
+4255	//Orc_Lady_Card
+4256	//Orc_Archer_Card
+4257	//Wild_Rose_Card
+4258	//Wicked_Nymph_Card
+4259	//Wooden_Golem_Card
+4260	//Wootan_Shooter_Card
+4261	//Wootan_Fighter_Card
+4262	//Evil_Cloud_Hermit_Card
+4263	//Incant_Samurai_Card
+4264	//Wind_Ghost_Card
+4265	//Li_Me_Mang_Ryang_Card
+4266	//Eclipse_Card
+4267	//Explosion_Card
+4268	//Injustice_Card
+4269	//Incubus_Card
+4270	//Giant_Spider_Card
+4271	//Giant_Honet_Card
+4272	//Dancing_Dragon_Card
+4273	//Shellfish_Card
+4274	//Zombie_Master_Card
+4275	//Zombie_Prisoner_Card
+4276	//Lord_Of_Death_Card
+4277	//Zherlthsh_Card
+4278	//Gibbet_Card
+4279	//Deleter_Card
+4280	//Geographer_Card
+4281	//Zipper_Bear_Card
+4282	//Tengu_Card
+4283	//Greatest_General_Card
+4284	//Chepet_Card
+4285	//Choco_Card
+4286	//Karakasa_Card
+4287	//Kapha_Card
+4288	//Carat_Card
+4289	//Caterpillar_Card
+4290	//Cat_O_Nine_Tail_Card
+4291	//Kobold_Leader_Card
+4292	//Kobold_Archer_Card
+4293	//Cookie_Card
+4294	//Quve_Card
+4295	//Kraben_Card
+4296	//Cramp_Card
+4297	//Cruiser_Card
+4298	//Cremy_Fear_Card
+4299	//Clock_Card
+4300	//Chimera_Card
+4301	//Killer_Mantis_Card
+4302	//Tao_Gunka_Card
+4303	//Whisper_Boss_Card
+4304	//Tamruan_Card
+4305	//Turtle_General_Card
+4306	//Toad_Card
+4307	//Kind_Of_Beetle_Card
+4308	//Tri_Joint_Card
+4309	//Parasite_Card
+4310	//Panzer_Goblin_Card
+4311	//Permeter_Card
+4312	//Fur_Seal_Card
+4313	//Punk_Card
+4314	//Penomena_Card
+4315	//Pest_Card
+4316	//Fake_Angel_Card
+4317	//Mobster_Card
+4318	//Knight_Windstorm_Card
+4319	//Freezer_Card
+4320	//Bloody_Knight_Card
+4321	//Hylozoist_Card
+4322	//High_Orc_Card
+4323	//Garm_Baby_Card
+4324	//Garm_Card
+4325	//Harpy_Card
+4326	//See_Otter_Card
+4327	//Blood_Butterfly_Card
+4328	//Hyegun_Card
+4329	//Phendark_Card
+4330	//Dark_Snake_Lord_Card
+4331	//Heater_Card
+4332	//Waste_Stove_Card
+4333	//Venomous_Card
+4334	//Noxious_Card
+4335	//Pitman_Card
+4336	//Ungoliant_Card
+4337	//Porcellio_Card
+4338	//Obsidian_Card
+4339	//Mineral_Card
+4340	//Teddy_Bear_Card
+4341	//Metaling_Card
+4342	//Rsx_0806_Card
+4343	//Mole_Card
+4344	//Anopheles_Card
+4345	//Hill_Wind_Card
+4346	//Ygnizem_Card
+4347	//Armaia_Card
+4348	//Whikebain_Card
+4349	//Erend_Card
+4350	//Rawrel_Card
+4351	//Kavac_Card
+4352	//B_Ygnizem_Card
+4353	//Removal_Card
+4354	//Gemini_Card
+4355	//Gremlin_Card
+4356	//Beholder_Card
+4357	//B_Seyren_Card
+4358	//Seyren_Card
+4359	//B_Eremes_Card
+4360	//Eremes_Card
+4361	//B_Harword_Card
+4362	//Harword_Card
+4363	//B_Magaleta_Card
+4364	//Magaleta_Card
+4365	//B_Katrinn_Card
+4366	//Katrinn_Card
+4367	//B_Shecil_Card
+4368	//Shecil_Card
+4369	//Venatu_Card
+4370	//Dimik_Card
+4371	//Archdam_Card
+4372	//Bacsojin_Card
+4373	//Chung_E_Card
+4374	//Apocalips_H_Card
+4375	//Orc_Baby_Card
+4376	//Lady_Tanee_Card
+4377	//Green_Iguana_Card
+4378	//Acidus_Card
+4379	//Acidus__Card
+4380	//Ferus_Card
+4381	//Ferus__Card
+4382	//Novus__Card
+4383	//Novus_Card
+4384	//Hydro_Card
+4385	//Dragon_Egg_Card
+4386	//Detale_Card
+4387	//Ancient_Mimic_Card
+4388	//Deathword_Card
+4389	//Plasma_Card
+4390	//Breeze_Card
+4391	//Retribution_Card
+4392	//Observation_Card
+4393	//Shelter_Card
+4394	//Solace_Card
+4395	//Tha_Maero_Card
+4396	//Tha_Odium_Card
+4397	//Tha_Despero_Card
+4398	//Tha_Dolor_Card
+4399	//Thanatos_Card
+4400	//Aliza_Card
+4401	//Alicel_Card
+4402	//Aliot_Card
+4403	//Kiel_Card
+4404	//Skogul_Card
+4405	//Frus_Card
+4406	//Skeggiold_Card
+4407	//Randgris_Card
+4408	//Gloom_Under_Night_Card
+4409	//Agav_Card
+4410	//Echio_Card
+4411	//Vanberk_Card
+4412	//Isilla_Card
+4413	//Hodremlin_Card
+4414	//Seeker_Card
+4415	//Snowier_Card
+4416	//Siroma_Card
+4417	//Ice_Titan_Card
+4418	//Gazeti_Card
+4419	//Ktullanux_Card
+4420	//Muscipular_Card
+4421	//Drosera_Card
+4422	//Roween_Card
+4423	//Galion_Card
+4424	//Stapo_Card
+4425	//Atroce_Card
+4426	//Byorgue_Card
+4427	//Sword_Guardian_Card
+4428	//Bow_Guardian_Card
+4429	//Salamander_Card
+4430	//Ifrit_Card
+4431	//Kasa_Card
+4432	//Magmaring_Card
+4433	//Imp_Card
+4434	//Knocker_Card
+4435	//Zombie_Slaughter_Card
+4436	//Ragged_Zombie_Card
+4437	//Hell_Poodle_Card
+4438	//Banshee_Card
+4439	//Flame_Skull_Card
+4440	//Necromancer_Card
+4441	//Fallen_Bishop_Card
+4442	//Tatacho_Card
+4443	//Aqua_Elemental_Card
+4444	//Draco_Card
+4445	//Luciola_Vespa_Card
+4446	//Enhanced_Skeleton_Card
+4447	//Centipede_Card
+4448	//Cornus_Card
+4449	//Dark_Shadow_Card
+4450	//Banshee_Master_Card
+4451	//Ant_Buyanne_Card
+4452	//Centipede_Larva_Card
+4453	//Hilsrion_Card
+4454	//Light_Up_Card1
+4455	//Light_Up_Card2
+4456	//Nidhogg_Shadow_Card
+4457	//Nahtzigger_Card
+4458	//Duneirre_Card
+4459	//Lata_Card
+4460	//Ringco_Card
+4461	//Pillar_Card
+4462	//Hardrock_Mammos_Card
+4463	//Tendrilrion_Card
+4464	//Aunoe_Card
+4465	//Panat_Card
+4466	//Beholder_Master_Card
+4467	//Heavy_Metaling_Card
+4468	//Pinguicula_Dark_Card
+4469	//Naga_Card
+4470	//Nepenthes_Card
+4471	//Egg_Of_Draco_Card
+4472	//Bradium_Goram_Card
+4473	//Ancient_Tree_Card
+4474	//Jakudam_Card
+4475	//Cobalt_Mineral_Card
+4476	//Pinguicula_Card
+4477	//Hell_Apocalips_Card
+4478	//Light_Up_Card3
+4479	//Light_Up_Card4
+4480	//Sealed_Kiel_Card
+4481	//Sealed_Ktullanux_Card
+4482	//Sealed_B_Ygnizem_Card
+4483	//Sealed_Dracula_Card
+4484	//Sealed_Mistress_Card
+4485	//Sealed_Gloom_Card
+4486	//Sealed_Berz_Card
+4487	//Sealed_Ifrit_Card
+4488	//Sealed_D_Lord_Card
+4489	//Sealed_Pharaoh_Card
+4490	//Sealed_M_Flower_Card
+4491	//Sealed_B_Shecil_Card
+4492	//Sealed_Orc_Hero_Card
+4493	//Sealed_Tao_Card
+4494	//Sealed_TurtleG_Card
+4495	//Sealed_Amon_Ra_Card
+4496	//Sealed_Drake_Card
+4497	//Sealed_Knight_WS_Card
+4498	//Sealed_Lady_Tanee_Card
+4499	//Sealed_Samurai_Card
+4500	//Sealed_Orc_Load_Card
+4501	//Sealed_B_Magaleta_Card
+4502	//Sealed_B_Harword_Card
+4503	//Sealed_Apocalips_H_Card
+4504	//Sealed_Eddga_Card
+4505	//Scaraba_Card
+4506	//Dolomedes_Card
+4507	//Q_Scaraba_Card
+4508	//Gold_Scaraba_Card
+4509	//Gold_Q_Scaraba_Card
+4510	//Miming_Card
+4511	//Little_Fatum_Card
+4512	//Parus_Card
+4513	//Angra_Mantis_Card
+4514	//Pom_Spider_Card
+4515	//Alnoldi_Card
+4516	//Comodo_Card
+4517	//Cendrawasih_Card
+4518	//Banaspaty_Card
+4519	//Butoijo_Card
+4520	//Leak_Card
+4521	//Sedora_Card
+4522	//Sropho_Card
+4523	//Pot_Dofle_Card
+4524	//King_Dramoh_Card
+4525	//Kraken_Card
+4526	//Odd_Coelacanth_Card
+4527	//Black_Coelacanth_Card
+4528	//Mutant_Coelacanth_Card
+4529	//Cruel_Coelacanth_Card
+4530	//Siorava_Card
+4531	//Red_Eruma_Card
+4532	//Wild_Rider_Card
+4533	//Mini_Octopus_Card
+4534	//Giant_Octopus_Card
+4535	//Sealed_Rand_Card
+4536	//Sealed_Atroce_Card
+4537	//Sealed_Phreeoni_Card
+4538	//Sealed_Bacsojin_Card
+4539	//Sealed_F_Bishop_Card
+4540	//SLD_Lord_Of_Death_Card
+4541	//SLD_B_Katrinn_Card
+4542	//SLD_Detale_Card
+4543	//SLD_Garm_Card
+4544	//SLD_Dark_Snake_Card
+4545	//Novice_Poring_Card
+4546	//Val'khiri_Card
+4547	//Enhanced_Byorgue_Card
+4548	//Enhanced_Salamander_Card
+4549	//Upd_Maya_Puple_Card
+4550	//Upd_Bow_Guardian_Card
+//4551
+4552	//Manny_Card
+4553	//Sid_Card
+4554	//Diego_Card
+4555	//Scrat_Card
+4556	//Fenrir_Card
+4557	//Weakened_Fenrir_Card
+//4558
+4559	//Evil_Morocc_Card
+4560	//Clown_Alphoccio_Card
+4561	//Professor_Celia_Card
+4562	//Champion_Chen_Card
+4563	//Creator_Flamel_Card
+4564	//Stalker_Gertie_Card
+4565	//Paladin_Randel_Card
+4566	//Gypsy_Trentini_Card
+4567	//Alphoccio_Card
+4568	//Celia_Card
+4569	//Chen_Card
+4570	//Flamel_Card
+4571	//Gertie_Card
+4572	//Randel_Card
+4573	//Trentini_Card
+4574	//Daehyon_Card
+4575	//Soheon_Card
+4576	//Gioia_Card
+4577	//Elvira_Card
+4578	//Pyuriel_Card
+4579	//Lola_Card
+4580	//Kades_Card
+4581	//Rudo_Card
+4582	//Bungisngis_Card
+4583	//Engkanto_Card
+4584	//Manananggal_Card
+4585	//Mangkukulam_Card
+4586	//Tikbalang_Card
+4587	//Tiyanak_Card
+4588	//Wakwak_Card
+4589	//Jejeling_Card
+4590	//Bangungot_Card
+4591	//Bakonawa_Card
+4592	//Buwaya_Card
+4593	//Menblatt_Card
+4594	//Petal_Card
+4595	//Cenere_Card
+4596	//AntiqueBook_Card
+4597	//LichternB_Card
+4598	//LichternG_Card
+4599	//LichternR_Card
+4600	//LichternY_Card
+4601	//Amdarais_Card
+4602	//Realized_Amdarais_Card
+4603	//Corruption_Root_Card
+4604	//Realized_Corruption_Root_Card
+4605	//UndeadKnightM_Card
+4606	//UndeadKnightF_Card
+4607	//FaithfulManager_Card
+4608	//White_Knight_Card
+4609	//Khalitzburg_Knight_Card
+4610	//Sarah_Card
+4625	//Time_Holder_Card
+4626	//Big_Ben_Card
+4627	//Big_Bell_Card
+4628	//Neo_Punk_Card
+4629	//Arc_Elder_Card
+4630	//Nightmare_Timer_Keeper_Card
+4631	//Owl_Viscount_Card
+4632	//Owl_Marquees_Card
+4633	//Enhanced_Archer_Skeleton_Card
+4634	//Enhanced_Soldier_Skeleton_Card
+4635	//Enhanced_Amdarais_Card
+4636	//Bijou_Card
+4637	//Immortal_Corps_Card
+4638	//Watcher_Card
+4639	//Taffy_Card
+4640	//Frozen_Wolf_Card
+4641	//Zombie_Guard_Card
+4642	//Min_Toad_Card
+4643	//Min_Vagabond_Wolf_Card
+4644	//Min_Vocal_Card
+4645	//Min_Eclipse_Card
+4646	//Min_Chimera_Card
+4647	//Min_Osiris_Card
+4648	//Min_Eddga_Card
+4649	//Min_Phreeoni_Card
+4650	//Min_Orc_Hero_Card
+4651	//Min_Tao_Gunka_Card
+4652	//N_Amon_Ra_Card
+4653	//N_Arclouse_Card
+4654	//N_Mimic_Card
+4655	//N_Minorous_Card
+4656	//N_Mummy_Card
+4657	//N_Ancient_Mummy_Card
+4658	//N_Verit_Card
+//--- 2015 / 7 / 9 - 최종수정일
+11600	//Shining_Holy_Water
+22847	//Prontera_Medal
+22848	//Prison_Key
+22849	//Prontera_Time_Crystal
+6921	//Dehumidifiers
+6922	//Sandpaper
+6924	//Red_Eye
+6936	//Cold_Core
+6937	//Silicone_Shell
+6938	//Hedgehog_Picks
+6939	//Old_Belt
+6940	//Moving_Dark_Matter
+6941	//Fragments_Valkyrie_Power
+6942	//Will_Master
+//6961
+//6962
+6905	//Broken_Magic_Stone
+//--- 2014 / 12 / 17
+12739	//Snow_Flower
+//--- 2014 / 07 / 09
+6897	//Blue_Whale
+6898	//Whale
+6899	//Giant_Octopus
+6900	//Giant_Squid
+6901	//Sturgeon
+6902	//King_Lobster
+6903	//King_Earthworm
+22770	//Shark_Skewer
+22771	//Bluefin_Tuna_Skewer
+22772	//Sea_Bream_Skewer
+22773	//Piranha_Skewer
+22774	//Salmon_Skewer
+22775	//Eels_Skewer
+22776	//Carp_Skewer
+//--- 2014 / 04 / 21
 6691	//Fire_Feather
 6692	//Patrol_Journal
 6693	//Stone_Blessing
@@ -16,7 +733,7 @@
 6695	//Tooth_Rock_Of_Fire_Golem
 6696	//Fire_Frill
 12490	//Vivid_Notation
-22516	//Black_As_Night_Piece
+22516	//Black_As_Night_Piece_
 22534	//Closed_Mind_Box
 11563	//Hot_Tea
 11564	//Sweets
@@ -26,7 +743,7 @@
 22699	//Test_Reagent
 22679	//Death_Bin
 22687	//Fragments_Vicious_Mind
-//6615
+6615	//Siege_Guild_Coin
 //--- 2013 / 08 / 02
 6750	//Failed_Engine
 6751	//Crushed_Can_Iron_Plate
@@ -51,6 +768,7 @@
 11590	//Meat_Skewer5
 22620	//Memorial_Box
 22621	//Squid_Bbq
+
 //--- 2013 / 04 / 16
 6557	//Fancy_Fairy_Wing
 6558	//Pile_Of_Acorn
@@ -204,7 +922,7 @@
 12576	//Hunting_Arrow_Cntr
 12582	//Siege_Supply_Box
 12608	//Splendid_Box2
-//12609
+12609	//Old_Ore_Box
 12612	//Old_Coin_Pocket
 12613	//High_Coin_Pocket
 12614	//Mid_Coin_Pocket
@@ -233,6 +951,7 @@
 12699	//Tikbalang_Belt
 12700	//Insideout_Shirt
 12775	//Ancient_Spirit_Agimat
+
 //--- 2010 / 03 / 12
 601	//Wing_Of_Fly
 602	//Wing_Of_Butterfly
@@ -686,6 +1405,7 @@
 967	//Turtle_Shell
 968	//Voucher_Of_Orcish_Hero
 969	//Gold
+970	//Alchol
 971	//Detrimindexta
 972	//Karvodailnirol
 973	//Counteragent
@@ -1183,7 +1903,7 @@
 7510	//Valhalla_Flower
 7511	//Rune_Of_Darkness
 7512	//Burnt_Parts
-7513	//Pocket_Watch
+7513	//Pocket_Watch__
 7521	//Flame_Stone
 7522	//Ice_Stone
 7523	//Wind_Stone

db/re/item_cash_db.txt

@@ -13,6 +13,7 @@
 //    5: Buff
 //    6: Heal
 //    7: Other
+//    8: Sale
 //
 // Price:
 //    Item cost, in cash points (#CASHPOINTS).

db/re/item_combo_db.txt

@@ -30,12 +30,17 @@
 1480:2527,{ bonus2 bAddRace,RC_Dragon,5; }
 1480:2527:5467,{ bonus2 bAddRace,RC_Dragon,25; }
 1490:19021,{ bonus2 bSkillAtk,"LK_SPIRALPIERCE",getequiprefinerycnt(EQI_HAND_R)*5; bonus4 bAutoSpellOnSkill,"LK_JOINTBEAT","LK_SPIRALPIERCE",max(getskilllv("LK_SPIRALPIERCE"),1),50+(getskilllv("LK_JOINTBEAT")*10); /* Confirm: Success rate */ }
+15141:19033,{ bonus bMaxSP,100; bonus bNoCastCancel,1; }
+15141:20779:22075,{ .@r = getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES); bonus bMaxHP,1000; bonus bHealPower,min(5+.@r,30); bonus bHealPower2,min(5+.@r,30); }
+15186:19168,{ bonus2 bExpAddClass,Class_All,5; bonus2 bDropAddClass,Class_All,5; }
 1535:4361,{ bonus bBreakArmorRate,900; bonus bBreakWeaponRate,900; }
 1559:5467,{ bonus bAspd,1; bonus bFlee2,3; }
+1564:2186,{ bonus bAspdRate,getequiprefinerycnt(EQI_HAND_R); }
 1572:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; }
 1573:2334,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; }
 1573:2372,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; }
 1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; }
+1580:2186,{ bonus bAspdRate,15; }
 1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
 1616:2515,{ bonus bSpeedRate,25; }
 1617:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
@@ -67,19 +72,20 @@
 1730:1752:19048,{ bonus bLongAtkRate,20; bonus2 bSubEle,Ele_Fire,-10; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
 1730:19019,{ bonus bLongAtkRate,45; }
 1731:1754,{ bonus bLongAtkRate,25; }
-1731:1754:19048,{ bonus bLongAtkRate,20; bonus2 bSubEle,Ele_Fire,-10; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus2 bResEff,Eff_Freeze,-1000; /* Confirm: Resistance reduction */ }
+1731:1754:19048,{ bonus bLongAtkRate,20; bonus2 bAddEff,Eff_Freeze,-1000; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
 1731:19019,{ bonus bLongAtkRate,45; }
 1732:1756,{ bonus bLongAtkRate,25; bonus2 bAddEff,Eff_Stone,1000; }
-1732:1756:19048,{ bonus bLongAtkRate,20; bonus2 bSubEle,Ele_Fire,-10; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus2 bResEff,Eff_Stone,-1000; /* Confirm: Resistance reduction */ }
+1732:1756:19048,{ bonus bLongAtkRate,20; bonus2 bAddEff,Eff_Stone,-1000; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
 1732:19019,{ bonus bLongAtkRate,45; }
-1733:1755,{ bonus bLongAtkRate,25; bonus3 bAutoSpell,"NJ_HUUJIN",5,100; if(readparam(bInt)>39) bonus3 bAutoSpell,"NJ_HUUJIN",5,200; }
-1733:1755:19048,{ bonus bLongAtkRate,20; bonus2 bSubEle,Ele_Fire,-10; /* if (getequiprefinerycnt(EQI_HAND_R) >= 10)  TO DO: Disable autocast Wind Blade */ }
+1733:1755,{ bonus bLongAtkRate,25; bonus3 bAutoSpell,"NJ_HUUJIN",5,(readparam(bInt)>39) ? 300 : 100; }
+1733:1755:19048,{ bonus bLongAtkRate,20; bonus3 bAutoSpell,"NJ_HUUJIN",5,(readparam(bInt)>39) ? -300 : -100; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
 1733:19019,{ bonus bLongAtkRate,45; }
 1734:1753,{ bonus bLongAtkRate,50; }
 1741:2748,{ bonus bBaseAtk,25; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET; }
 1746:1773,{ bonus bLongAtkRate,50; }
 1775:18114,{ bonus bLongAtkRate,70; }
 1776:18114,{ bonus bLongAtkRate,40; }
+1935:2988,{ bonus2 bSkillAtk,"CG_ARROWVULCAN",200; bonus2 bSkillUseSP,"CG_ARROWVULCAN",50; }
 1990:2989,{ bonus2 bSkillAtk,"CG_ARROWVULCAN",200; }
 2001:2677,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; }
 2001:2711,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; }
@@ -117,6 +123,7 @@
 2183:15068,{ bonus2 bSubEle,Ele_Neutral,5; }
 2183:15068:18776:20710:22015,{ bonus bMaxHP,900; bonus bMaxSP,100; bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",1,30; }
 2183:22015,{ bonus bAllStats,2; }
+2195:20753,{ bonus2 bAddEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_L); bonus2 bSubRace,RC_Formless,getequiprefinerycnt(EQI_GARMENT); }
 2198:5966,{ .@r = getequiprefinerycnt(EQI_HAND_L); if (.@r > 7) bonus2 bSkillCooldown,"WL_COMET",-20000+(.@r > 9 ? -20000 : 0); }
 2241:5136,{ bonus bMaxHP,700; bonus bMaxSP,50; bonus4 bAutoSpellWhenHit,"AL_INCAGI",10,30,1; }
 2268:18573,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if(.@r > 6) { bonus bMaxHPrate,((.@r-5)/2)*2; bonus bHit,(.@r-5)/2; } }
@@ -147,7 +154,7 @@
 2358:5153,{ bonus bLuk,6; bonus bFlee,5; bonus bInt,2; }
 2359:2654,{ bonus bUseSPrate,-20; bonus bMaxHP,300; }
 2365:2881,{ bonus bDelayRate,-15; }
-//2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FIREPILLAR",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; }
@@ -202,7 +209,7 @@
 2527:5467:13030,{ bonus2 bAddRace,RC_Dragon,25; }
 2527:13001,{ bonus2 bAddRace,RC_Dragon,5; }
 2527:13030,{ bonus2 bAddRace,RC_Dragon,5; }
-2597:28342,{ bonus bCritAtkRate,5; bonus bCritical,10; .@r = getequiprefinerycnt(EQI_COSTUME_HEAD_TOP); if (.@r > 7) bonus bCritAtkRate,4; else if (.@r > 5) bonus bCritAtkRate,3; }
+2597:28342,{ bonus bCritAtkRate,5; bonus bCritical,10; .@r = getequiprefinerycnt(EQI_GARMENT); if (.@r > 7) bonus bCritAtkRate,4; else if (.@r > 5) bonus bCritAtkRate,3; }
 //2598:Ramor Shield,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_Undead,.@r; bonus2 bSubRace,RC_DemiHuman,.@r; }
 2607:2677,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
 2607:2711,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
@@ -225,6 +232,9 @@
 2701:2881,{ bonus bMatkRate,20; }
 2702:2874,{ bonus bAspd,1; }
 2702:22064,{ if (readparam(bAgi) > 120) bonus bAspd,2; /* Confirm: Bonus value */ }
+27013:27012,{ bonus bNoMadoFuel,1; }
+27015:27016,{ bonus bCritAtkRate,10; }
+27018:27019,{ autobonus "{ bonus bAspd,5; }",30,5000; }
 2720:2772,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
 2720:2773,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
 2720:2774,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,3; bonus bHealPower,5; }
@@ -256,9 +266,17 @@
 2780:2826:5577,{ autobonus "{ bonus bAspdRate,2; }",50,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; bonus bMaxHP,BaseLevel*15; bonus bMaxSP,(BaseLevel*12)/10; bonus2 bAddClass,Class_All,3; }
 2826:2827:5577,{ autobonus "{ bonus bAspdRate,2; }",50,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; bonus bMaxHP,BaseLevel*15; bonus bMaxSP,(BaseLevel*12)/10; bonus2 bAddClass,Class_All,3; }
 2855:5360,{ bonus bCritAtkRate,10; if(getequiprefinerycnt(EQI_HEAD_TOP)>5) bonus bCritical,5; }
+2913:2710,{ bonus bBaseAtk,10; }
+2913:15040,{ bonus bBaseAtk,2*getequiprefinerycnt(EQI_ARMOR); }
+2913:2408,{ bonus bBaseAtk,getequiprefinerycnt(EQI_SHOES); }
+2913:5104,{ bonus bBaseAtk,10; }
 2950:15067:20709:22012,{ bonus2 bExpAddRace,RC_All,30; }
 2957:2958,{ bonus4 bAutoSpell,"MO_EXTREMITYFIST",1,3,1; bonus3 bAutoSpell,"PR_LEXAETERNA",1,20; bonus3 bAutoSpell,"AS_SONICBLOW",5,50; bonus3 bAutoSpell,"MO_INVESTIGATE",5,20; bonus3 bAutoSpell,"ASC_METEORASSAULT",2,50; }
 2959:18756,{ .@r = 3+(3*getequiprefinerycnt(EQI_HEAD_TOP)); autobonus "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,30; }",.@r,5000,BF_WEAPON,"{ transform 1785,5000; specialeffect2 EF_POTION_BERSERK; }"; autobonus2 "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,30; }",.@r,5000,BF_WEAPON,"{ transform 1785,5000; specialeffect2 EF_POTION_BERSERK; }"; }
+2963:15073,{ bonus bAspdRate,5; }
+2963:15074,{ bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
+2964:15073,{ bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
+2964:15074,{ bonus bVariableCastrate,-5; }
 2966:2967:13092,{ bonus bBaseAtk,-(getequiprefinerycnt(EQI_HAND_R)*10); }
 2966:2967:16026,{ bonus bBaseAtk,-(getequiprefinerycnt(EQI_HAND_R)*5); }
 2966:2967:18821,{ bonus2 bAddClass,Class_All, -(getequiprefinerycnt(EQI_HEAD_TOP)/2); }
@@ -278,6 +296,7 @@
 2968:18821,{ bonus bMatkRate,getequiprefinerycnt(EQI_HEAD_TOP)/2; }
 2969:13092,{ bonus bBaseAtk,getequiprefinerycnt(EQI_HAND_R)*10; }
 2969:18821,{ bonus bMatkRate,getequiprefinerycnt(EQI_HEAD_TOP)/2; }
+2979:18852,{ bonus2 bSubEle,Ele_Fire,10; bonus bLongAtkRate,30; }
 2983:4218,{ bonus bVit,-3; bonus bHPrecovRate,-20; bonus bMaxHP,1000; }
 2983:4218:4269,{ bonus bVit,-3; bonus bHPrecovRate,-20; bonus bMaxHP,1000; bonus bInt,-3; bonus bSPrecovRate,-20; bonus bMaxSP,150; }
 2983:4269,{ bonus bInt,-3; bonus bSPrecovRate,-20; bonus bMaxSP,150; }
@@ -285,6 +304,7 @@
 2986:2987:18872,{ bonus2 bAddMonsterDropItem,22559,50; }
 2986:18872,{ bonus bBaseAtk,BaseLevel/4; }
 2987:18872,{ bonus bMatk,BaseLevel/4; }
+2990:2991,{ bonus bAllStats,5; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0; }
 2997:2999,{ bonus bAtkRate,10; bonus bMatkRate,10; }
 4001:4197,{ bonus bFlee,18; }
 4006:4266,{ bonus bFlee,18; }
@@ -298,6 +318,7 @@
 4031:4161,{ bonus bDef,3; bonus bVit,3; }
 4036:4186:4233:4281:4343,{ bonus bStr,4; bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus bSPDrainValue,1; if(BaseJob==Job_Alchemist) { bonus3 bAutoSpell,"BS_ADRENALINE",1,10; bonus2 bAddMonsterDropItem,7139,3; bonus2 bAddMonsterDropItem,905,10; } }
 4039:4210:4230:4257:4348,{ bonus bStr,6; bonus bAgi,4; bonus2 bSkillAtk,"RG_BACKSTAP",10; if(getskilllv("RG_STRIPARMOR")==5) bonus3 bAutoSpell,"RG_STRIPARMOR",5,50; if(BaseJob==Job_Rogue) { bonus bUseSPrate,-20; bonus3 bAutoSpell,"RG_INTIMIDATE",1,-20; } }
+4045:28910,{ bonus bLongAtkDef,-35; }
 4072:21013,{ bonus2 bSubSize,Size_All,15; }
 4074:4162,{ bonus2 bAddEffWhenHit,Eff_Blind,600; }
 4090:4212:4328,{ bonus bAllStats,1; }
@@ -341,12 +362,34 @@
 4545:18730,{ bonus bMatk,5; bonus bBaseAtk,5; }
 4605:4606,{ bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; bonus2 bHPLossRate,100,6000; bonus2 bSPLossRate,6,6000; }
 4608:4609,{ bonus2 bAddSize,Size_Medium,15; bonus2 bAddSize,Size_Large,15; bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Large,5; }
-4626:4628,{ bonus2 bSubRace,RC_Formless,5; bonus2 bSubRace,RC_Demon,5; bonus2 bIgnoreMdefRaceRate,RC_Formless,50; bonus2 bIgnoreMdefRaceRate,RC_Demon,50; }
-4627:4628,{ bonus2 bSubRace,RC_Formless,5; bonus2 bSubRace,RC_Demon,5; bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;}
-4629:4630,{ bonus3 bAutoSpell,677,2,2; bonus2 bSubEle,Ele_Neutral,5; }
-4631:4632,{ bonus5 bAutoSpell,85,1,1,BF_SHORT,0; }
+4626:4628,{ bonus2 bIgnoreMdefRaceRate,RC_Demon,50; }
+4627:4628,{ bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;}
+4629:4630,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,2; bonus2 bSubEle,Ele_Neutral,5; }
+4631:4632,{ bonus5 bAutoSpell,"WZ_VERMILION",1,1,BF_WEAPON,0; }
 4635:4636,{ bonus2 bResEff,Eff_Burning,10000; }
+4642:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; }
+4643:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; }
+4644:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; }
+4645:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; }
+4653:4654,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Undead,5; bonus2 bIgnoreMdefRaceRate,RC_Brute,50; bonus2 bIgnoreMdefRaceRate,RC_Undead,50; }
+4653:4655,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Undead,5; bonus2 bIgnoreDefRaceRate,RC_Brute,50; bonus2 bIgnoreDefRaceRate,RC_Undead,50; }
+4656:4657,{ /* Unofficial chance */ bonus3 bAutoSpellWhenHit,"NPC_WIDESLEEP",2,10; bonus2 bSubEle,Ele_Neutral,5; }
+4671:4692,{ autobonus "{ active_transform 3242,6000; bonus bMatk,100; }",30,6000,BF_MAGIC; }
+4672:4693,{ autobonus "{ active_transform 3243,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4673:4696,{ autobonus "{ active_transform 3245,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4674:4684,{ autobonus "{ active_transform 3220,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4675:4685,{ autobonus "{ active_transform 3221,6000; bonus bMatk,100; }",30,6000,BF_MAGIC; }
+4676:4687,{ autobonus "{ active_transform 3222,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4677:4688,{ autobonus "{ active_transform 3223,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4678:4686,{ autobonus "{ active_transform 3224,6000; bonus bMatk,100; }",30,6000,BF_MAGIC; }
+4679:4689,{ autobonus "{ active_transform 3225,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4680:4690,{ autobonus "{ active_transform 3240,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4681:4691,{ autobonus "{ active_transform 3241,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4682:4694,{ autobonus "{ active_transform 3244,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
+4683:4695,{ autobonus "{ active_transform 3246,6000; bonus bAtk,100; }",30,6000,BF_WEAPON; }
 5040:5442,{ bonus bAspdRate,3; bonus bVariableCastrate,3; }
+4697:27012,{ bonus bNoMadoFuel,1; }
+4699:27012,{ bonus bNoMadoFuel,1; }
 5040:18673,{ bonus bSPrecovRate,3; }
 5041:18538,{ bonus2 bSubRace,RC_Angel,9; }
 5043:18656,{ bonus bFlee,10; bonus2 bAddEff,Eff_Stun,1000; }
@@ -372,6 +415,7 @@
 5475:18656,{ bonus bBaseAtk,30; bonus bMatk,30; bonus2 bAddMonsterDropItem,529,400; bonus2 bAddMonsterDropItem,530,400; bonus2 bAddMonsterDropItem,538,400; bonus2 bAddMonsterDropItem,12192,400;}
 5498:5521,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if(.@r>=7) bonus bCritAtkRate,10; if(.@r>=9) bonus bAspd,1; }
 5548:5766,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bBaseAtk,min(.@r,10); bonus bMatk,min(.@r,10); }
+5917:1525,{ bonus bLongAtkDef,10; }
 5920:18542,{ bonus bHealPower,2*getequiprefinerycnt(EQI_HEAD_TOP); }
 //9024:18832,{ bonus3 bAutoSpell,"BS_ADRENALINE",2,(GetPetRelationship >= 3)?15:10; }
 13027:15044,{ .@r = max(getequiprefinerycnt(EQI_ARMOR),1); bonus3 bAddMonsterDropItem,929,RC_DemiHuman,70*.@r; bonus3 bAddMonsterDropItem,970,RC_DemiHuman,50*.@r; bonus3 bAddMonsterDropItem,929,RC_Player,70*.@r; bonus3 bAddMonsterDropItem,970,RC_Player,50*.@r; bonus3 bAddMonsterDropItem,929,RC_Brute,70*.@r; bonus3 bAddMonsterDropItem,970,RC_Brute,50*.@r; }
@@ -380,33 +424,119 @@
 15068:20710,{ bonus bAgi,5; bonus bFlee,10; }
 15088:18816:18818,{ bonus bMatk,BaseLevel/3; bonus2 bExpAddClass,Class_All,5; }
 15088:18817:18819,{ bonus bBaseAtk,BaseLevel/3; bonus2 bExpAddClass,Class_All,5; }
-15090:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus bMaxHPrate,25; bonus bMaxSPrate,25; bonus bMatkRate,10; bonus3 bAutoSpellWhenHit,"WL_DRAINLIFE",3,1; }
-15116:20743:22046,{ bonus bMaxSPrate,25; bonus bMaxSPrate,25; bonus bSpeedAddRate,10; }
+15090:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus3 bAutoSpellWhenHit,"WL_DRAINLIFE",3,1; }
+15091:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus bMaxHPrate,25; bonus bMaxSPrate,25; bonus bMatkRate,10; }
+15116:20743:22046,{ bonus bMaxHPrate,25; bonus bMaxSPrate,25; bonus bSpeedAddRate,10; }
 15126:20788:22083,{ bonus bMaxHP,2000; bonus bNoCastCancel,1; bonus bFixedCastrate,-15-(getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)); }
-15126:20788:22083:28380:28416,{ bonus bMaxHPrate,10; bonus bMaxSPrate,10; bonus2 bSkillAtk,"SU_CN_METEOR",100; }
+15126:20788:22083:28382:28416,{ bonus bMaxHPrate,10; bonus bMaxSPrate,10; bonus2 bSkillAtk,"SU_CN_METEOR",100; }
 15126:20788:22083:28380:28419,{ bonus bMaxHPrate,20; bonus bMaxSPrate,3; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",100; }
 15126:20788:22083:28381:28413,{ bonus bMaxHPrate,15; bonus bMaxSPrate,5; bonus bHealPower,10; skill "AL_HEAL",5,1; }
 15129:20789:22084,{ bonus bMaxHP,3000; bonus bNoCastCancel,1; bonus bFixedCastrate,-20-(getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)); }
-15129:20789:22084:28380:28417,{ bonus bMaxHPrate,15; bonus bMaxSPrate,15; bonus2 bSkillAtk,"SU_CN_METEOR",150; }
+15129:20789:22084:28382:28417,{ bonus bMaxHPrate,15; bonus bMaxSPrate,15; bonus2 bSkillAtk,"SU_CN_METEOR",150; }
 15129:20789:22084:28380:28420,{ bonus bMaxHPrate,25; bonus bMaxSPrate,6; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",150; }
 15129:20789:22084:28381:28414,{ bonus bMaxHPrate,20; bonus bMaxSPrate,10; bonus bHealPower,20; skill "AL_HEAL",7,1; }
 15138:19026,{ bonus2 bSubRace,RC_Fish,(10+getequiprefinerycnt(EQI_ARMOR)); }
 15138:19026:20756:22059,{ bonus bMaxHP,1000; bonus bMaxSP,100; bonus2 bExpAddRace,RC_Fish,20; bonus2 bMagicAddRace,RC_Fish,50; bonus2 bSubEle,Ele_Water,50; }
 15156:20790:22085,{ bonus bMaxHP,4000; bonus bNoCastCancel,1; bonus bFixedCastrate,-25-(getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)); }
-15156:20790:22085:28380:28418,{ bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus2 bSkillAtk,"SU_CN_METEOR",200; }
+15156:20790:22085:28382:28418,{ bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus2 bSkillAtk,"SU_CN_METEOR",200; }
 15156:20790:22085:28380:28421,{ bonus bMaxHPrate,30; bonus bMaxSPrate,9; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",200; }
 15156:20790:22085:28381:28415,{ bonus bMaxHPrate,25; bonus bMaxSPrate,15; bonus bHealPower,30; skill "AL_HEAL",9,1; }
+15181:28443:28444,{ bonus bAtk,20; bonus2 bSubEle,Ele_All,2; bonus2 bSubEle,Ele_Neutral,-2; }
+15182:28445:28446,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; }
+15183:28447:28448,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; bonus2 bExpAddClass,Class_All,2; }
+15184:28449:28450,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; }
+15185:28451:28452,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; bonus bNoCastCancel,1; }
+15181:28453:28454,{ bonus bMatk,20; bonus2 bSubEle,Ele_All,2; bonus2 bSubEle,Ele_Neutral,-2; }
+15182:28455:28456,{ bonus bMatk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; }
+15183:28457:28458,{ bonus bMatk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; bonus2 bExpAddClass,Class_All,2; }
+15184:28459:28460,{ bonus bMatk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; }
+15185:28461:28462,{ bonus bMatk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; bonus bNoCastCancel,1; }
+15181:28463:28464,{ bonus bAtk,20; bonus2 bSubEle,Ele_All,2; bonus2 bSubEle,Ele_Neutral,-2; }
+15182:28465:28466,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; }
+15183:28467:28468,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; bonus2 bExpAddClass,Class_All,2; }
+15184:28469:28470,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; }
+15185:28471:28472,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; bonus bNoCastCancel,1; }
+18137:1752,{ bonus bLongAtkRate,25; }
+18137:1752:19048,{ bonus bLongAtkRate,20; bonus2 bSubEle,Ele_Fire,-10; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
+18137:19019,{ bonus bLongAtkRate,45; }
+18138:1754,{ bonus bLongAtkRate,25; }
+18138:1754:19048,{ bonus bLongAtkRate,20; bonus2 bAddEff,Eff_Freeze,-1000; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
+18138:19019,{ bonus bLongAtkRate,45; }
+18139:1756,{ bonus bLongAtkRate,25; bonus2 bAddEff,Eff_Stone,1000; }
+18139:1756:19048,{ bonus bLongAtkRate,20; bonus2 bAddEff,Eff_Stone,-1000; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
+18139:19019,{ bonus bLongAtkRate,45; }
+18140:1755,{ bonus bLongAtkRate,25; bonus3 bAutoSpell,"NJ_HUUJIN",5,(readparam(bInt)>39) ? 300 : 100; }
+18140:1755:19048,{ bonus bLongAtkRate,20; bonus3 bAutoSpell,"NJ_HUUJIN",5,(readparam(bInt)>39) ? -300 : -100;; if (getequiprefinerycnt(EQI_HAND_R) >= 10)  bonus bAspd,1; }
+18140:19019,{ bonus bLongAtkRate,45; }
 18507:18539,{ bonus bUseSPrate,-3; }
 18559:18560,{ bonus bCritAtkRate,5; }
+18563:18564,{ bonus bFixedCastrate,-10; }
 18776:20710,{ bonus bBaseAtk,10; }
 18776:22015,{ bonus bMatk,20; }
 18823:28372,{ bonus2 bSkillAtk,"CR_GRANDCROSS",BaseLevel; bonus2 bVariableCastrate,"CR_GRANDCROSS",-BaseLevel*2; bonus2 bSkillAtk,"CR_GRANDCROSS",BaseLevel/30; bonus2 bSkillUseSP,"CR_GRANDCROSS",-(BaseLevel/30)*10; }
+18867:1720,{ bonus bLongAtkRate,3+(getequiprefinerycnt(EQI_HAND_R) > 6 ? 5:0); }
+18937:28302,{ bonus bInt,8; bonus bMaxSPrate,5;}
+18937:28303,{ bonus bInt,8; bonus bBaseAtk,20;}
+18937:28304,{ bonus bInt,8; bonus bFlee,15;}
+18937:28305,{ bonus bInt,8; bonus bHit,10;}
 18997:28326:28327,{ bonus bSpeedRate,10; bonus bBaseAtk,50; bonus bMatk,50; if(getequiprefinerycnt(EQI_HEAD_TOP)>=9){ bonus bMaxHPrate,10; bonus bMaxSPrate,50; } }
 19026:20756,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSPGainRace,RC_Fish,10; bonus3 bAddMonsterDropItem,551,RC_Fish,(5+.@r); bonus2 bAddItemHealRate,551,5; bonus bHPrecovRate,(5+.@r); }
 19026:22059,{ bonus2 bCriticalAddRace,RC_Fish,(10+getequiprefinerycnt(EQI_SHOES)); }
 19038:19039,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP)+getequiprefinerycnt(EQI_HEAD_MID); if((.@r==7)||(.@r==8)){ bonus bCritical,12; bonus bHit,12; } if(.@r>=9){ bonus bMaxHP,1200; bonus bMaxSP,120; } }
+19117:22101,{ bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5; if(getequiprefinerycnt(EQI_SHOES) >= 12) { bonus bFixedCast,-400; } }
+19118:22101,{ bonus2 bDropAddRace,RC_All,4; bonus2 bExpAddRace,RC_All,4; if(getequiprefinerycnt(EQI_SHOES) >= 12) { bonus bFixedCast,-400; } }
 20135:20136,{ bonus bAllStats,12; }
-24012:24013:24014:24015:24016:24017,{ bonus bAllStats,9; }
+20717:22000,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22001,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22002,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22003,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22004,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22005,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22006,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22007,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22008,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22009,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22010,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20717:22011,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22000,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22001,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22002,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22003,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22004,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22005,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22006,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22007,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22008,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22009,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22010,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20718:22011,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
+20797:2339,{ bonus bInt,15; bonus bMaxHPrate,5; bonus bMaxSPrate,5; if (getequiprefinerycnt(EQI_ARMOR) > 6) bonus bNoCastCancel,1; }
+20797:4174,{ bonus2 bSubEle,Ele_All,50; bonus2 bSubEle,Ele_Neutral,-50; }
+22069:2195,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bAddEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_L); }
+22069:20753,{ bonus2 bAddEle,Ele_Neutral,5; .@r = getequiprefinerycnt(EQI_GARMENT); bonus bMaxHPrate,.@r; bonus bMaxSPrate,.@r; }
+22101:29148,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus bAtkRate,2; } if(.@r >= 9) { bonus bAtkRate,3; } if(.@r >= 12) { bonus bDelayrate,-5; } }
+22101:29149,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus bMatkRate,2; } if(.@r >= 9) { bonus bMatkRate,3; } if(.@r >= 12) { bonus bDelayrate,-5; } }
+22101:29150,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus bAspdRate,5; } if(.@r >= 9) { bonus bAspdRate,5; } if(.@r >= 12) { bonus bDelayrate,-5; } }
+22101:29151,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus2 bSubEle,Ele_Neutral,2; } if(.@r >= 9) { bonus2 bSubEle,Ele_Neutral,3; } if(.@r >= 12) { bonus bDelayrate,-5; } }
+22101:29152,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus bLongAtkRate,2; } if(.@r >= 9) { bonus bLongAtkRate,3; } if(.@r >= 12) { bonus bDelayrate,-5; } }
+22101:29153,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus bCritAtkRate,2; } if(.@r >= 9) { bonus bCritAtkRate,3; } if(.@r >= 12) { bonus bDelayrate,-5; } }
+22106:2160,{ .@r = getequiprefinerycnt(EQI_SHOES); if (.@r > 6) { bonus2 bSubSize,Size_Large,2; bonus2 bSubClass,Class_Boss,2; } if (.@r > 8) { bonus2 bSubSize,Size_Large,2; bonus2 bSubClass,Class_Boss,2; } }
+22122:28443:28444,{ bonus bAspdRate,4; bonus bHit,4; }
+22123:28445:28446,{ bonus bAspdRate,8; bonus bHit,8; }
+22124:28447:28448,{ bonus bAspdRate,8; bonus bHit,8; bonus2 bExpAddClass,Class_All,2; }
+22125:28449:28450,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; }
+22126:28451:28452,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; bonus bSpeedAddRate,25; }
+22122:28453:28454,{ bonus bVariableCastrate,-3; bonus bDelayrate,-3; }
+22123:28455:28456,{ bonus bVariableCastrate,-6; bonus bDelayrate,-6; }
+22124:28457:28458,{ bonus bVariableCastrate,-6; bonus bDelayrate,-6; bonus2 bExpAddClass,Class_All,2; }
+22125:28459:28460,{ bonus bVariableCastrate,-6; bonus bDelayrate,-6; bonus2 bExpAddClass,Class_All,2; }
+22126:28461:28462,{ bonus bVariableCastrate,-8; bonus bDelayrate,-8; bonus2 bExpAddClass,Class_All,2; bonus bSpeedAddRate,25; }
+22122:28463:28464,{ bonus bAspdRate,4; bonus bHit,4; }
+22123:28465:28466,{ bonus bAspdRate,8; bonus bHit,8; }
+22124:28467:28468,{ bonus bAspdRate,8; bonus bHit,8; bonus2 bExpAddClass,Class_All,2; }
+22125:28469:28470,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; }
+22126:28471:28472,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; bonus bSpeedAddRate,25; }
+24012:24013:24014:24015:24016:24017,{ bonus bAllStats,3; }
 24018:24019:24020,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) + getequiprefinerycnt(EQI_SHADOW_WEAPON) >= 23) { bonus bAtkRate,1; } }
 24021:24022:24023,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) + getequiprefinerycnt(EQI_SHADOW_WEAPON) >= 23) { bonus bMatkRate,1; } }
 24025:24028,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_SHOES); bonus bMaxHP,.@r; bonus bMaxSP,.@r; if(.@r >= 15) { bonus bMaxHPrate,1; } }
@@ -436,16 +566,15 @@
 24078:24079:24080,{ bonus2 bSPDrainRate,10,1+(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)/10); }
 24081:24082:24083,{ bonus2 bHPDrainRate,40,2+(getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)/5); }
 24084:24085:24086:24087:24088:24089,{ bonus bAllStats,1; .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if (.@r >= 45) { bonus bNoGemStone,1; } bonus bUseSPrate,100-.@r; }
-24090:24091:24092,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Stone,100; }
-24090:24093:24094,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Sleep,100; }
-24090:24095:24096,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Silence,100; }
-24090:24097:24098,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Blind,100; }
-24090:24099:24100:24101,{ bonus bDef,4; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff,Eff_Freeze,100; }
-24090:24102:24103,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff,Eff_Bleeding,100; }
-24090:24104:24105:24106,{ bonus bDef,4; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff,Eff_Stun,100; }
-24090:24107:24108,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff,Eff_Curse,100; }
-24109:24110,{ bonus bNoCastCancel2,1; bonus bVariableCastrate,40-(getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)); }
-//The above should be 24109:24110/*:Caster Shadow Pendant*/,{ bonus bFixedCastrate,-(getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R)); }
+24090:24091:24092,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Stone,10000; }
+24090:24093:24094,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Sleep,10000; }
+24090:24095:24096,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Silence,10000; }
+24090:24097:24098,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES) >= 20) bonus2 bResEff,Eff_Blind,10000; }
+24090:24099:24100:24101,{ bonus bDef,4; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff,Eff_Freeze,10000; }
+24090:24102:24103,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff,Eff_Bleeding,10000; }
+24090:24104:24105:24106,{ bonus bDef,4; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 30) bonus2 bResEff,Eff_Stun,10000; }
+24090:24107:24108,{ bonus bDef,5; if (getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ACC_L)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 20) bonus2 bResEff,Eff_Curse,10000; }
+24048:24109:24110,{ bonus bNoCastCancel2,1; bonus bVariableCastrate,40-(getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)); }
 24111:24112:24113,{ bonus bNoCastCancel,1; bonus bUseSPrate,40-getequiprefinerycnt(EQI_SHADOW_SHIELD)-getequiprefinerycnt(EQI_SHADOW_ARMOR)-getequiprefinerycnt(EQI_SHADOW_SHOES); }
 24150:24151,{ bonus bAtkRate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 15) bonus bNoSizeFix,1; }
 24152:24153,{ bonus bAtk,getequiprefinerycnt(EQI_SHADOW_WEAPON); if (getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R) >= 15) bonus bUnbreakableWeapon,1; }
@@ -487,15 +616,29 @@
 24212:24213,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:5); }
 24214:24215,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?4:2); }
 24217:24218,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=15) bonus bAspd,1; }
-//24223:Enhanced Force Shadow Earring:Enhanced Force Shadow Pendant,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@r)>=25 {bonus bAtkRate,2;} else if(.@r)>=20 {bonus bAtkRate,1;} bonus bAtkRate,1; }
+24223:24225:24226,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@r)>=25 {bonus bAtkRate,2;} else if(.@r)>=20 {bonus bAtkRate,1;} bonus bAtkRate,1; }
 24224:24225:24226,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@r)>=25 {bonus bAtkRate,2;} else if(.@r)>=20 {bonus bAtkRate,1;} bonus bAtk2,10; }
-//24227:Enhanced Soul Earring:Enhanced Soul Pendant,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@r)>=25 {bonus bMatkRate,2;} else if(.@r)>=20 {bonus bMatkRate,1;} bonus bMatkRate,1; }
+24227:24229:24230,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@r)>=25 {bonus bMatkRate,2;} else if(.@r)>=20 {bonus bMatkRate,1;} bonus bMatkRate,1; }
 24228:24229:24230,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@r)>=25 {bonus bMatkRate,2;} else if(.@r)>=20 {bonus bMatkRate,1;} bonus bMatk,10; }
 24231:24232,{ bonus bFlee,5; if (getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD)>=15) { bonus bAspd,1; } }
 24234:24235,{ bonus bBaseAtk,5; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=15) { bonus2 bAddSize,Size_Large,2; bonus2 bMagicAddSize,Size_Large,2; } }
 24236:24237,{ bonus bBaseAtk,5; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=15) { bonus2 bAddSize,Size_Medium,2; bonus2 bMagicAddSize,Size_Medium,2; } }
 24238:24239,{ bonus bBaseAtk,5; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=15) { bonus2 bAddSize,Size_Small,2; bonus2 bMagicAddSize,Size_Small,2; } }
+24240:24241:24242,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bVariableCastrate,-.@r/5; if(.@r)>=25 { bonus bUseSPrate,-2; } else bonus bUseSPrate,-1; }
+24240:24241:24330,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bVariableCastrate,-.@r/5; if(.@r)>=25 { bonus bUseSPrate,-2; } else bonus bUseSPrate,-1; }
 24243:24244:24245,{ bonus bDelayrate,(getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_ARMOR)>=25?-5:-1); }
+24246:24250,{ bonus2 bAddRace,RC_All,1; bonus bMaxHPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bAddRace,RC_All,2; bonus bMaxHPrate,2; } }
+24247:24251,{ bonus2 bAddRace,RC_All,1; bonus bMaxHPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bAddRace,RC_All,2; bonus bMaxHPrate,2; } }
+24248:24252,{ bonus2 bMagicAddRace,RC_All,1; bonus bMaxSPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bMagicAddRace,RC_All,2; bonus bMaxSPrate,2; } }
+24249:24254,{ bonus2 bMagicAddRace,RC_All,1; bonus bMaxSPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bMagicAddRace,RC_All,2; bonus bMaxSPrate,2; } }
+24253:28391,{ bonus2 bAddRace,RC_All,1; bonus bMaxHPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bAddRace,RC_All,2; bonus bMaxHPrate,2; } }
+24255:28392,{ bonus2 bAddRace,RC_All,1; bonus bMaxHPrate,1; if (getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=10) { bonus2 bAddRace,RC_All,2; bonus bMaxHPrate,2; } }
 28315:28317,{ bonus2 bAddClass,Class_All,4; bonus bMatkRate,4; }
 28316:28318,{ bonus2 bAddClass,Class_All,4; bonus bMatkRate,4; }
 28326:28327,{ bonus bInt,8; bonus bStr,8; }
+28358:18521,{ skill "AS_CLOAKING",1; }
+28499:28920,{ bonus bFlee2,10; }
+28906:2998,{ bonus bLongAtkRate,10; }
+28907:2998,{ bonus bSpeedRate,25; }
+28908:2998,{ bonus bDelayrate,-10; }
+28909:2998,{ bonus bUseSPrate,-10; bonus bMaxSPrate,10; }