Merge branch 'master' into refactor/StatusChangeDisplay

Minor comment adjustments.
Reapplied Acid Terror status def ignore.
2017-11-03 13:27:25 -04:00 · 2017-09-30 16:36:17 +02:00 · 2017-09-29 21:15:21 +02:00 · 2017-09-29 02:16:51 +02:00 · 2017-09-21 13:54:22 -04:00 · 2017-08-28 14:01:01 -04:00
1462 changed files with 180457 additions and 1096919 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,30 +0,0 @@
-# rAthena EditorConfig file
-# EditorConfig is awesome: https://EditorConfig.org
-# This file should be encoded in UTF-8 with CRLF or LF line endings.
-
-root = true
-
-# Add a blank newline to the end of every file after saving
-# Trim trailing whitespace
-# Adjust character set
-[*]
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8
-
-# Use tabs in source
-[*.{cpp,c,hpp,h}]
-indent_style = tab
-
-# YAML does not support hard tabs.
-[*.{yml,yaml}]
-indent_style = space
-indent_size = 4
-
-# Use tabs in Makefiles
-[Makefile*]
-indent_style = tab
-
-# Scripts should use hard tabs to prevent script header goofs.
-[npc/**.txt]
-indent_style = tab
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,15 +1,12 @@
 *        text=auto
-*.cpp diff=cpp
-*.yml diff text eol=lf
+*.c      diff=cpp
 *.sln    merge=union
 *.vcproj merge=union
 *.vcxproj merge=union
 *.sln text eol=crlf
 *.bat text eol=crlf
-athena-start text eol=lf
 configure text eol=lf
 configure.in text eol=lf
 Makefile text eol=lf
 Makefile.in text eol=lf
 *.sh text eol=lf
-*.sql text eol=lf
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -7,7 +7,6 @@ Table of Contents
  * [Reporting Bugs](#reporting-bugs)
  * [Suggesting Enhancements](#suggesting-enhancements)
  * [Issue Labels](#issue-labels)
-  * [Local Development Environment](#local-development-environment)
  * [Become a Team Member](#become-a-team-member)

 Reporting Bugs
@@ -64,7 +63,7 @@ Suggesting Enhancements
 #### 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/#fork-an-example-repository) to your account.
+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!
@@ -162,13 +161,6 @@ For the most part you as a user will have no reason to worry about the **Milesto
 [search-rathena-label-typemaintenance]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Amaintenance
 [search-rathena-label-typequestion]: https://github.com/rathena/rathena/issues?q=is%3Aissue+is%3Aopen+label%3Atype%3Aquestion

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

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

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

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

 # /3rdparty/libconfig/
 /3rdparty/libconfig/Makefile
 /3rdparty/libconfig/*.o
 /3rdparty/libconfig/obj

+# /3rdparty/mt19937ar/
+/3rdparty/mt19937ar/Makefile
+/3rdparty/mt19937ar/*.o
+
 # /3rdparty/yaml-cpp/
 /3rdparty/yaml-cpp/Makefile

@@ -60,9 +60,6 @@ Thumbs.db
 /conf/import
 /conf/msg_conf/import

-# /lib
-/lib
-
 # /log/
 /log/*.log
 /log/*.leaks
@@ -75,7 +72,7 @@ Thumbs.db
 /src/common/Makefile
 /src/common/obj_all
 /src/common/obj_sql
-/src/common/version.hpp
+/src/common/svnversion.h

 # /src/custom/
 /src/custom
@@ -87,7 +84,11 @@ Thumbs.db
 # /src/map/
 /src/map/Makefile
 /src/map/obj_sql
-/src/map/pcre.hpp
+/src/map/pcre.h
+
+# /src/test/
+/src/test/Makefile
+/src/test/obj

 # /src/tool/
 /src/tool/Makefile
@@ -100,11 +101,50 @@ Thumbs.db
 /tools/*.ilk
 /tools/*.pdb

-# Visual Studio
+# /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
+/vcproj-14/map-server
+/vcproj-14/*.user

+# /vcproj-13/
+/vcproj-13/char-server
+/vcproj-13/login-server
+/vcproj-13/mapcache
+/vcproj-13/map-server
+/vcproj-13/*.user
+
+# /vcproj-12/
+/vcproj-12/char-server
+/vcproj-12/login-server
+/vcproj-12/mapcache
+/vcproj-12/map-server
+/vcproj-12/*.user
+
+# /vcproj-10/
+/vcproj-10/char-server
+/vcproj-10/login-server
+/vcproj-10/mapcache
+/vcproj-10/map-server
+/vcproj-10/*.user
+
+# /vcproj-9/
+/vcproj-9/*.user
+/vcproj-9/char-server
+/vcproj-9/login-server
+/vcproj-9/map-server
+/vcproj-9/mapcache
 /.idea/.name
 /.idea/misc.xml
 /.idea/modules.xml
@@ -112,23 +152,16 @@ Thumbs.db
 /.idea/vcs.xml
 /.idea/workspace.xml
 /build/
-/cbuild/

 # bat tools
 /charserv.bat
-/csv2yaml.bat
 /logserv.bat
 /mapcache.bat
 /mapserv.bat
 /runserver.bat
 /serv.bat
-/yaml2sql.bat
-/yamlupgrade.bat

 # dlls
 /libmysql.dll
 /pcre8.dll
 /zlib.dll
-
-# CMakeFiles
-/CMakeFiles/
--- a/.mailmap
+++ b/.mailmap
@@ -1,197 +0,0 @@
-##################################################################
-# This maps commits from different aliases to the same account   #
-#                                                                #
-# Always try to map to the GitHub username and try to use the    #
-# @users.noreply.github.com mail addresses where possible.       #
-# The entries are sorted ascending by the username.              #
-#                                                                #
-# If you want to have your mail changed feel free to contact us. #
-#                                                                #
-# If you know any of the missing commiters please also let us    #
-# know.                                                          #
-# You can generate the list of commiters with:                   #
-# git shortlog -sne                                              #
-##################################################################
-
-##################################################################
-#                  SVN Users                                     #
-##################################################################
-ai4rei <ai4rei@users.noreply.github.com> <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Akinari1087 <tagraskemper@hotmail.com> <akinari1087@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Akkarinage <akkarin@rathena.org> <thatakkarin@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-aleos89 <aleos89@users.noreply.github.com> <aleos@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Baalberith6 <matej.pristak@gmail.com> <baalberith@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-brianluau <brianluau@users.noreply.github.com> <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-cydh <cydh@users.noreply.github.com> <cydh@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Daegaladh <Daegaladh@users.noreply.github.com> <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Deadly Silence <mail@deadly-silence.de> <deadlysilence@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Epoque1 <22254628+Epoque1@users.noreply.github.com> <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-euphyy <euphy.raliel@rathena.org> <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-flaviojs <flaviojs2005@gmail.com> <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-flaviojs <flaviojs2005@gmail.com> <flaviojs2005@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-functor-x <piotr.halaczkiewicz@gmail.com> <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-functor-x <piotr.halaczkiewicz@gmail.com> <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-greenboxal <greenboxal@gmail.com> <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-jguy1987 <jmish1987@gmail.com> <jmanfffreak@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-jTynne <decadenthearts06@gmail.com> <jtynne@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-j-tkay <joseph.tk.ea@gmail.com> <j-tkay@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Kenpachi2k13 <Kenpachi.Developer@gmx.de> <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-kisuka <kisuka@kisuka.com> <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Lemongrass3110 <lemongrass@kstp.at> <lemongrass3110@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-lnkfish <lnkfish@hotmail.com> <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Locien <masterofmuppets89@gmail.com> <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-lighta <lighta@users.noreply.github.com> <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Masao87 <masao@gmx.ch> <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-missxantara <missxantara@gmail.com> <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-macabu <macabu@users.noreply.github.com> <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Paradox924X <paradox924x@gmail.com> <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Paradox924X <paradox924x@gmail.com> <Paradox924x@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Playtester <Kenji.Ito@gmx.de> <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Playtester <Kenji.Ito@gmx.de> <playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-rAthenaAPI <administrator@rathena.org> <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-rAthenaAPI <administrator@rathena.org> <rathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-SeoRoman <RomanL0927@gmail.com> <script-Z3R0@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-SeoRoman <RomanL0927@gmail.com> <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-shennetsind <ind@henn.et> <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-theultramage <umage@netvor.sk> <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-trojal <trojal@gmail.com> <trojal@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Valaris <2738218+valaris@users.noreply.github.com> <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Valaris <2738218+valaris@users.noreply.github.com> <Valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-wilkemeyer <fw@f-ws.de> <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-Yommy <yomanda@gmail.com> <Yommy@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-
-##################################################################
-#                  Git Aliases                                   #
-##################################################################
-aleos89 <aleos89@users.noreply.github.com> <aleos89@users.noreply.github.com>
-aleos89 <aleos89@users.noreply.github.com> <jarajabi@msn.com>
-Akkarinage <akkarin@rathena.org> <mike.langford@live.co.uk>
-Baalberith6 <matej.pristak@gmail.com> <matej.pristak@gmail.com>
-brianluau <brianluau@users.noreply.github.com> <brianluau@gmail.com>
-brianluau <brianluau@users.noreply.github.com> <brianluau@users.noreply.github.com>
-Atemo <Atemo@users.noreply.github.com> <capucrath@gmail.com>
-Atemo <Atemo@users.noreply.github.com> <Capuche@users.noreply.github.com>
-cydh <cydh@users.noreply.github.com> <cydh@users.noreply.github.com>
-cydh <cydh@users.noreply.github.com> <cydh@pservero.com>
-cydh <cydh@users.noreply.github.com> <house.bad@gmail.com>
-Daegaladh <Daegaladh@users.noreply.github.com> <daegaladh@shadowgames.es>
-dentongrills <sketchyphoenix@gmail.com> <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-dentongrills <sketchyphoenix@gmail.com> <SketchyPhoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-euphyy <euphy.raliel@rathena.org> <euphy@rathena.org>
-icxbb-xx <arokaice@live.com> <arokaice@live.com>
-Jeybla <jey@bjx-studios.de> <jey@toto-ro.de>
-Jeybla <jey@bjx-studios.de> <jey@bjx-studios.de>
-Jeybla <jey@bjx-studios.de> <jey@toto-ro.de>
-GodLesZ <godlesz@hotmail.de> <GodLesZ@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-lighta <lighta@users.noreply.github.com> <lightaisme@gmail.com>
-lighta <lighta@users.noreply.github.com> <lighta@lighta-fedora20.localdomain>
-lighta <lighta@users.noreply.github.com> <lighta@lighta-VPCW12M1E>
-lighta <lighta@users.noreply.github.com> <lighta>
-lighta <lighta@users.noreply.github.com> <lighta@lighta-VPCW12M1E.(none)>
-lighta <lighta@users.noreply.github.com> <lightaisme>
-Lilith- <amurov.ro@gmail.com> <amurov.ro@gmail.com>
-macabu <macabu@users.noreply.github.com> <macabu.matheus@gmail.com>
-macabu <macabu@users.noreply.github.com> <mkbu95@users.noreply.github.com>
-rAthenaAPI <administrator@rathena.org> <rAthenaAPI>
-secretdataz <secretdataz@users.noreply.github.com> <foreverfk@stephack.com>
-secretdataz <secretdataz@users.noreply.github.com> <nightsheep@outlook.com>
-secretdataz <secretdataz@users.noreply.github.com> <secret@ahri.in.th>
-Stolao <Stolao@users.noreply.github.com> <Taingram11@gmail.com>
-tr0n93 <tr0n.developer@gmail.com> <tr0n93@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-wilkemeyer <fw@f-ws.de> <fw@f-ws.de>
-vstumpf <vincents.995@gmail.com> <vincents.995@gmail.com>
-zackdreaver <zackdreaver@users.noreply.github.com> <zackdreaver@gmail.com>
-
-##################################################################
-#                  Unconfirmed ones                              #
-#                  missing github username                       #
-##################################################################
-calciumkid <harrison@isabarwon.com> <calciumkid@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-skotlex <skotlex@mailforce.net> <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-skotlex <skotlex@mailforce.net> <Skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-
-##################################################################
-#                  TODO                                          #
-#                                                                #
-# If you know the GitHub account and/or mail address of any of   #
-# these please let us know.                                      #
-##################################################################
-
-# L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# shadowlady <shadowlady@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# samuray22 <samuray22@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Kevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# mc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# evera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# SinSloth <SinSloth@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# DracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# littlewolf <littlewolf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# eaac <eaac@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# ajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# wizputer <wizputer@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Nasedo <Nasedo@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# blackhole89 <blackhole89@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# protimus <protimus@54d463be-8e91-2dee-dedb-b68131a5f0ec>							https://github.com/protimus
-# Komurka <Komurka@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Poki#3 <Poki#3@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# cookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Zido <Zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# akrus <akrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# xazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# flaid <flaid@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# lordttseven <lordttseven@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# musashiden <musashiden@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Aria <Aria@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# og2 <og2@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# reddozen <reddozen@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# KarLaeda <KarLaeda@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Zephiris <Zephiris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# DZeroX <DZeroX@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# ignizh <ignizh@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# kobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# shinomori <shinomori@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# LuzZza <LuzZza@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# spre123 <spre123@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Chilly0123 <Chilly0123@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# ediejohnny <ediejohnny@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# hipsterfont <hipsterfont@54d463be-8e91-2dee-dedb-b68131a5f0ec>					https://github.com/hipsterfont
-# nsstrunks <nsstrunks@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# shadoweathena <shadoweathena@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# technote24 <technote24@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# mandark022 <mandark022@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Kargha <Kargha@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Mass <Mass@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Sara <Sara@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# nana <nana@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# veider <veider@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Shinigami <Shinigami@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# mercurial123 <mercurial123@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# arcshiru <arcshiru@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# davidsiaw <davidsiaw@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# foruken <foruken@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# sirius <sirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Euph <Euph@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Kayla <Kayla@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# rikimaru17 <rikimaru17@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Evera <Evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# L0neW0lf.eAthena <L0neW0lf.eAthena@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# cleaverbeaver <cleaverbeaver@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# killercube <killercube@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# salepate <salepate@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# spira <spira@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# CIA-2 <CIA-2@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Protimus <Protimus@54d463be-8e91-2dee-dedb-b68131a5f0ec>							https://github.com/protimus
-# lmaatl <lmaatl@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# zapbomb <zapbomb@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# zido <zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,189 +1,41 @@
 language: cpp
+compiler:
+  - clang
+  - gcc
 dist: trusty
-sudo: false
-
-matrix:
-  include:
-# First check if all our options are good
-#   Renewal without VIP
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-         - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-#   Renewal with VIP
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-         - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=no --enable-buildbot=yes"
-#   Pre-Renewal without VIP
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-         - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=yes --enable-buildbot=yes"
-#   Pre-Renewal with VIP
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-         - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=yes --enable-buildbot=yes"
-# After that check all different compilers and compiler versions
-# GCC
-#   Version 6
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-      env:
-        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
-        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-#   Version 7
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
-        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-#   Version 8
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-8
-      env:
-        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
-        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-# Clang
-#   Version 3.9
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-3.9
-          packages:
-            - clang-3.9
-      env:
-        - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
-        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-#   Version 4
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-4.0
-          packages:
-            - clang-4.0
-      env:
-        - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
-        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-#   Version 5
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-5.0
-          packages:
-            - clang-5.0
-      env:
-        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
-        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-#   LLVM on OSX
-#    - os: osx
-#      osx_image: xcode9.2
-#      install:
-#        - brew update
-#        - brew install mysql
-#        - brew tap homebrew/services
-#        - brew services start mysql
-##         MySQL takes a while to start...
-#        - brew services list
-#        - launchctl list | grep mysql
-#      before_install: false
-#      env:
-#        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes --enable-lto=no"
-#      script:
-#        - ./configure $CONFIGURE_FLAGS
-##         MacOS default MySQL configuration does not like our card seller(only full group by)
-#        - ./tools/ci/npc.sh
-#        - make clean
-#        - make all
-#        - ./login-server --run-once
-#        - ./char-server --run-once
-#        - ./map-server --run-once
-# CMake
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-      script:
-         - mkdir cbuild
-         - cd cbuild
-         - cmake -G "Unix Makefiles" ..
-         - make || travis_terminate 1
-# MariaDB
-    - os: linux
-      addons:
-        mariadb: '10.0'
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-            - libmariadbclient-dev
-      env:
-         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-         - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
-
-before_install:
-    - eval "${MATRIX_EVAL}"

 before_script:
  - uname -a
-  - ./tools/ci/sql.sh
+  - mysql -u $DB_ROOT -e "CREATE DATABASE $DB_NAME;" || aborterror "Unable to create database."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/main.sql || aborterror "Unable to import main database."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/logs.sql || aborterror "Unable to import logs database."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/item_cash_db.sql || aborterror "Unable to import cash item table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/item_cash_db2.sql || aborterror "Unable to import cash item 2 table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/item_db.sql || aborterror "Unable to import pre-renewal item table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/item_db2.sql || aborterror "Unable to import pre-renewal item 2 table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/item_db_re.sql || aborterror "Unable to import renewal item table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/item_db2_re.sql || aborterror "Unable to import renewal item 2 table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_db.sql || aborterror "Unable to import pre-renewal monster table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_db2.sql || aborterror "Unable to import pre-renewal monster 2 table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_db_re.sql || aborterror "Unable to import renewal monster table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_db2_re.sql || aborterror "Unable to import renewal monster 2 table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_skill_db.sql || aborterror "Unable to import pre-renewal monster skill table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_skill_db2.sql || aborterror "Unable to import pre-renewal monster skill 2 table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_skill_db_re.sql || aborterror "Unable to import renewal monster skill table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/mob_skill_db2_re.sql || aborterror "Unable to import renewal monster skill 2 table."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/roulette_default_data.sql || aborterror "Unable to import roulette table."
+  - mysql -u $DB_ROOT -e "GRANT ALL ON *.* TO '$DB_USER'@'$DB_HOST' IDENTIFIED BY '$DB_PASS';"
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+  - sudo apt-get update -q
+  - sudo apt-get install gcc-5 -y
+  - sudo apt-get install g++-5 -y
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
+  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1

 script:
-  - ./configure $CONFIGURE_FLAGS || travis_terminate 1
-  - ./tools/ci/npc.sh
-  - make clean || travis_terminate 1
-  - make all || travis_terminate 1
-  - ./login-server --run-once
-  - ./char-server --run-once
+  - ./configure $CONFIGURE_FLAGS
+  - make clean
+  - make server
  - ./map-server --run-once

 env:
@@ -193,6 +45,11 @@ env:
    - DB_NAME="ragnarok"
    - DB_USER="ragnarok"
    - DB_PASS="ragnarok"
+  matrix:
+    - 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
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -48,6 +48,8 @@ endmacro( CONFIGURE_WITH_LOCAL_OR_SYSTEM )


 add_subdirectory( libconfig )
+add_subdirectory( msinttypes )
+add_subdirectory( mt19937ar )
 add_subdirectory( mysql )
 add_subdirectory( pcre )
 add_subdirectory( zlib )
--- a/3rdparty/README.txt
+++ b/3rdparty/README.txt
@@ -2,6 +2,8 @@ This folder contains everything related to 3rdparty code or tools.

 cmake - scripts for the cmake build system (http://www.cmake.org)
 libconfig - library for processing structured configuration files (http://www.hyperrealm.com/libconfig/)
+msinttypes - standard headers missing from Microsoft Visual Studio (http://code.google.com/p/msinttypes)
+mt19937ar - code for Mersenne Twister pseudorandom number generator
 mysql - library for MySQL Community Server (http://www.mysql.com)
 pcre - library for Perl Compatible Regular Expressions (http://www.pcre.org)
 zlib - library for DEFLATE lossless compression algorithm (http://www.zlib.net)
--- a/3rdparty/cmake/tests/HAVE_TLS.c
+++ b/3rdparty/cmake/tests/HAVE_TLS.c
@@ -1,6 +0,0 @@
-__thread int tls;
-
-int main(int argc, char** argv)
-{
-	return 0;
-}
--- a/3rdparty/libconfig/libconfig.vcxproj
+++ b/3rdparty/libconfig/libconfig.vcxproj
@@ -38,31 +38,32 @@
    <ProjectGuid>{F6CC5F60-BD13-41B1-81D3-822A45EC0DBD}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>libconfig</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -106,7 +107,7 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
@@ -120,7 +121,7 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
--- a/3rdparty/msinttypes/CMakeLists.txt
+++ b/3rdparty/msinttypes/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+if( MSVC )
+find_path( MSINTTYPES_INCLUDE_DIRS "inttypes.h"
+	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
+	NO_DEFAULT_PATH )
+mark_as_advanced( MSINTTYPES_INCLUDE_DIRS )
+message( STATUS "Adding global include directory: ${MSINTTYPES_INCLUDE_DIRS}" )
+set_property( CACHE GLOBAL_INCLUDE_DIRS  PROPERTY VALUE ${GLOBAL_INCLUDE_DIRS} ${MSINTTYPES_INCLUDE_DIRS} )
+endif()
--- a/3rdparty/msinttypes/include/inttypes.h
+++ b/3rdparty/msinttypes/include/inttypes.h
@@ -0,0 +1,305 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include "stdint.h"
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+#endif // __STDC_FORMAT_MACROS ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+
+#endif // _MSC_INTTYPES_H_ ]
--- a/3rdparty/msinttypes/include/stdint.h
+++ b/3rdparty/msinttypes/include/stdint.h
@@ -0,0 +1,251 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2008 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifdef __cplusplus
+#if _MSC_VER < 1300
+extern "C++" {
+#else
+extern "C" {
+#endif
+#endif
+#  include <wchar.h>
+#ifdef __cplusplus
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]
--- a/3rdparty/mt19937ar/CMakeLists.txt
+++ b/3rdparty/mt19937ar/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+find_path( MT19937AR_INCLUDE_DIRS "mt19937ar.h"
+	PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
+	NO_DEFAULT_PATH )
+find_path( MT19937AR_SOURCE_DIR "mt19937ar.c"
+	PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
+	NO_DEFAULT_PATH )
+mark_as_advanced( MT19937AR_INCLUDE_DIRS )
+mark_as_advanced( MT19937AR_SOURCE_DIR )
+
+set( MT19937AR_HEADERS
+	"${CMAKE_CURRENT_SOURCE_DIR}/mt19937ar.h"
+	CACHE INTERNAL "mt19937ar headers" )
+set( MT19937AR_SOURCES
+	"${CMAKE_CURRENT_SOURCE_DIR}/mt19937ar.c"
+	CACHE INTERNAL "mt19937ar sources" )
--- a/3rdparty/mt19937ar/Makefile.in
+++ b/3rdparty/mt19937ar/Makefile.in
@@ -0,0 +1,26 @@
+
+MT19937AR_OBJ = mt19937ar.o
+MT19937AR_H = mt19937ar.h
+
+@SET_MAKE@
+
+#####################################################################
+.PHONY : all clean help
+
+all: $(MT19937AR_OBJ)
+
+clean:	
+	@echo "	CLEAN	mt19937ar"
+	@rm -rf *.o
+
+help:
+	@echo "possible targets are 'all' 'clean' 'help'"
+	@echo "'all'    - builds $(MT19937AR_OBJ)"
+	@echo "'clean'  - deletes $(MT19937AR_OBJ)"
+	@echo "'help'   - outputs this message"
+
+#####################################################################
+
+%.o: %.c $(MT19937AR_H)
+	@echo "	CC	$<"
+	@@CC@ @CFLAGS_AR@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
--- a/3rdparty/mt19937ar/mt19937ar.c
+++ b/3rdparty/mt19937ar/mt19937ar.c
@@ -0,0 +1,175 @@
+/* 
+   A C-program for MT19937, with initialization improved 2002/1/26.
+   Coded by Takuji Nishimura and Makoto Matsumoto.
+
+   Before using, initialize the state by using init_genrand(seed)  
+   or init_by_array(init_key, key_length).
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.                          
+   Copyright (C) 2005, Mutsuo Saito,
+   All rights reserved.                          
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote 
+        products derived from this software without specific prior written 
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+   Any feedback is very welcome.
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
+*/
+
+#include <stdio.h>
+#include "mt19937ar.h"
+
+/* Period parameters */  
+#define N 624
+#define M 397
+#define MATRIX_A 0x9908b0dfUL   /* constant vector a */
+#define UPPER_MASK 0x80000000UL /* most significant w-r bits */
+#define LOWER_MASK 0x7fffffffUL /* least significant r bits */
+
+static unsigned long mt[N]; /* the array for the state vector  */
+static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
+
+/* initializes mt[N] with a seed */
+void init_genrand(unsigned long s)
+{
+    mt[0]= s & 0xffffffffUL;
+    for (mti=1; mti<N; mti++) {
+        mt[mti] = 
+	    (1812433253UL * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti); 
+        /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
+        /* In the previous versions, MSBs of the seed affect   */
+        /* only MSBs of the array mt[].                        */
+        /* 2002/01/09 modified by Makoto Matsumoto             */
+        mt[mti] &= 0xffffffffUL;
+        /* for >32 bit machines */
+    }
+}
+
+/* initialize by an array with array-length */
+/* init_key is the array for initializing keys */
+/* key_length is its length */
+/* slight change for C++, 2004/2/26 */
+void init_by_array(unsigned long init_key[], int key_length)
+{
+    int i, j, k;
+    init_genrand(19650218UL);
+    i=1; j=0;
+    k = (N>key_length ? N : key_length);
+    for (; k; k--) {
+        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525UL))
+          + init_key[j] + j; /* non linear */
+        mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
+        i++; j++;
+        if (i>=N) { mt[0] = mt[N-1]; i=1; }
+        if (j>=key_length) j=0;
+    }
+    for (k=N-1; k; k--) {
+        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941UL))
+          - i; /* non linear */
+        mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
+        i++;
+        if (i>=N) { mt[0] = mt[N-1]; i=1; }
+    }
+
+    mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */ 
+}
+
+/* generates a random number on [0,0xffffffff]-interval */
+unsigned long genrand_int32(void)
+{
+    unsigned long y;
+    static unsigned long mag01[2]={0x0UL, MATRIX_A};
+    /* mag01[x] = x * MATRIX_A  for x=0,1 */
+
+    if (mti >= N) { /* generate N words at one time */
+        int kk;
+
+        if (mti == N+1)   /* if init_genrand() has not been called, */
+            init_genrand(5489UL); /* a default initial seed is used */
+
+        for (kk=0;kk<N-M;kk++) {
+            y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
+            mt[kk] = mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1UL];
+        }
+        for (;kk<N-1;kk++) {
+            y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
+            mt[kk] = mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1UL];
+        }
+        y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK);
+        mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL];
+
+        mti = 0;
+    }
+  
+    y = mt[mti++];
+
+    /* Tempering */
+    y ^= (y >> 11);
+    y ^= (y << 7) & 0x9d2c5680UL;
+    y ^= (y << 15) & 0xefc60000UL;
+    y ^= (y >> 18);
+
+    return y;
+}
+
+/* generates a random number on [0,0x7fffffff]-interval */
+long genrand_int31(void)
+{
+    return (long)(genrand_int32()>>1);
+}
+
+/* generates a random number on [0,1]-real-interval */
+double genrand_real1(void)
+{
+    return genrand_int32()*(1.0/4294967295.0); 
+    /* divided by 2^32-1 */ 
+}
+
+/* generates a random number on [0,1)-real-interval */
+double genrand_real2(void)
+{
+    return genrand_int32()*(1.0/4294967296.0); 
+    /* divided by 2^32 */
+}
+
+/* generates a random number on (0,1)-real-interval */
+double genrand_real3(void)
+{
+    return (((double)genrand_int32()) + 0.5)*(1.0/4294967296.0); 
+    /* divided by 2^32 */
+}
+
+/* generates a random number on [0,1) with 53-bit resolution*/
+double genrand_res53(void) 
+{ 
+    unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6; 
+    return(a*67108864.0+b)*(1.0/9007199254740992.0); 
+} 
+/* These real versions are due to Isaku Wada, 2002/01/09 added */
--- a/3rdparty/mt19937ar/mt19937ar.h
+++ b/3rdparty/mt19937ar/mt19937ar.h
@@ -0,0 +1,82 @@
+#pragma once
+
+/* 
+   A C-program for MT19937, with initialization improved 2002/1/26.
+   Coded by Takuji Nishimura and Makoto Matsumoto.
+
+   Before using, initialize the state by using init_genrand(seed)  
+   or init_by_array(init_key, key_length).
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.
+   Copyright (C) 2005, Mutsuo Saito
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote 
+        products derived from this software without specific prior written 
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+   Any feedback is very welcome.
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
+*/
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* initializes mt[N] with a seed */
+void init_genrand(unsigned long s);
+
+/* initialize by an array with array-length */
+/* init_key is the array for initializing keys */
+/* key_length is its length */
+/* slight change for C++, 2004/2/26 */
+void init_by_array(unsigned long init_key[], int key_length);
+
+/* generates a random number on [0,0xffffffff]-interval */
+unsigned long genrand_int32(void);
+
+/* generates a random number on [0,0x7fffffff]-interval */
+long genrand_int31(void);
+
+/* These real versions are due to Isaku Wada, 2002/01/09 added */
+/* generates a random number on [0,1]-real-interval */
+double genrand_real1(void);
+
+/* generates a random number on [0,1)-real-interval */
+double genrand_real2(void);
+
+/* generates a random number on (0,1)-real-interval */
+double genrand_real3(void);
+
+/* generates a random number on [0,1) with 53-bit resolution*/
+double genrand_res53(void);
+
+#ifdef	__cplusplus
+}
+#endif
--- a/3rdparty/mt19937ar/mt19937ar.out
+++ b/3rdparty/mt19937ar/mt19937ar.out
@@ -0,0 +1,403 @@
+1000 outputs of genrand_int32()
+1067595299  955945823  477289528 4107218783 4228976476 
+3344332714 3355579695  227628506  810200273 2591290167 
+2560260675 3242736208  646746669 1479517882 4245472273 
+1143372638 3863670494 3221021970 1773610557 1138697238 
+1421897700 1269916527 2859934041 1764463362 3874892047 
+3965319921   72549643 2383988930 2600218693 3237492380 
+2792901476  725331109  605841842  271258942  715137098 
+3297999536 1322965544 4229579109 1395091102 3735697720 
+2101727825 3730287744 2950434330 1661921839 2895579582 
+2370511479 1004092106 2247096681 2111242379 3237345263 
+4082424759  219785033 2454039889 3709582971  835606218 
+2411949883 2735205030  756421180 2175209704 1873865952 
+2762534237 4161807854 3351099340  181129879 3269891896 
+ 776029799 2218161979 3001745796 1866825872 2133627728 
+  34862734 1191934573 3102311354 2916517763 1012402762 
+2184831317 4257399449 2899497138 3818095062 3030756734 
+1282161629  420003642 2326421477 2741455717 1278020671 
+3744179621  271777016 2626330018 2560563991 3055977700 
+4233527566 1228397661 3595579322 1077915006 2395931898 
+1851927286 3013683506 1999971931 3006888962 1049781534 
+1488758959 3491776230  104418065 2448267297 3075614115 
+3872332600  891912190 3936547759 2269180963 2633455084 
+1047636807 2604612377 2709305729 1952216715  207593580 
+2849898034  670771757 2210471108  467711165  263046873 
+3569667915 1042291111 3863517079 1464270005 2758321352 
+3790799816 2301278724 3106281430    7974801 2792461636 
+ 555991332  621766759 1322453093  853629228  686962251 
+1455120532  957753161 1802033300 1021534190 3486047311 
+1902128914 3701138056 4176424663 1795608698  560858864 
+3737752754 3141170998 1553553385 3367807274  711546358 
+2475125503  262969859  251416325 2980076994 1806565895 
+ 969527843 3529327173 2736343040 2987196734 1649016367 
+2206175811 3048174801 3662503553 3138851612 2660143804 
+1663017612 1816683231  411916003 3887461314 2347044079 
+1015311755 1203592432 2170947766 2569420716  813872093 
+1105387678 1431142475  220570551 4243632715 4179591855 
+2607469131 3090613241  282341803 1734241730 1391822177 
+1001254810  827927915 1886687171 3935097347 2631788714 
+3905163266  110554195 2447955646 3717202975 3304793075 
+3739614479 3059127468  953919171 2590123714 1132511021 
+3795593679 2788030429  982155079 3472349556  859942552 
+2681007391 2299624053  647443547  233600422  608168955 
+3689327453 1849778220 1608438222 3968158357 2692977776 
+2851872572  246750393 3582818628 3329652309 4036366910 
+1012970930  950780808 3959768744 2538550045  191422718 
+2658142375 3276369011 2927737484 1234200027 1920815603 
+3536074689 1535612501 2184142071 3276955054  428488088 
+2378411984 4059769550 3913744741 2732139246   64369859 
+3755670074  842839565 2819894466 2414718973 1010060670 
+1839715346 2410311136  152774329 3485009480 4102101512 
+2852724304  879944024 1785007662 2748284463 1354768064 
+3267784736 2269127717 3001240761 3179796763  895723219 
+ 865924942 4291570937   89355264 1471026971 4114180745 
+3201939751 2867476999 2460866060 3603874571 2238880432 
+3308416168 2072246611 2755653839 3773737248 1709066580 
+4282731467 2746170170 2832568330  433439009 3175778732 
+  26248366 2551382801  183214346 3893339516 1928168445 
+1337157619 3429096554 3275170900 1782047316 4264403756 
+1876594403 4289659572 3223834894 1728705513 4068244734 
+2867840287 1147798696  302879820 1730407747 1923824407 
+1180597908 1569786639  198796327  560793173 2107345620 
+2705990316 3448772106 3678374155  758635715  884524671 
+ 486356516 1774865603 3881226226 2635213607 1181121587 
+1508809820 3178988241 1594193633 1235154121  326117244 
+2304031425  937054774 2687415945 3192389340 2003740439 
+1823766188 2759543402   10067710 1533252662 4132494984 
+  82378136  420615890 3467563163  541562091 3535949864 
+2277319197 3330822853 3215654174 4113831979 4204996991 
+2162248333 3255093522 2219088909 2978279037  255818579 
+2859348628 3097280311 2569721123 1861951120 2907080079 
+2719467166  998319094 2521935127 2404125338  259456032 
+2086860995 1839848496 1893547357 2527997525 1489393124 
+2860855349   76448234 2264934035  744914583 2586791259 
+1385380501   66529922 1819103258 1899300332 2098173828 
+1793831094  276463159  360132945 4178212058  595015228 
+ 177071838 2800080290 1573557746 1548998935  378454223 
+1460534296 1116274283 3112385063 3709761796  827999348 
+3580042847 1913901014  614021289 4278528023 1905177404 
+  45407939 3298183234 1184848810 3644926330 3923635459 
+1627046213 3677876759  969772772 1160524753 1522441192 
+ 452369933 1527502551  832490847 1003299676 1071381111 
+2891255476  973747308 4086897108 1847554542 3895651598 
+2227820339 1621250941 2881344691 3583565821 3510404498 
+ 849362119  862871471  797858058 2867774932 2821282612 
+3272403146 3997979905  209178708 1805135652    6783381 
+2823361423  792580494 4263749770  776439581 3798193823 
+2853444094 2729507474 1071873341 1329010206 1289336450 
+3327680758 2011491779   80157208  922428856 1158943220 
+1667230961 2461022820 2608845159  387516115 3345351910 
+1495629111 4098154157 3156649613 3525698599 4134908037 
+ 446713264 2137537399 3617403512  813966752 1157943946 
+3734692965 1680301658 3180398473 3509854711 2228114612 
+1008102291  486805123  863791847 3189125290 1050308116 
+3777341526 4291726501  844061465 1347461791 2826481581 
+ 745465012 2055805750 4260209475 2386693097 2980646741 
+ 447229436 2077782664 1232942813 4023002732 1399011509 
+3140569849 2579909222 3794857471  900758066 2887199683 
+1720257997 3367494931 2668921229  955539029 3818726432 
+1105704962 3889207255 2277369307 2746484505 1761846513 
+2413916784 2685127085 4240257943 1166726899 4215215715 
+3082092067 3960461946 1663304043 2087473241 4162589986 
+2507310778 1579665506  767234210  970676017  492207530 
+1441679602 1314785090 3262202570 3417091742 1561989210 
+3011406780 1146609202 3262321040 1374872171 1634688712 
+1280458888 2230023982  419323804 3262899800   39783310 
+1641619040 1700368658 2207946628 2571300939 2424079766 
+ 780290914 2715195096 3390957695  163151474 2309534542 
+1860018424  555755123  280320104 1604831083 2713022383 
+1728987441 3639955502  623065489 3828630947 4275479050 
+3516347383 2343951195 2430677756  635534992 3868699749 
+ 808442435 3070644069 4282166003 2093181383 2023555632 
+1568662086 3422372620 4134522350 3016979543 3259320234 
+2888030729 3185253876 4258779643 1267304371 1022517473 
+ 815943045  929020012 2995251018 3371283296 3608029049 
+2018485115  122123397 2810669150 1411365618 1238391329 
+1186786476 3155969091 2242941310 1765554882  279121160 
+4279838515 1641578514 3796324015   13351065  103516986 
+1609694427  551411743 2493771609 1316337047 3932650856 
+4189700203  463397996 2937735066 1855616529 2626847990 
+  55091862 3823351211  753448970 4045045500 1274127772 
+1124182256   92039808 2126345552  425973257  386287896 
+2589870191 1987762798 4084826973 2172456685 3366583455 
+3602966653 2378803535 2901764433 3716929006 3710159000 
+2653449155 3469742630 3096444476 3932564653 2595257433 
+ 318974657 3146202484  853571438  144400272 3768408841 
+ 782634401 2161109003  570039522 1886241521   14249488 
+2230804228 1604941699 3928713335 3921942509 2155806892 
+ 134366254  430507376 1924011722  276713377  196481886 
+3614810992 1610021185 1785757066  851346168 3761148643 
+2918835642 3364422385 3012284466 3735958851 2643153892 
+3778608231 1164289832  205853021 2876112231 3503398282 
+3078397001 3472037921 1748894853 2740861475  316056182 
+1660426908  168885906  956005527 3984354789  566521563 
+1001109523 1216710575 2952284757 3834433081 3842608301 
+2467352408 3974441264 3256601745 1409353924 1329904859 
+2307560293 3125217879 3622920184 3832785684 3882365951 
+2308537115 2659155028 1450441945 3532257603 3186324194 
+1225603425 1124246549  175808705 3009142319 2796710159 
+3651990107  160762750 1902254979 1698648476 1134980669 
+ 497144426 3302689335 4057485630 3603530763 4087252587 
+ 427812652  286876201  823134128 1627554964 3745564327 
+2589226092 4202024494   62878473 3275585894 3987124064 
+2791777159 1916869511 2585861905 1375038919 1403421920 
+  60249114 3811870450 3021498009 2612993202  528933105 
+2757361321 3341402964 2621861700  273128190 4015252178 
+3094781002 1621621288 2337611177 1796718448 1258965619 
+4241913140 2138560392 3022190223 4174180924  450094611 
+3274724580  617150026 2704660665 1469700689 1341616587 
+ 356715071 1188789960 2278869135 1766569160 2795896635 
+  57824704 2893496380 1235723989 1630694347 3927960522 
+ 428891364 1814070806 2287999787 4125941184 3968103889 
+3548724050 1025597707 1404281500 2002212197   92429143 
+2313943944 2403086080 3006180634 3561981764 1671860914 
+1768520622 1803542985  844848113 3006139921 1410888995 
+1157749833 2125704913 1789979528 1799263423  741157179 
+2405862309  767040434 2655241390 3663420179 2172009096 
+2511931187 1680542666  231857466 1154981000  157168255 
+1454112128 3505872099 1929775046 2309422350 2143329496 
+2960716902  407610648 2938108129 2581749599  538837155 
+2342628867  430543915  740188568 1937713272 3315215132 
+2085587024 4030765687  766054429 3517641839  689721775 
+1294158986 1753287754 4202601348 1974852792   33459103 
+3568087535 3144677435 1686130825 4134943013 3005738435 
+3599293386  426570142  754104406 3660892564 1964545167 
+ 829466833  821587464 1746693036 1006492428 1595312919 
+1256599985 1024482560 1897312280 2902903201  691790057 
+1037515867 3176831208 1968401055 2173506824 1089055278 
+1748401123 2941380082  968412354 1818753861 2973200866 
+3875951774 1119354008 3988604139 1647155589 2232450826 
+3486058011 3655784043 3759258462  847163678 1082052057 
+ 989516446 2871541755 3196311070 3929963078  658187585 
+3664944641 2175149170 2203709147 2756014689 2456473919 
+3890267390 1293787864 2830347984 3059280931 4158802520 
+1561677400 2586570938  783570352 1355506163   31495586 
+3789437343 3340549429 2092501630  896419368  671715824 
+3530450081 3603554138 1055991716 3442308219 1499434728 
+3130288473 3639507000   17769680 2259741420  487032199 
+4227143402 3693771256 1880482820 3924810796  381462353 
+4017855991 2452034943 2736680833 2209866385 2128986379 
+ 437874044  595759426  641721026 1636065708 3899136933 
+ 629879088 3591174506  351984326 2638783544 2348444281 
+2341604660 2123933692  143443325 1525942256  364660499 
+ 599149312  939093251 1523003209  106601097  376589484 
+1346282236 1297387043  764598052 3741218111  933457002 
+1886424424 3219631016  525405256 3014235619  323149677 
+2038881721 4100129043 2851715101 2984028078 1888574695 
+2014194741 3515193880 4180573530 3461824363 2641995497 
+3179230245 2902294983 2217320456 4040852155 1784656905 
+3311906931   87498458 2752971818 2635474297 2831215366 
+3682231106 2920043893 3772929704 2816374944  309949752 
+2383758854  154870719  385111597 1191604312 1840700563 
+ 872191186 2925548701 1310412747 2102066999 1504727249 
+3574298750 1191230036 3330575266 3180292097 3539347721 
+ 681369118 3305125752 3648233597  950049240 4173257693 
+1760124957  512151405  681175196  580563018 1169662867 
+4015033554 2687781101  699691603 2673494188 1137221356 
+ 123599888  472658308 1053598179 1012713758 3481064843 
+3759461013 3981457956 3830587662 1877191791 3650996736 
+ 988064871 3515461600 4089077232 2225147448 1249609188 
+2643151863 3896204135 2416995901 1397735321 3460025646 
+
+1000 outputs of genrand_real2()
+0.76275443 0.99000644 0.98670464 0.10143112 0.27933125 
+0.69867227 0.94218740 0.03427201 0.78842173 0.28180608 
+0.92179002 0.20785655 0.54534773 0.69644020 0.38107718 
+0.23978165 0.65286910 0.07514568 0.22765211 0.94872929 
+0.74557914 0.62664415 0.54708246 0.90959343 0.42043116 
+0.86334511 0.19189126 0.14718544 0.70259889 0.63426346 
+0.77408121 0.04531601 0.04605807 0.88595519 0.69398270 
+0.05377184 0.61711170 0.05565708 0.10133577 0.41500776 
+0.91810699 0.22320679 0.23353705 0.92871862 0.98897234 
+0.19786706 0.80558809 0.06961067 0.55840445 0.90479405 
+0.63288060 0.95009721 0.54948447 0.20645042 0.45000959 
+0.87050869 0.70806991 0.19406895 0.79286390 0.49332866 
+0.78483914 0.75145146 0.12341941 0.42030252 0.16728160 
+0.59906494 0.37575460 0.97815160 0.39815952 0.43595080 
+0.04952478 0.33917805 0.76509902 0.61034321 0.90654701 
+0.92915732 0.85365931 0.18812377 0.65913428 0.28814566 
+0.59476081 0.27835931 0.60722542 0.68310435 0.69387186 
+0.03699800 0.65897714 0.17527003 0.02889304 0.86777366 
+0.12352068 0.91439461 0.32022990 0.44445731 0.34903686 
+0.74639273 0.65918367 0.92492794 0.31872642 0.77749724 
+0.85413832 0.76385624 0.32744211 0.91326300 0.27458185 
+0.22190155 0.19865383 0.31227402 0.85321225 0.84243342 
+0.78544200 0.71854080 0.92503892 0.82703064 0.88306297 
+0.47284073 0.70059042 0.48003761 0.38671694 0.60465770 
+0.41747204 0.47163243 0.72750808 0.65830223 0.10955369 
+0.64215401 0.23456345 0.95944940 0.72822249 0.40888451 
+0.69980355 0.26677428 0.57333635 0.39791582 0.85377858 
+0.76962816 0.72004885 0.90903087 0.51376506 0.37732665 
+0.12691640 0.71249738 0.81217908 0.37037313 0.32772374 
+0.14238259 0.05614811 0.74363008 0.39773267 0.94859135 
+0.31452454 0.11730313 0.62962618 0.33334237 0.45547255 
+0.10089665 0.56550662 0.60539371 0.16027624 0.13245301 
+0.60959939 0.04671662 0.99356286 0.57660859 0.40269560 
+0.45274629 0.06699735 0.85064246 0.87742744 0.54508392 
+0.87242982 0.29321385 0.67660627 0.68230715 0.79052073 
+0.48592054 0.25186266 0.93769755 0.28565487 0.47219067 
+0.99054882 0.13155240 0.47110470 0.98556600 0.84397623 
+0.12875246 0.90953202 0.49129015 0.23792727 0.79481194 
+0.44337770 0.96564297 0.67749118 0.55684872 0.27286897 
+0.79538393 0.61965356 0.22487929 0.02226018 0.49248200 
+0.42247006 0.91797788 0.99250134 0.23449967 0.52531508 
+0.10246337 0.78685622 0.34310922 0.89892996 0.40454552 
+0.68608407 0.30752487 0.83601319 0.54956031 0.63777550 
+0.82199797 0.24890696 0.48801123 0.48661910 0.51223987 
+0.32969635 0.31075073 0.21393155 0.73453207 0.15565705 
+0.58584522 0.28976728 0.97621478 0.61498701 0.23891470 
+0.28518540 0.46809591 0.18371914 0.37597910 0.13492176 
+0.66849449 0.82811466 0.56240330 0.37548956 0.27562998 
+0.27521910 0.74096121 0.77176757 0.13748143 0.99747138 
+0.92504502 0.09175241 0.21389176 0.21766512 0.31183245 
+0.23271221 0.21207367 0.57903312 0.77523344 0.13242613 
+0.31037988 0.01204835 0.71652949 0.84487594 0.14982178 
+0.57423142 0.45677888 0.48420169 0.53465428 0.52667473 
+0.46880526 0.49849733 0.05670710 0.79022476 0.03872047 
+0.21697212 0.20443086 0.28949326 0.81678186 0.87629474 
+0.92297064 0.27373097 0.84625273 0.51505586 0.00582792 
+0.33295971 0.91848412 0.92537226 0.91760033 0.07541125 
+0.71745848 0.61158698 0.00941650 0.03135554 0.71527471 
+0.24821915 0.63636652 0.86159918 0.26450229 0.60160194 
+0.35557725 0.24477500 0.07186456 0.51757096 0.62120362 
+0.97981062 0.69954667 0.21065616 0.13382753 0.27693186 
+0.59644095 0.71500764 0.04110751 0.95730081 0.91600724 
+0.47704678 0.26183479 0.34706971 0.07545431 0.29398385 
+0.93236070 0.60486023 0.48015011 0.08870451 0.45548581 
+0.91872718 0.38142712 0.10668643 0.01397541 0.04520355 
+0.93822273 0.18011940 0.57577277 0.91427606 0.30911399 
+0.95853475 0.23611214 0.69619891 0.69601980 0.76765372 
+0.58515930 0.49479057 0.11288752 0.97187699 0.32095365 
+0.57563608 0.40760618 0.78703383 0.43261152 0.90877651 
+0.84686346 0.10599030 0.72872803 0.19315490 0.66152912 
+0.10210518 0.06257876 0.47950688 0.47062066 0.72701157 
+0.48915116 0.66110261 0.60170685 0.24516994 0.12726050 
+0.03451185 0.90864994 0.83494878 0.94800035 0.91035206 
+0.14480751 0.88458997 0.53498312 0.15963215 0.55378627 
+0.35171349 0.28719791 0.09097957 0.00667896 0.32309622 
+0.87561479 0.42534520 0.91748977 0.73908457 0.41793223 
+0.99279792 0.87908370 0.28458072 0.59132853 0.98672190 
+0.28547393 0.09452165 0.89910674 0.53681109 0.37931425 
+0.62683489 0.56609740 0.24801549 0.52948179 0.98328855 
+0.66403523 0.55523786 0.75886666 0.84784685 0.86829981 
+0.71448906 0.84670080 0.43922919 0.20771016 0.64157936 
+0.25664246 0.73055695 0.86395782 0.65852932 0.99061803 
+0.40280575 0.39146298 0.07291005 0.97200603 0.20555729 
+0.59616495 0.08138254 0.45796388 0.33681125 0.33989127 
+0.18717090 0.53545811 0.60550838 0.86520709 0.34290701 
+0.72743276 0.73023855 0.34195926 0.65019733 0.02765254 
+0.72575740 0.32709576 0.03420866 0.26061893 0.56997511 
+0.28439072 0.84422744 0.77637570 0.55982168 0.06720327 
+0.58449067 0.71657369 0.15819609 0.58042821 0.07947911 
+0.40193792 0.11376012 0.88762938 0.67532159 0.71223735 
+0.27829114 0.04806073 0.21144026 0.58830274 0.04140071 
+0.43215628 0.12952729 0.94668759 0.87391019 0.98382450 
+0.27750768 0.90849647 0.90962737 0.59269720 0.96102026 
+0.49544979 0.32007095 0.62585546 0.03119821 0.85953001 
+0.22017528 0.05834068 0.80731217 0.53799961 0.74166948 
+0.77426600 0.43938444 0.54862081 0.58575513 0.15886492 
+0.73214332 0.11649057 0.77463977 0.85788827 0.17061997 
+0.66838056 0.96076133 0.07949296 0.68521946 0.89986254 
+0.05667410 0.12741385 0.83470977 0.63969104 0.46612929 
+0.10200126 0.01194925 0.10476340 0.90285217 0.31221221 
+0.32980614 0.46041971 0.52024973 0.05425470 0.28330912 
+0.60426543 0.00598243 0.97244013 0.21135841 0.78561597 
+0.78428734 0.63422849 0.32909934 0.44771136 0.27380750 
+0.14966697 0.18156268 0.65686758 0.28726350 0.97074787 
+0.63676171 0.96649494 0.24526295 0.08297372 0.54257548 
+0.03166785 0.33735355 0.15946671 0.02102971 0.46228045 
+0.11892296 0.33408336 0.29875681 0.29847692 0.73767569 
+0.02080745 0.62980060 0.08082293 0.22993106 0.25031439 
+0.87787525 0.45150053 0.13673441 0.63407612 0.97907688 
+0.52241942 0.50580158 0.06273902 0.05270283 0.77031811 
+0.05113352 0.24393329 0.75036441 0.37436336 0.22877652 
+0.59975358 0.85707591 0.88691457 0.85547165 0.36641027 
+0.58720133 0.45462835 0.09243817 0.32981586 0.07820411 
+0.25421519 0.36004706 0.60092307 0.46192412 0.36758683 
+0.98424170 0.08019934 0.68594024 0.45826386 0.29962317 
+0.79365413 0.89231296 0.49478547 0.87645944 0.23590734 
+0.28106737 0.75026285 0.08136314 0.79582424 0.76010628 
+0.82792971 0.27947652 0.72482861 0.82191216 0.46171689 
+0.79189752 0.96043686 0.51609668 0.88995725 0.28998963 
+0.55191845 0.03934737 0.83033700 0.49553013 0.98009549 
+0.19017594 0.98347750 0.33452066 0.87144372 0.72106301 
+0.71272114 0.71465963 0.88361677 0.85571283 0.73782329 
+0.20920458 0.34855153 0.46766817 0.02780062 0.74898344 
+0.03680650 0.44866557 0.77426312 0.91025891 0.25195236 
+0.87319953 0.63265037 0.25552148 0.27422476 0.95217406 
+0.39281839 0.66441573 0.09158900 0.94515992 0.07800798 
+0.02507888 0.39901462 0.17382573 0.12141278 0.85502334 
+0.19902911 0.02160210 0.44460522 0.14688742 0.68020336 
+0.71323733 0.60922473 0.95400380 0.99611159 0.90897777 
+0.41073520 0.66206647 0.32064685 0.62805003 0.50677209 
+0.52690101 0.87473387 0.73918362 0.39826974 0.43683919 
+0.80459118 0.32422684 0.01958019 0.95319576 0.98326137 
+0.83931735 0.69060863 0.33671416 0.68062550 0.65152380 
+0.33392969 0.03451730 0.95227244 0.68200635 0.85074171 
+0.64721009 0.51234433 0.73402047 0.00969637 0.93835057 
+0.80803854 0.31485260 0.20089527 0.01323282 0.59933780 
+0.31584602 0.20209563 0.33754800 0.68604181 0.24443049 
+0.19952227 0.78162632 0.10336988 0.11360736 0.23536740 
+0.23262256 0.67803776 0.48749791 0.74658435 0.92156640 
+0.56706407 0.36683221 0.99157136 0.23421374 0.45183767 
+0.91609720 0.85573315 0.37706276 0.77042618 0.30891908 
+0.40709595 0.06944866 0.61342849 0.88817388 0.58734506 
+0.98711323 0.14744128 0.63242656 0.87704136 0.68347125 
+0.84446569 0.43265239 0.25146321 0.04130111 0.34259839 
+0.92697368 0.40878778 0.56990338 0.76204273 0.19820348 
+0.66314909 0.02482844 0.06669207 0.50205581 0.26084093 
+0.65139159 0.41650223 0.09733904 0.56344203 0.62651696 
+0.67332139 0.58037374 0.47258086 0.21010758 0.05713135 
+0.89390629 0.10781246 0.32037450 0.07628388 0.34227964 
+0.42190597 0.58201860 0.77363549 0.49595133 0.86031236 
+0.83906769 0.81098161 0.26694195 0.14215941 0.88210306 
+0.53634237 0.12090720 0.82480459 0.75930318 0.31847147 
+0.92768077 0.01037616 0.56201727 0.88107122 0.35925856 
+0.85860762 0.61109408 0.70408301 0.58434977 0.92192494 
+0.62667915 0.75988365 0.06858761 0.36156496 0.58057195 
+0.13636150 0.57719713 0.59340255 0.63530602 0.22976282 
+0.71915530 0.41162531 0.63979565 0.09931342 0.79344045 
+0.10893790 0.84450224 0.23122236 0.99485593 0.73637397 
+0.17276368 0.13357764 0.74965804 0.64991737 0.61990341 
+0.41523170 0.05878239 0.05687301 0.05497131 0.42868366 
+0.42571090 0.25810502 0.89642955 0.30439758 0.39310223 
+0.11357431 0.04288255 0.23397550 0.11200634 0.85621396 
+0.89733974 0.37508865 0.42077265 0.68597384 0.72781399 
+0.19296476 0.61699087 0.31667128 0.67756410 0.00177323 
+0.05725176 0.79474693 0.18885238 0.06724856 0.68193156 
+0.42202167 0.22082041 0.28554673 0.64995708 0.87851940 
+0.29124547 0.61009521 0.87374537 0.05743712 0.69902994 
+0.81925115 0.45653873 0.37236821 0.31118709 0.52734307 
+0.39672836 0.38185294 0.30163915 0.17374510 0.04913278 
+0.90404879 0.25742801 0.58266467 0.97663209 0.79823377 
+0.36437958 0.15206043 0.26529938 0.22690047 0.05839021 
+0.84721160 0.18622435 0.37809403 0.55706977 0.49828704 
+0.47659049 0.24289680 0.88477595 0.07807463 0.56245739 
+0.73490635 0.21099431 0.13164942 0.75840044 0.66877037 
+0.28988183 0.44046090 0.24967434 0.80048356 0.26029740 
+0.30416821 0.64151867 0.52067892 0.12880774 0.85465381 
+0.02690525 0.19149288 0.49630295 0.79682619 0.43566145 
+0.00288078 0.81484193 0.03763639 0.68529083 0.01339574 
+0.38405386 0.30537067 0.22994703 0.44000045 0.27217985 
+0.53831243 0.02870435 0.86282045 0.61831306 0.09164956 
+0.25609707 0.07445781 0.72185784 0.90058883 0.30070608 
+0.94476583 0.56822213 0.21933909 0.96772793 0.80063440 
+0.26307906 0.31183306 0.16501252 0.55436179 0.68562285 
+0.23829083 0.86511559 0.57868991 0.81888344 0.20126869 
+0.93172350 0.66028129 0.21786948 0.78515828 0.10262106 
+0.35390326 0.79303876 0.63427924 0.90479631 0.31024934 
+0.60635447 0.56198079 0.63573813 0.91854197 0.99701497 
+0.83085849 0.31692291 0.01925964 0.97446405 0.98751283 
+0.60944293 0.13751018 0.69519957 0.68956636 0.56969015 
+0.46440193 0.88341765 0.36754434 0.89223647 0.39786427 
+0.85055280 0.12749961 0.79452122 0.89449784 0.14567830 
+0.45716830 0.74822309 0.28200437 0.42546044 0.17464886 
+0.68308746 0.65496587 0.52935411 0.12736159 0.61523955 
+0.81590528 0.63107864 0.39786553 0.20102294 0.53292914 
+0.75485590 0.59847044 0.32861691 0.12125866 0.58917183 
+0.07638293 0.86845380 0.29192617 0.03989733 0.52180460 
+0.32503407 0.64071852 0.69516575 0.74254998 0.54587026 
+0.48713246 0.32920155 0.08719954 0.63497059 0.54328459 
+0.64178757 0.45583809 0.70694291 0.85212760 0.86074305 
+0.33163422 0.85739792 0.59908488 0.74566046 0.72157152 
--- a/3rdparty/mt19937ar/mt19937ar.vcxproj
+++ b/3rdparty/mt19937ar/mt19937ar.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -18,35 +18,41 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="mt19937ar.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="mt19937ar.c" />
+  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CDBBB260-B245-44EC-80FB-3F9421885E40}</ProjectGuid>
+    <ProjectGuid>{7AE31676-6137-4FB3-AE9C-AD47D8A861CF}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>yaml2sql</RootNamespace>
+    <RootNamespace>mt19937ar</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -67,23 +73,19 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)</OutDir>
-    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)</OutDir>
+    <OutDir>$(SolutionDir).vs\build\</OutDir>
    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)</OutDir>
+    <OutDir>$(SolutionDir).vs\build\</OutDir>
+    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir).vs\build\</OutDir>
    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)</OutDir>
+    <OutDir>$(SolutionDir).vs\build\</OutDir>
    <IntDir>$(SolutionDir).vs\build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -92,14 +94,12 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>$(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(DefineConstants);WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common-minicore.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -108,14 +108,12 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>$(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;_DEBUG;_CONSOLE;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(DefineConstants);WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common-minicore.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -126,16 +124,14 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(DefineConstants);WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common-minicore.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -146,32 +142,17 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(DefineConstants);WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBCONFIG_STATIC;YY_USE_CONST;MINICORE;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(DefineConstants);WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;$(SolutionDir).vs\build\common-minicore.lib;$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.lib;$(SolutionDir).vs\build\yaml-cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="yaml2sql.cpp" />
-  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-  <Target Name="AfterClean">
-    <Delete Files="$(SolutionDir)zlib.dll" ContinueOnError="true" />
-    <Delete Files="$(SolutionDir)serv.bat" ContinueOnError="true" />
-    <Delete Files="$(SolutionDir)yaml2sql.bat" ContinueOnError="true" />
-  </Target>
-  <Target Name="AfterBuild">
-    <Copy SourceFiles="$(SolutionDir)3rdparty\zlib\lib\$(Platform)\zlib.dll" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)zlib.dll')" />
-    <Copy SourceFiles="$(SolutionDir)tools\serv.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)serv.bat')" />
-    <Copy SourceFiles="$(SolutionDir)tools\yaml2sql.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)yaml2sql.bat')" />
-  </Target>
 </Project>
--- a/3rdparty/mt19937ar/mt19937ar.vcxproj.filters
+++ b/3rdparty/mt19937ar/mt19937ar.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
@@ -11,7 +11,12 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="yaml2sql.cpp">
+    <ClInclude Include="mt19937ar.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="mt19937ar.c">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
--- a/3rdparty/mt19937ar/mtTest.c
+++ b/3rdparty/mt19937ar/mtTest.c
@@ -0,0 +1,65 @@
+/* 
+   A C-program for MT19937, with initialization improved 2002/1/26.
+   Coded by Takuji Nishimura and Makoto Matsumoto.
+
+   Before using, initialize the state by using init_genrand(seed)  
+   or init_by_array(init_key, key_length).
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.
+   Copyright (C) 2005, Mutsuo Saito,
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote 
+        products derived from this software without specific prior written 
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+   Any feedback is very welcome.
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
+*/
+
+#include <stdio.h>
+#include "mt19937ar.h"
+
+int main(void)
+{
+    int i;
+    unsigned long init[4]={0x123, 0x234, 0x345, 0x456}, length=4;
+    init_by_array(init, length);
+    printf("1000 outputs of genrand_int32()\n");
+    for (i=0; i<1000; i++) {
+      printf("%10lu ", genrand_int32());
+      if (i%5==4) printf("\n");
+    }
+    printf("\n1000 outputs of genrand_real2()\n");
+    for (i=0; i<1000; i++) {
+      printf("%10.8f ", genrand_real2());
+      if (i%5==4) printf("\n");
+    }
+    return 0;
+}
--- a/3rdparty/mt19937ar/readme-mt.txt
+++ b/3rdparty/mt19937ar/readme-mt.txt
@@ -0,0 +1,79 @@
+This is a Mersenne Twister pseudorandom number generator
+with period 2^19937-1 with improved initialization scheme,
+modified on 2002/1/26 by Takuji Nishimura and Makoto Matsumoto. 
+modified on 2005/4/26 by Mutsuo Saito
+
+Contents of this tar ball:
+readme-mt.txt	 this file
+mt19937ar.c	 the C source (ar: initialize by ARray)
+mt19937ar.h      the C header file for mt19937ar
+mtTest.c         the C test main program of mt19937ar.c
+mt19937ar.out	 Test outputs of six types generators. 1000 for each
+
+1. Initialization
+  The initialization scheme for the previous versions of MT
+(e.g. 1999/10/28 version or earlier) has a tiny problem, that
+the most significant bits of the seed is not well reflected 
+to the state vector of MT.
+
+This version (2002/1/26) has two initialization schemes:
+init_genrand(seed) and init_by_array(init_key, key_length).
+
+init_genrand(seed) initializes the state vector by using
+one unsigned 32-bit integer "seed", which may be zero.
+
+init_by_array(init_key, key_length) initializes the state vector 
+by using an array init_key[] of unsigned 32-bit integers
+of length key_kength. If key_length is smaller than 624,
+then each array of 32-bit integers gives distinct initial
+state vector. This is useful if you want a larger seed space
+than 32-bit word.
+
+2. Generation
+After initialization, the following type of pseudorandom numbers
+are available. 
+
+genrand_int32() generates unsigned 32-bit integers.
+genrand_int31() generates unsigned 31-bit integers.
+genrand_real1() generates uniform real in [0,1] (32-bit resolution). 
+genrand_real2() generates uniform real in [0,1) (32-bit resolution). 
+genrand_real3() generates uniform real in (0,1) (32-bit resolution).
+genrand_res53() generates uniform real in [0,1) with 53-bit resolution.
+
+Note: the last five functions call the first one. 
+if you need more speed for these five functions, you may
+suppress the function call by copying genrand_int32() and
+replacing the last return(), following to these five functions.
+
+3. main()
+main() is an example to initialize with an array of length 4,
+then 1000 outputs of unsigned 32-bit integers, 
+then 1000 outputs of real [0,1) numbers. 
+
+4. The outputs
+The output of the mt19937ar.c is in the file mt19937ar.out.
+If you revise or translate the code, check the output
+by using this file. 
+
+5. Cryptography
+This generator is not cryptoraphically secure. 
+You need to use a one-way (or hash) function to obtain 
+a secure random sequence.
+
+6. Correspondence
+See:
+URL http://www.math.keio.ac.jp/matumoto/emt.html
+email matumoto@math.keio.ac.jp, nisimura@sci.kj.yamagata-u.ac.jp
+
+7. Reference
+M. Matsumoto and T. Nishimura,
+"Mersenne Twister: A 623-Dimensionally Equidistributed Uniform  
+Pseudo-Random Number Generator",
+ACM Transactions on Modeling and Computer Simulation,
+Vol. 8, No. 1, January 1998, pp 3--30.
+
+-------
+Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+All rights reserved.
+Copyright (C) 2005, Mutsuo Saito
+All rights reserved.
--- a/3rdparty/mysql/CMakeLists.txt
+++ b/3rdparty/mysql/CMakeLists.txt
@@ -7,17 +7,10 @@ message( STATUS "Detecting local MYSQL" )
 find_path( MYSQL_LOCAL_INCLUDE_DIRS "mysql.h"
 	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
 	NO_DEFAULT_PATH )
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
 find_library( MYSQL_LOCAL_LIBRARIES
 	NAMES libmysql
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib/Win32"
+	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib"
 	NO_DEFAULT_PATH )
-else()
-find_library( MYSQL_LOCAL_LIBRARIES
-	NAMES libmysql
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib/x64"
-	NO_DEFAULT_PATH )
-endif()
 mark_as_advanced( MYSQL_LOCAL_LIBRARIES )
 mark_as_advanced( MYSQL_LOCAL_INCLUDE_DIRS )

--- a/3rdparty/pcre/CMakeLists.txt
+++ b/3rdparty/pcre/CMakeLists.txt
@@ -7,17 +7,10 @@ message( STATUS "Detecting local PCRE" )
 find_path( PCRE_LOCAL_INCLUDE_DIRS "pcre.h"
 	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
 	NO_DEFAULT_PATH )
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
 find_library( PCRE_LOCAL_LIBRARIES
-	NAMES pcre8
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib/Win32"
+	NAMES pcre
+	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib"
 	NO_DEFAULT_PATH )
-else()
-find_library( PCRE_LOCAL_LIBRARIES
-	NAMES pcre8
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib/x64"
-	NO_DEFAULT_PATH )
-endif()
 mark_as_advanced( PCRE_LOCAL_LIBRARIES )
 mark_as_advanced( PCRE_LOCAL_INCLUDE_DIRS )

--- a/3rdparty/yaml-cpp/CMakeLists.txt
+++ b/3rdparty/yaml-cpp/CMakeLists.txt
@@ -79,5 +79,5 @@ set( YAML_DEFINITIONS
 	"-std=c++11"
 	CACHE INTERNAL "yaml definitions" )
 include_directories(${YAML_INCLUDE_DIRS} ${YAML_SOURCE_DIR})
-#message(STATUS "YAML_INCLUDE_DIRS : ${YAML_INCLUDE_DIRS}, YAML_SOURCE_DIR=${YAML_SOURCE_DIR}")
+message(STATUS "YAML_INCLUDE_DIRS : ${YAML_INCLUDE_DIRS}, YAML_SOURCE_DIR=${YAML_SOURCE_DIR}")
 ADD_LIBRARY(${this_target} STATIC ${YAML_SOURCES} )
--- a/3rdparty/yaml-cpp/yaml-cpp.vcxproj
+++ b/3rdparty/yaml-cpp/yaml-cpp.vcxproj
@@ -22,31 +22,32 @@
    <ProjectGuid>{61D6A599-6BED-4154-A9FC-40553BD972E0}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>yamlcpp</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -95,7 +96,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -107,7 +108,7 @@
      </SDLCheck>
      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\yaml-cpp\include\;$(SolutionDir)3rdparty\yaml-cpp\src\;</AdditionalIncludeDirectories>
      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/3rdparty/zlib/CMakeLists.txt
+++ b/3rdparty/zlib/CMakeLists.txt
@@ -7,17 +7,10 @@ message( STATUS "Detecting local ZLIB" )
 find_path( ZLIB_LOCAL_INCLUDE_DIRS "zlib.h"
 	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
 	NO_DEFAULT_PATH )
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
 find_library( ZLIB_LOCAL_LIBRARIES
-	NAMES zlib
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib/Win32"
+	NAMES zdll
+	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib"
 	NO_DEFAULT_PATH )
-else()
-find_library( ZLIB_LOCAL_LIBRARIES
-	NAMES zlib
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib/x64"
-	NO_DEFAULT_PATH )
-endif()
 mark_as_advanced( ZLIB_LOCAL_LIBRARIES )
 mark_as_advanced( ZLIB_LOCAL_INCLUDE_DIRS )

--- a/1
+++ b/1
@@ -227,7 +227,6 @@ Sirius_White
 sk
 SketchyPhoenix
 Skotlex
-SnakeDrak
 spamrat
 SPDFMember
 spira
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,23 +50,11 @@ endif()

 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/${suffixInstallStr})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/${suffixInstallStr})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..)
 set(CMAKE_C_CREATE_SHARED_LIBRARY)
 set(CMAKE_CXX_CREATE_SHARED_LIBRARY)
 set(CMAKE_DEBUG_POSTFIX "d")
 set(CMAKE_RELEASE_POSTFIX "r")
-
-# Set a default build type if none was specified
-set(default_build_type "Release")
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
-  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
-      STRING "Choose the type of build." FORCE)
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif()
-
 #
 # Prevent building in the source directory by default
 #
@@ -101,10 +89,6 @@ if( MSVC )
 	set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} "oldnames.lib" "ws2_32.lib" )
 	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" )
 endif()
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
-  set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -fno-strict-aliasing" )
-  #set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -O2" ); #need more test to enable this
-endif()


 #
@@ -118,7 +102,6 @@ include( CheckFunctionExists )
 include( FindFunctionLibrary )
 include( TestBigEndian )

-
 #
 # PACKETVER
 #
@@ -156,26 +139,15 @@ message( STATUS "Detecting threads library" )
 set( CMAKE_THREAD_PREFER_PTHREAD 1 )
 find_package(Threads REQUIRED)
 if( CMAKE_THREAD_LIBS_INIT )
-	message( STATUS "Adding global library: ${CMAKE_THREAD_LIBS_INIT}" )
+	message( STATUS "Adding global library: ${FUNCTION_FLOOR_LIBRARIES}" )
 	set_property( CACHE GLOBAL_LIBRARIES  PROPERTY VALUE ${GLOBAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
 endif()
 message( STATUS "Detecting threads library - done" )

-message( STATUS "Check if supporting Thread local storage (TLS)" )
-file( READ "${CMAKE_SOURCE_DIR}/3rdparty/cmake/tests/HAVE_TLS.c" _SOURCE )
-CHECK_C_SOURCE_RUNS( "${_SOURCE}" HAVE_TLS )
-if( HAVE_TLS )
-	message( STATUS "Check for TLS- yes" )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DHAVE_TLS" )
-else()
-	message( STATUS "Check for TLS - no" )
-endif()
-

 #
 # math library (FreeBSD/Linux/Solaris)
 #
-if( NOT WIN32 )
 message( STATUS "Detecting math library (m)" )
 CHECK_INCLUDE_FILE( math.h HAVE_MATH_H )
 if( NOT HAVE_MATH_H )
@@ -188,7 +160,6 @@ if( FUNCTION_FLOOR_LIBRARIES )
 	set_property( CACHE GLOBAL_LIBRARIES  PROPERTY VALUE ${GLOBAL_LIBRARIES} ${FUNCTION_FLOOR_LIBRARIES} )
 endif()
 message( STATUS "Detecting math library (m) - done" )
-endif()


 #
@@ -482,7 +453,10 @@ set( DEVELOPMENT_FILES
 	"${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
 	"${CMAKE_CURRENT_SOURCE_DIR}/configure"
 	"${CMAKE_CURRENT_SOURCE_DIR}/configure.in"
-	"${CMAKE_CURRENT_SOURCE_DIR}/rAthena.sln"
+	"${CMAKE_CURRENT_SOURCE_DIR}/rAthena-9.sln"
+	"${CMAKE_CURRENT_SOURCE_DIR}/rAthena-10.sln"
+	"${CMAKE_CURRENT_SOURCE_DIR}/rAthena-12.sln"
+	"${CMAKE_CURRENT_SOURCE_DIR}/rAthena-13.sln"
 	)
 set( DEVELOPMENT_DIRECTORIES
 	"3rdparty"
@@ -490,6 +464,8 @@ set( DEVELOPMENT_DIRECTORIES
 	"conf/msg_conf/import-tmpl"
 	"db/import-tmpl"
 	"src"
+	"vcproj-9"
+	"vcproj-10"
 	)
 set( RUNTIME_FILES
 	"${CMAKE_CURRENT_SOURCE_DIR}/athena-start"
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,10 +5,10 @@ OMAP=@OMAP@
 ifeq ($(HAVE_MYSQL),yes)
 	ALL_DEPENDS=server tools
 	SERVER_DEPENDS=common login char map import
-	COMMON_DEPENDS=libconfig yaml-cpp
-	LOGIN_DEPENDS=libconfig common
-	CHAR_DEPENDS=libconfig common yaml-cpp
-	MAP_DEPENDS=libconfig common yaml-cpp
+	COMMON_DEPENDS=mt19937ar libconfig yaml-cpp
+	LOGIN_DEPENDS=mt19937ar libconfig common
+	CHAR_DEPENDS=mt19937ar libconfig common yaml-cpp
+	MAP_DEPENDS=mt19937ar libconfig common yaml-cpp
 else
 	ALL_DEPENDS=needs_mysql
 	SERVER_DEPENDS=needs_mysql
@@ -22,6 +22,7 @@ endif
 #####################################################################
 .PHONY: all server sql \
 	common \
+	mt19937ar \
 	login \
 	char \
 	map \
@@ -49,6 +50,9 @@ char: $(CHAR_DEPENDS)
 map: $(MAP_DEPENDS)
 	@$(MAKE) -C src/map server

+mt19937ar:
+	@$(MAKE) -C 3rdparty/mt19937ar
+
 libconfig:
 	@$(MAKE) -C 3rdparty/libconfig

@@ -75,6 +79,7 @@ import:

 clean:
 	@$(MAKE) -C src/common $@
+	@$(MAKE) -C 3rdparty/mt19937ar $@
 	@$(MAKE) -C 3rdparty/libconfig $@
 	@$(MAKE) -C 3rdparty/yaml-cpp $@
 	@$(MAKE) -C src/login $@
@@ -86,6 +91,7 @@ help:
 	@echo "most common targets are 'all' 'server' 'conf' 'clean' 'help'"
 	@echo "possible targets are:"
 	@echo "'common'      - builds object files used for the three servers"
+	@echo "'mt19937ar'   - builds object file of Mersenne Twister MT19937"
 	@echo "'libconfig'   - builds object files of libconfig"
 	@echo "'yaml-cpp'    - builds object files of yaml-cpp"
 	@echo "'login'       - builds login server"
--- a/README.md
+++ b/README.md
@@ -1,72 +1,209 @@
-<img src="doc/logo.png" align="right" height="90" />
+rAthena
+=======

-# rAthena
-[![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena) [![Build status](https://ci.appveyor.com/api/projects/status/8574b8nlwd57loda/branch/master?svg=true)](https://ci.appveyor.com/project/rAthenaAPI/rathena/branch/master) [![Total alerts](https://img.shields.io/lgtm/alerts/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/alerts/) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/context:cpp) ![GitHub](https://img.shields.io/github/license/rathena/rathena.svg) ![GitHub repo size](https://img.shields.io/github/repo-size/rathena/rathena.svg)
-> rAthena is a collaborative software development project revolving around the creation of a robust massively multiplayer online role playing game (MMORPG) server package. Written in C, the program is very versatile and provides NPCs, warps and modifications. The project is jointly managed by a group of volunteers located around the world as well as a tremendous community providing QA and support. rAthena is a continuation of the eAthena project.
+Build Status: [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena) [![Build status](https://ci.appveyor.com/api/projects/status/8574b8nlwd57loda/branch/master?svg=true)](https://ci.appveyor.com/project/rAthenaAPI/rathena/branch/master)

-[Forum](https://rathena.org/board)|[Discord](https://rathena.org/discord)|[Wiki](https://github.com/rathena/rathena/wiki)|[FluxCP](https://github.com/rathena/FluxCP)|[Crowdfunding](https://rathena.org/board/crowdfunding/)|[Fork and Pull Request Q&A](https://rathena.org/board/topic/86913-pull-request-qa/)
--------|--------|--------|--------|--------|--------
+Table of Contents
+---------
+1. What is rAthena?
+2. Prerequisites
+3. Installation
+4. Troubleshooting
+5. Helpful Links
+6. More Documentation
+7. How to Contribute

-### Table of Contents
-1. [Prerequisites](#1-prerequisites)
-2. [Installation](#2-installation)
-3. [Troubleshooting](#3-troubleshooting)
-4. [More Documentation](#4-more-documentation)
-5. [How to Contribute](#5-how-to-contribute)
-6. [License](#6-license)
+1. What is rAthena?
+---------
+rAthena is a collaborative software development project revolving around the
+creation of a robust massively multiplayer online role playing game (MMORPG)
+server package. Written in C, the program is very versatile and provides NPCs,
+warps and modifications. The project is jointly managed by a group of volunteers
+located around the world as well as a tremendous community providing QA and
+support. rAthena is a continuation of the eAthena project.

-## 1. Prerequisites
-Before installing rAthena there are certain tools and applications you will need which
-differs between the varying operating systems available.
+2. Prerequisites
+---------
+Before installing rAthena there are certain tools and applications you will need.
+This differs between the varying operating systems available, so the following
+is broken down into Windows and Linux prerequisites.

-### Hardware
-Hardware Type | Minimum | Recommended
------|------|------
-CPU | 1 Core | 2 Cores
-RAM | 1 GB | 2 GB
-Disk Space | 300 MB | 500 MB
+* Windows
+	* MySQL ( http://www.mysql.com/downloads/mysql/ )
+	* MySQL Workbench ( http://www.mysql.com/downloads/workbench/ )
+	* MS Visual C++ ( http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express )
+	* TortoiseGIT ( http://code.google.com/p/tortoisegit/ )
+	* MSysGit ( http://msysgit.github.io/ or https://github.com/msysgit/git/releases )

-### Operating System & Preferred Compiler
-Operating System | Compiler
------|------
-Linux  | [gcc-5 or newer](https://www.gnu.org/software/gcc/gcc-5/) / [Make](https://www.gnu.org/software/make/)
-Windows | [MS Visual Studio 2013, 2015, 2017](https://www.visualstudio.com/downloads/)
+* Linux (names of packages may require specific version numbers on certain distributions)
+	* gcc
+	* g++
+	* make
+	* mysql
+	* mysql-devel
+	* mysql-server
+	* pcre-devel
+	* zlib-devel
+	* git

-### Required Applications
-Application | Name
------|------
-Database | [MySQL 5 or newer](https://www.mysql.com/downloads/) / [MariaDB 5 or newer](https://downloads.mariadb.org/)
-Git | [Windows](https://gitforwindows.org/) / [Linux](https://git-scm.com/download/linux)
+3. Installation 
+---------
+This section is a very brief set of installation instructions. For more concise guides
+relevant to your Operation System, please refer to the Wiki (links at the end of this file).

-### Optional Applications
-Application | Name
------|------
-Database | [MySQL Workbench 5 or newer](http://www.mysql.com/downloads/workbench/)
+* Windows
+	* Install prerequisites
+	* Create a folder to download rAthena into (e.g. C:\rAthena)
+	* Right click this folder and select "Git Clone"
+	* Paste the GitHub URL into the box:

-## 2. Installation 
+				https://github.com/rathena/rathena.git
+				
+	* Open MySQL Workbench and create an instance to connect to your MySQL Server
+	* Create a database (rathena), a user (rathena), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE)
+		and then login using the new user
+	* Use MySQL Workbench to run the .sql files in /sql-files/ on the new rathena database

-### Full Installation Instructions
-  * [Windows](https://github.com/rathena/rathena/wiki/Install-on-Windows)
-  * [CentOS](https://github.com/rathena/rathena/wiki/Install-on-Centos)
-  * [Debian](https://github.com/rathena/rathena/wiki/Install-on-Debian)
-  * [FreeBSD](https://github.com/rathena/rathena/wiki/Install-on-FreeBSD)
+* Linux
+	* Type:
+		* (For CentOS)

-## 3. Troubleshooting
+				yum install gcc g++ make mysql mysql-devel mysql-server pcre-devel zlib-devel git
+		* (For Debian)

+				apt-get install git make gcc g++ libmysqlclient-dev zlib1g-dev libpcre3-dev
+	* Type:
+
+				mysql_secure_installation
+	* Start your MySQL server
+	* Setup a MySQL user:
+
+				CREATE USER 'rathena'@'localhost' IDENTIFIED BY 'password';
+	* Assign permissions:
+
+				GRANT SELECT,INSERT,UPDATE,DELETE ON `rathena\_rag`.* TO 'rathena'@'localhost';
+	* Clone a GIT repository:
+
+				git clone https://github.com/rathena/rathena.git ~/rathena
+	* Insert SQL files:
+
+				mysql --user=root -p rathena_rag < trunk/sql-files/main.sql (and others)
+	* Configure and compile:
+
+				./configure && make clean && make server
+	* Configure and compile (for Centos 64 bit with Maria DB):
+
+				./configure --enable-64bit --with-MYSQL_LIBS=/usr/lib64/libmysqlclient.so && make clean && make server
+	* When you're ready, start the servers:
+
+				./athena-start start
+
+* Optional
+	* If you want to have your own forked version but still get updates from the main rAthena repository
+		* Fork this repository to your GitHub account
+		* List the current configured remote repository for your fork:
+		
+				git remote -v
+
+		* Specify a new remote upstream repository that will be synced with your fork:
+		
+				git remote add upstream https://github.com/rathena/rathena.git
+				
+		* Verify the new upstream repository you've specified for your fork:
+		
+				git remote -v
+				
+		* You should see the main rAthena repository as well as your forked repository
+		* Now, when you want to get updates from rAthena, simply do:
+		
+				git pull upstream master
+
+	* Remember that rAthena falls under [GNU GPLv3](https://github.com/rathena/rathena/blob/master/LICENSE).
+
+4. Troubleshooting
+---------
 If you're having problems with starting your server, the first thing you should
 do is check what's happening on your consoles. More often that not, all support issues
-can be solved simply by looking at the error messages given. Check out the [wiki](https://github.com/rathena/rathena/wiki)
-or [forums](https://rathena.org/forum) if you need more support on troubleshooting.
+can be solved simply by looking at the error messages given.

-## 4. More Documentation
+Examples:
+
+* You get an error on your map-server that looks something like this:
+
+			[Error]: npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in 
+				file 'npc/custom/jobmaster.txt', line '17'. Skipping line...
+				* w1=prontera,153,193,6 script
+				* w2=Job Master
+				* w3=123,{
+				* w4=
+
+    If you look at the error, it's telling you that you're missing (or have an extra) TAB.
+		This is easily fixed by looking at this part of the error:
+
+				* w1=prontera,153,193,6 script
+
+	If there was a TAB where it's supposed to be, that line would have prontera,153,193,6 at w1
+		and 'script' at w2. As there's a space instead of a TAB, the two sections are read as a
+		single parameter.
+
+* You have a default user/password warning similar to the following:
+
+			[Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED.
+			[Notice]: Please edit your 'login' table to create a proper inter-server user/pa
+			ssword (gender 'S')
+			[Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo
+			rt/map_conf.txt)
+
+    Relax. This is just indicating that you're using the default username and password. To
+		fix this, check over the part in the installation instructions relevant to the `login` table.
+	
+* Your map-server outputs the following:
+
+			[Error]: make_connection: connect failed (socket #2, error 10061: No connection
+			could be made because the target machine actively refused it.
+			)!
+
+    If this shows up on the map server, it generally means that there is no Char Server available
+		to accept the connection.
+
+
+
+5. Helpful Links
+---------
+* rAthena Forums
+	* https://rathena.org/
+
+* GIT Repository
+	* https://github.com/rathena/rathena
+
+* Full Installation Instructions
+	* [Windows](https://github.com/rathena/rathena/wiki/Install-on-Windows)
+	* [CentOS](https://github.com/rathena/rathena/wiki/Install-on-Centos)
+	* [Debian](https://github.com/rathena/rathena/wiki/Install-on-Debian)
+	* [FreeBSD](https://github.com/rathena/rathena/wiki/Install-on-FreeBSD)
+	
+* rAthena 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://github.com/rathena/rathena/wiki
+
+* Fork and Pull Request Q&A
+	https://rathena.org/board/topic/86913-pull-request-qa/
+
+
+6. More Documentation
+---------
 rAthena has a large collection of help files and sample NPC scripts located in the /doc/
 directory. These include detailed explanations of NPC script commands, atcommands (@),
 group permissions, item bonuses, and packet structures, among many other topics. We
 recommend that all users take the time to look over this directory before asking for
 assistance elsewhere.

-## 5. How to Contribute
+7. How to Contribute
+---------
 Details on how to contribute to rAthena can be found in [CONTRIBUTING.md](https://github.com/rathena/rathena/blob/master/.github/CONTRIBUTING.md)!
-
-## 6. License
-Copyright (c) rAthena Development Team - Licensed under [GNU General Public License v3.0](https://github.com/rathena/rathena/blob/master/LICENSE)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2015
+image: Visual Studio 2013
 # This is the default location, but we put it here for safety reasons, since we use it in our test script
 clone_folder: c:\projects\rathena
 # We do not need the git history for our integration tests
@@ -8,8 +8,10 @@ pull_requests:
  do_not_increment_build_number: true
 environment:
  matrix:
-  - Defines: "\"BUILDBOT\""
-  - Defines: "\"BUILDBOT;PRERE\""
+  - VisualStudioVersion: 14.0
+    Defines: "\"BUILDBOT\""
+  - VisualStudioVersion: 14.0
+    Defines: "\"BUILDBOT;PRERE\""
 platform:
  - Win32
  - x64
@@ -24,12 +26,8 @@ build_script:
 services: mysql
 test_script:
 - cmd: >-
-    rem ========================================================================
-    
    rem Set up the environment variables we need
    
-    rem ========================================================================
-    
    set DB_HOST=127.0.0.1
    
    set DB_ROOT=root
@@ -44,32 +42,66 @@ test_script:
    
    set MYSQL="C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe"
    
+    rem Setting creation
+    
    cd C:\projects\rathena
    
-    rem ========================================================================
+    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
    
-    rem ========================================================================
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% -e "CREATE DATABASE %DB_NAME%;"
    
-    call tools\ci\sql.bat
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\main.sql"
    
-    rem ========================================================================
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\logs.sql"
    
-    rem Activate all custom and test scripts
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db.sql"
    
-    rem ========================================================================
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_cash_db2.sql"
    
-    start /d tools\ci npc.bat
+    %MYSQL% -u %DB_ROOT% -p%DB_ROOTPW% %DB_NAME% -e "source sql-files\item_db.sql"
    
-    rem ========================================================================
+    %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
    
-    rem ========================================================================
-    
-    login-server.exe --run-once
-    
-    char-server.exe --run-once
-    
    map-server.exe --run-once
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ LOG_DIR="./log"
 print_start() {
 	#    more << EOF
 	echo "rAthena is starting..."
-	echo "            (c) 2021 rAthena Project"
+	echo "            (c) 2017 rAthena Project"
 	echo ""
 	echo ""
 	echo "checking..."
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -0,0 +1,71 @@
+/* Atcommands and charcommands configuration file */
+
+/* The symbol that will be used to recognize commands.
+You can set any one character except:
+ - control-characters (0x00-0x1f),
+ - '%' (party chat symbol)
+ - '$' (guild chat symbol)
+ - '/' (client commands symbol)
+atcommand_symbol represents @commands used locally.
+charcommand_symbol represents #commands used on other players.
+*/
+
+atcommand_symbol : "@"
+charcommand_symbol: "#"
+
+/* Command aliases
+You can define aliases for any command. Aliases work just like original
+command.
+Format is
+	<commandname>: ["<alias>", ...]
+*/
+
+aliases: {
+	mobinfo: ["monsterinfo", "mi"]
+	iteminfo: ["ii"]
+	time: ["date", "serverdate", "servertime"]
+	autotrade: ["at"]
+	help: ["h"]
+	jumpto: ["goto", "warpto"]
+	mount: ["mountpeco"]
+	who: ["whois"]
+	npctalk: ["npctalkc"]
+	gvgon: ["gpvpon"]
+	gvgoff: ["gpvpoff"]
+	jobchange: ["job"]
+	load: ["return"]
+	warp: ["rura", "mapmove"]
+	dye: ["ccolor"]
+	hairstyle: ["hstyle"]
+	haircolor: ["hcolor"]
+	monster: ["spawn"]
+	blvl: ["lvup", "blevel", "baselvl", "baselvup", "baselevel", "baselvlup"]
+	jlvl: ["jlevel", "joblvl", "joblvup", "joblevel", "joblvlup"]
+	glvl: ["glevel", "guildlvl", "guildlvup", "guildlevel", "guildlvlup"]
+	resetstat: ["streset"]
+	resetskill: ["skreset"]
+	allskill: ["allskills", "skillall", "skillsall"]
+	allstats: ["allstat", "statall", "statsall"]
+	ban: ["banish"]
+	unban: ["unbanish"]
+	unjail: ["discharge"]
+	homlevel: ["hlvl", "hlevel", "homlvl", "homlvup"]
+	homevolution: ["homevolve"]
+	mutearea: ["stfu"]
+	monsterignore: ["battleignore"]
+	raise: ["revive"]
+	kill: ["die"]
+	guildstorage: ["gstorage"]
+	accinfo: ["accountinfo"]
+	itemreset: ["clearinventory"]
+	channel: ["main"]
+	autoloottype: ["aloottype"]
+	cloneequip: ["eqclone"]
+	clonestat: ["stclone"]
+	reloadnpcfile: ["reloadnpc"]
+}
+
+/* Commands help file */
+help: {
+	@include "conf/help.txt"
+}
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -6,12 +6,11 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
 //--------------------------------------------------------------

 // Who should have a baseatk value (makes str affect damage)? (Note 3)
-enable_baseatk: 0x9
-enable_baseatk_renewal: 0x29F
+enable_baseatk: 9

 // Who can have perfect flee? (Note 3)
 enable_perfect_flee: 1
@@ -142,14 +141,6 @@ delay_battle_damage: yes
 //     skills should consume ammo when it's acquired via a card or plagiarize)
 arrow_decrement: 1

-// Should ammo be unequipped when unequipping a weapon?
-// Official behavior is "yes".
-ammo_unequip: yes
-
-// Should a suitable weapon be equipped when equipping ammo?
-// Official behavior is "yes".
-ammo_check_weapon: yes
-
 // Should the item script bonus 'Autospell' check for range/obstacles before casting?
 // Official behavior is "no", setting this to "yes" will make skills use their defined
 // range. For example, Sonic Blow requires a 2 cell distance before autocasting is allowed.
--- a/conf/battle/battleground.conf
+++ b/conf/battle/battleground.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // Melee damage adjustments (non skills) for Battleground maps (Note 2)
@@ -30,7 +30,3 @@ bg_flee_penalty: 20

 // Interval before updating the bg-member map mini-dots (milliseconds)
 bg_update_interval: 1000
-
-// Before a player is warped into a Battleground from the Battleground Queue,
-// check to see if the player's current map has MF_NOWARP.
-bgqueue_nowarp_mapflag: no
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -71,7 +71,9 @@ wedding_modifydisplay: no
 save_clothcolor: yes

 // Save body styles. (Note 1)
-save_body_style: yes
+// Note: Don't turn this on unless you know what your doing.
+// Sprites are not released officially.
+save_body_style: no

 // Do not display cloth colors for the wedding class?
 // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled
@@ -138,19 +140,3 @@ spawn_direction: no
 // kRO removed the packet and this re-enables the message.
 // Official: Disabled.
 mvp_exp_reward_message: no
-
-// Send ping timer
-// Interval in seconds for each timer invoke.
-ping_timer_inverval: 30
-
-// Send packets timeout in seconds before ping packet can be sent.
-ping_time: 20
-
-// Show skill scale for clients 2015-12-23 and newer? (Note 1)
-// Official: yes
-show_skill_scale: yes
-
-// Should the connection be dropped on server side after a player disconnection request was received? (Note 1)
-// Note: Enabling this is known to cause problems on clients that make use of REST API calls.
-// Official: no
-drop_connection_on_quit: no
--- a/conf/battle/drops.conf
+++ b/conf/battle/drops.conf
@@ -148,47 +148,3 @@ alchemist_summon_reward: 1
 // 333 = show announces for 3.33% or lower drop chance items
 // 10000 = show announces for all items
 rare_drop_announce: 0
-
-// Does autoloot take into account player bonuses and penalties? (Note 1)
-// If RENEWAL_DROP, Bubble Gum, or any other modifiers are active autoloot
-// will take them into account.
-autoloot_adjust: 0
-
-// Does autoloot work when a monster is killed by mercenary only?
-mercenary_autoloot: no
-
-// Is getting items from a mercenary disabled when their master's idle?
-// Set to no, or the amount of seconds (NOT milliseconds) that need to pass before considering
-// a character idle.
-// Characters in a chat/vending are always considered idle.
-// A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
-// Their master will only receive items if 'mercenary_autoloot' is activated,
-// otherwise they will be dropped on the ground as usual.
-// NOTE: This option uses a special timer to track idle time, separated from the normal idle timer.
-mer_idle_no_share: no
-
-// How the server should measure the mercenary master's idle time? (Note 3)
-// (This will only work if 'mer_idle_no_share' is enabled).
-// 0x001 - Walk Request
-// 0x002 - UseSkillToID Request (Targetted skill use attempt)
-// 0x004 - UseSkillToPos Request (AoE skill use attempt)
-// 0x008 - UseItem Request (Including equip/unequip)
-// 0x010 - Attack Request
-// 0x020 - Chat Request (Whisper, Party, Guild, Battlegrounds, etc)
-// 0x040 - Sit/Standup Request
-// 0x080 - Emotion Request
-// 0x100 - DropItem Request
-// 0x200 - @/#Command Request
-// Please note that at least 1 option has to be enabled.
-// Be mindful that the more options used, the easier it becomes to cheat this features.
-// Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) = 0x1F
-// NOTE: This allows you to configure different settings for mercenary, separated from normal idle timer and 'idletime_option'.
-// It will only apply to mercenary-only kills and it will not affect normal autoloot and party share options.
-idletime_mer_option: 0x1F
-
-// If drop rate was below this amount and bonus is applied to it, the bonus can't make it exceed this amount.
-drop_rate_cap: 9000
-drop_rate_cap_vip: 9000
-
-// Displays a colored pillar effect for items dropped by monsters that contain random options.
-rndopt_drop_pillar: on
--- a/conf/battle/exp.conf
+++ b/conf/battle/exp.conf
@@ -18,12 +18,6 @@ job_exp_rate: 100
 // Turn this on to allow a player to level up more than once from a kill. (Note 1)
 multi_level_up: no

-// Allow multi level up until a certain level?
-// This only triggers if multi_level_up is enabled.
-// Default: 0 (Unlimited)
-multi_level_up_base: 0
-multi_level_up_job: 0
-
 // Setting this can cap the max experience one can get per kill specified as a
 // % of the current exp bar. (Every 10 = 1.0%)
 // For example, set it to 500 and no matter how much exp the mob gives, 
@@ -102,11 +96,6 @@ disp_zeny: no
 // through external means (ie: stat point buyers/sellers)
 use_statpoint_table: yes

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

@@ -114,3 +103,6 @@ exp_cost_redemptio: 1
 // If by default, the 'exp_cost_redemptio' is 1 (1%) and every single player revived the penalty is reduced to 0.2%,
 // it means 'exp_cost_redemptio_limit' is 5.
 exp_cost_redemptio_limit: 5
+
+// EXP cost for cast LG_INSPIRATION (Note 2)
+exp_cost_inspiration: 1
--- a/conf/battle/feature.conf
+++ b/conf/battle/feature.conf
@@ -4,7 +4,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // Buying store (Note 1)
@@ -59,55 +59,11 @@ feature.autotrade_sit: 1
 // Delay in miliseconds to open vending/buyingsotre after player logged in.
 feature.autotrade_open_delay: 5000

-// Battlegrounds queue interface. Makes it possible to queue for a battleground anywhere using the battle menu.
-// Requires: 2012-04-10aRagexe or later
-feature.bgqueue: on
-
 // Roulette (Note 1)
 // Requires: 2014-10-22bRagexe or later
-feature.roulette: on
+// Off by default while test version is out; enable at your own risk.
+feature.roulette: off

 // Achievement (Note 1)
 // Requires: 2015-05-13aRagexe or later
 feature.achievement: on
-
-// Refine UI (Note 1)
-// Requires: 2016-10-12aRagexeRE or later
-feature.refineui: on
-
-// Equipment Switch (Note 1)
-// Requires: 2017-02-08bRagexeRE or later
-feature.equipswitch: on
-
-// Pet evolution (Note 1)
-// Requires: 2014-10-08aRagexe or later
-feature.petevolution: on
-
-// Automatic Pet Feeding (Note 1)
-// Requires: 2014-10-08aRagexe or later
-feature.petautofeed: on
-
-// At which hunger rate should pet autofeeding trigger? (Note 2)
-// Default: 89
-feature.pet_autofeed_rate: 89
-
-// Homunculues Autofeeding (Note 1)
-// Requires: 2017-09-20bRagexeRE or later
-feature.homunculus_autofeed: on
-
-// At which rate should homunculus autofeeding trigger? (Note 2)
-// Default: 30
-//
-// NOTE:
-// This setting only applies, if your client side LUAs are bugged.
-// By default the client triggers the feeding packet itself once
-// it reaches the limit that is hardcoded in the client.
-feature.homunculus_autofeed_rate: 30
-
-// Attendance System (Note 1)
-// Requires: 2018-03-07bRagexeRE or later
-feature.attendance: on
-
-// Private Airship System (Note 1)
-// Requires: 2018-03-21aRagexeRE or later
-feature.privateairship: on
--- a/conf/battle/gm.conf
+++ b/conf/battle/gm.conf
@@ -7,17 +7,6 @@
 // Note 2: Value is in percents (100 means 100%)
 //--------------------------------------------------------------

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

@@ -35,7 +24,7 @@ partial_name_scan: yes
 // Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
 ban_hack_trade: 5

-// requires RENEWAL_EXP or RENEWAL_DROP to be enabled (src/config/renewal.hpp)
+// requires RENEWAL_EXP or RENEWAL_DROP to be enabled (src/config/renewal.h)
 // modifies @mobinfo to display the users' real drop rate as per renewal_drop formula
 // 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
@@ -45,9 +34,3 @@ atcommand_mobinfo_type: 1
 // This option is for @baselevelup and @joblevelup
 // Default: no
 atcommand_levelup_events: no
-
-// Disable atcommands while a player is attached to a npc? (Note 1)
-// This can be changed by script commands 'enable_command' and 'disable_command'.
-// Anyone with the 'command_enable' permission in the 'conf/group.conf' can bypass this.
-// Default: yes
-atcommand_disable_npc: yes
--- a/conf/battle/guild.conf
+++ b/conf/battle/guild.conf
@@ -18,9 +18,11 @@ guild_max_castles: 0

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

+// Damage adjustments for WOE battles against defending Guild monsters (Note 2)
+castle_defense_rate: 100
+
 // Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
 gvg_short_attack_damage_rate: 80

--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // Homunculus setting (Note 3)
@@ -50,58 +50,10 @@ homunculus_auto_vapor: 80
 homunculus_max_level: 99

 // Max level for Homunculus S
-homunculus_S_max_level: 175
+homunculus_S_max_level: 150

 // Growth level for Homunculus S
 // This is the level at which homunculus S can use their growth tables
 // Without this, a shuffle causes all levels of a Homunculus S to use their
 // growth tables, causing imbalanced stats
 homunculus_S_growth_level: 99
-
-// Send auto-feed notice even if OFF (Note 1) 
-// Official: yes
-homunculus_autofeed_always: yes
-
-// Is getting exp/item from the homunculus disabled when their master's idle?
-// Set to no, or the amount of seconds (NOT milliseconds) that need to pass before considering
-// a character idle.
-// Characters in a chat/vending are always considered idle.
-// A character's idle status is reset upon item use/skill use/attack (auto attack counts too)/movement.
-// Their master will only receive items if 'homunculus_autoloot' is activated,
-// otherwise they will be dropped on the ground as usual.
-// NOTE: This option uses a special timer to track idle time, separated from the normal idle timer.
-hom_idle_no_share: no
-
-// How the server should measure the homunculus master's idle time? (for homunculus exp share and autoloot ONLY) (Note 3)
-// (This will only work if 'hom_idle_no_share' is enabled).
-// 0x001 - Walk Request
-// 0x002 - UseSkillToID Request (Targetted skill use attempt)
-// 0x004 - UseSkillToPos Request (AoE skill use attempt)
-// 0x008 - UseItem Request (Including equip/unequip)
-// 0x010 - Attack Request
-// 0x020 - Chat Request (Whisper, Party, Guild, Battlegrounds, etc)
-// 0x040 - Sit/Standup Request
-// 0x080 - Emotion Request
-// 0x100 - DropItem Request
-// 0x200 - @/#Command Request
-// Please note that at least 1 option has to be enabled.
-// Be mindful that the more options used, the easier it becomes to cheat this features.
-// Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) = 0x1F
-// NOTE: This allows you to configure different settings for homunculus, separated from normal idle timer and 'idletime_option'.
-// It will only apply to homunculus-only kills and it will not affect normal autoloot and party share options.
-idletime_hom_option: 0x1F
-
-// The rate at which homunculus gain experience from kills. (Note 2)
-// Only applies to renewal mode.
-// Official: 10%
-homunculus_exp_gain: 10
-
-// The hunger rate, less than or equal to, at which a homunculus' hunger delay changes. (Note 2)
-// See 'homunculus_starving_delay' for the delay value.
-// Set to 0 to disable.
-// Official: 10
-homunculus_starving_rate: 10
-
-// Homunculi normally lose hunger every 60 seconds but when the 'homunculus_starving_rate' is met the hunger delay drops to 20 seconds (in milliseconds).
-// Official: 20 seconds
-homunculus_starving_delay: 20000
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // The highest value at which an item can be sold via the merchant vend skill. (in zeny)
@@ -19,12 +19,7 @@ vending_over_max: yes
 // Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
 // When a tax is applied, the item's full price is charged to the buyer, but
 // the vender will not get the whole price paid (they get 100% - this tax).
-vending_tax: 500
-
-// Minimum total of purchase until taxes are applied.
-// Officially there is no tax for anything less than 100 million zeny.
-// 0 will apply taxes to all transactions.
-vending_tax_min: 100000000
+vending_tax: 200

 // Show the buyer's name when successfully vended an item
 buyer_name: yes
@@ -52,9 +47,14 @@ dead_branch_active: yes
 // Change to 'yes' to only summon monsters less than or equal to the player's base level.
 random_monster_checklv: no

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

-// Set default bound type when item with BindOnEquip flag is equipped (see db/[pre-]re/item_db.yml)
+// Set default bound type for item_flag &8 (see db/[pre-]re/item_flag.txt
 // 0 - None
 // 1 - Account
 // 2 - Guild
@@ -107,30 +107,12 @@ item_flooritem_check: yes
 default_bind_on_equip: 4

 // Allow selling of bound/sell restricted items as Itemshop currency? (Note 3)
-// 0x0 = Bound/sell restricted items are unable to be sold to Itemshops/Shops
-// 0x1 = Bound items are able to be sold to Itemshops
-// 0x2 = Sell restricted items are able to be sold to Itemshops
-// 0x4 = Bound items are able to be sold to Shops,
-//       because most of trade restricted items are still able to be sold to Shops
-// 0x8 = Only Guild Leader can sell BOUND_GUILD items to Shops or Itemshops (if 0x1 or 0x4 set)
+// 0x0 = Bound/sell restricted items are unable to be sold at Itemshops
+// 0x1 = Bound items are able to be sold at Itemshops
+// 0x2 = Sell restricted items are able to be sold at Itemshops
 allow_bound_sell: 0x0

-// Hide n last characters of player's name with asterisk (*) when the player
-// obtained an item with special broadcast flag.
-// Note: Players with short names can be fully converted to asterisks if this
-// config value is set high.
-broadcast_hide_name: 2
-
-// Enable to sell rental item to NPC shop? (Note 1)
-rental_transaction: yes
-
-// Sell rental item for 0 to NPC shop regardless of the item value in item_db? (Note 1)
-rental_item_novalue: no
-
-// Minimum purchase price of items at a normal Shop
-// Officially items cannot be purchased for less than 1 Zeny
-min_shop_buy: 1
-
-// Minimum sell price of items at a normal shop
-// Officially items can be sold for 0 Zeny
-min_shop_sell: 0
+// Turn on event refine chance (see db/{pre-}re/refine_db.yml)
+// no = normal refine chances in effect (official/default value)
+// yes = event refine chances in effect
+event_refine_chance: no
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // PK Server Mode.  Turns entire server pvp(excluding towns). Experience loss is doubled if killed by another player.
@@ -99,7 +99,7 @@ duel_only_on_same_map: no
 // Set to 0 for no cell stacking checks and free movement.
 // Custom - This variation will make every full cell to be considered a wall.
 // NOTE: For the custom setting to take effect you have to use a server compiled
-// with Cell Stack Limit support (see src/map/map.hpp)
+// with Cell Stack Limit support (see src/map/map.h)
 official_cell_stack_limit: 1
 custom_cell_stack_limit: 1

@@ -114,9 +114,6 @@ at_timeout: 0
 // Makes player cannot be attacked when autotrade? (turns player's state.monster_ignore) (Note 1)
 at_monsterignore: no

-// Should autotrade trigger OnPCLogout script events? (Note 1)
-at_logout_event: yes
-
 // Auction system, fee per hour. Default is 12000
 auction_feeperhour: 12000

--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // The HP rate of MVPs. (Note 2)
@@ -71,7 +71,6 @@ monster_chase_refresh: 3
 // 1: Enable mob-warping when standing on NPC-warps
 // 2: Enable mob-warping when standing on Priest Warp Portals
 // 4: Disable warping when the target map is a 'nobranch' map.
-// 8: Enable mob-warping when standing on Dimensional Door
 mob_warp: 0

 // If these are set above 0, they define the time (in ms) during which monsters
@@ -136,14 +135,6 @@ mob_spawn_delay: 100
 plant_spawn_delay: 100
 boss_spawn_delay: 100

-// Should the mobs respawn time have variance applied to it? (Note 3)
-// On official servers monsters spawned by the boss_monster command (mostly MVPs) have variance, legacy Athena behavior is that variance is applied for all mobs.
-// 0: None
-// 1: Boss monsters (official)
-// 2: Normal monsters
-// 3: All monsters (legacy Athena)
-mob_spawn_variance: 1
-
 // Should mobs not spawn within the viewing range of players?
 // 0 is disabled, otherwise it is the number of retries before giving up 
 // and spawning the mob within player-view anyway, unless the max (100) is used,
@@ -271,24 +262,3 @@ monster_hp_bars_info: yes
 // This can be legit gameplay (e.g. players keeping an MVP stuck inside icewall), but if you want to prevent any
 // exploits and be notified about them, you can set this to yes.
 monster_stuck_warning: no
-
-// Rate at which monsters use their idle skills when there are no players nearby (Note 2)
-// On official servers monsters use their idle skills if they have been spotted once, even if there are no players nearby anymore.
-// On small-medium sized servers this can cause all monsters like eggs and Fabre/Pupa to metamorph.
-// To switch it off, set it to 0.
-mob_nopc_idleskill_rate: 100
-boss_nopc_idleskill_rate: 100
-
-// Rate at which monsters move when there are no players nearby (Note 2)
-// On official servers monsters always move if they have been spotted once, even if there are no players nearby anymore.
-// To switch it off, set it to 0.
-mob_nopc_move_rate: 100
-boss_nopc_move_rate: 100
-
-// When killing a monster, do AG_BATTLE type achievements trigger for everyone in the same party within the area?
-// Area is limited to area_size battle config.
-achievement_mob_share: no
-
-// Should slaves teleport back to their master if they get too far during chase? (Note 1)
-// Default (Official): no
-slave_stick_with_master: no
--- a/conf/battle/pet.conf
+++ b/conf/battle/pet.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // Rate for catching pets (Note 2)
@@ -21,8 +21,11 @@ pet_friendly_rate: 100
 // The rate at which a pet will become hungry. (Note 2)
 pet_hungry_delay_rate: 100

+// If your pet is hungry by how much will the friendlyness decrease by. (Default is 5)
+// Note: The friendlyness is 0-1000 total, at 0 the pet runs away.
+pet_hungry_friendly_decrease: 5
+
 // Does the pet need its equipment before it does its skill? (Note 1)
-// These bonuses are unofficial and found in the import/pet_db.yml
 pet_equip_required: yes

 // When the master attacks a monster, whether or not the pet will also attack. (Note 1)
@@ -36,6 +39,9 @@ pet_damage_support: no
 // At max (1000) support rate is 150%.
 pet_support_min_friendly: 900

+// Same as above, but this is to use the pet_script field with official pet abilities.
+pet_equip_min_friendly: 900
+
 // Whether or not the pet's will use skills. (Note 1)
 // Note: Offensive pet skills need at least pet_attack_support or 
 // pet_damage_support to work (they trigger while the pet is attacking).
@@ -75,13 +81,3 @@ 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
-
-// Send auto-feed notice even if the client setting is OFF (Note 1) 
-// Official: yes
-pet_autofeed_always: yes
-
-// Pet walk speed.
-// 1: Master's walk speed (official)
-// 2: DEFAULT_WALK_SPEED value
-// 3: Mob database walk speed
-pet_walk_speed: 1
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // Players' maximum HP rate? (Default is 100)
@@ -61,9 +61,7 @@ natural_healsp_interval: 8000
 natural_heal_skill_interval: 10000

 // The maximum weight for a character to carry when the character stops healing naturally. (in %)
-// For renewal: Requires client 20171025 or newer to display properly
 natural_heal_weight_rate: 50
-natural_heal_weight_rate_renewal: 70

 // Maximum atk speed. (Default 190, Highest allowed 199)
 max_aspd: 190
@@ -74,19 +72,11 @@ max_third_aspd: 193
 // Max ASPD for extended class (Kagerou/Oboro and Rebellion). (Default 193, Highest allowed 199)
 max_extended_aspd: 193

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

-// Maximum HPs depending on base level. Default values are:
-// Lv 99:  330000
-// Lv150:  660000
-// Lv175: 1100000
-max_hp_lv99: 330000
-max_hp_lv150: 660000
-max_hp: 1100000
+// Maximum HP. (Default is 1000000)
+max_hp: 1000000

 // Maximum SP. (Default is 1000000)
 max_sp: 1000000
@@ -108,7 +98,6 @@ max_baby_parameter: 80
 max_baby_third_parameter: 117
 max_extended_parameter: 125
 max_summoner_parameter: 120
-max_fourth_parameter: 130

 // Status points bonus for transcendent class
 transcendent_status_points: 52
@@ -183,6 +172,10 @@ min_npc_vendchat_distance: 3
 // Default is 25. 100 = 100% Increase.
 rental_mount_speed_boost: 25

+// Display all status changes in the status window? (Note 1)
+// Default (official): no
+show_status_sc: no
+
 //===================================
 // VIP system
 //===================================
@@ -248,11 +241,9 @@ fame_taekwon_mission: 1
 // Refined own forged weapon to +10
 fame_refine_lv1: 1
 fame_refine_lv2: 25
-fame_refine_lv3: 1000
+fame_refine_lv3: 10000
 // Success to forge a lv3 weapon with 3 additional ingredients
 fame_forge: 10
-// Refine threshold for giving point for refining forged weapon to +10
-blacksmith_fame_refine_threshold: 10
 // Success to prepare 'n' Condensed Potions in a row
 fame_pharmacy_3: 1
 fame_pharmacy_5: 3
@@ -260,70 +251,17 @@ fame_pharmacy_7: 10
 fame_pharmacy_10: 50

 // How the server should measure the character's idle time? (Note 3)
-// 0x0001 - Walk Request
-// 0x0002 - UseSkillToID Request (Targetted skill use attempt)
-// 0x0004 - UseSkillToPos Request (AoE skill use attempt)
-// 0x0008 - UseItem Request (Including equip/unequip)
-// 0x0010 - Attack Request
-// 0x0020 - Chat Request (Whisper, Party, Guild, Battlegrounds, etc)
-// 0x0040 - Sit/Standup Request
-// 0x0080 - Emotion Request
-// 0x0100 - DropItem Request
-// 0x0200 - @/#Command Request
-// 0x0400 - Closing a NPC window
-// 0x0800 - Providing input to a NPC
-// 0x1000 - Choosing a NPC menu option
-// 0x2000 - Clicking the next button of a NPC
-// 0x4000 - Finishing for a NPC progress bar
+// 0x001 - Walk Request
+// 0x002 - UseSkillToID Request (Targetted skill use attempt)
+// 0x004 - UseSkillToPos Request (AoE skill use attempt)
+// 0x008 - UseItem Request (Including equip/unequip)
+// 0x010 - Attack Request
+// 0x020 - Chat Request (Whisper, Party, Guild, Battlegrounds, etc)
+// 0x040 - Sit/Standup Request
+// 0x080 - Emotion Request
+// 0x100 - DropItem Request
+// 0x200 - @/#Command Request
 // Please note that at least 1 option has to be enabled.
 // Be mindful that the more options used, the easier it becomes to cheat features that rely on idletime (e.g. checkidle()).
-// Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) + any npc interaction(0x400,0x800,0x1000,0x2000,0x4000) = 0x7C1F
-idletime_option: 0x7C1F
-
-// Adjust the summoner class' special traits.
-// - Summoners belong to brute race category. They have their own race RC_PLAYER_DORAM (11) to be differentiated from monster race RC_BRUTE (2).
-// - Summoners are small size (0) instead of medium (1)
-summoner_race: 11
-summoner_size: 0
-
-//================================
-// 4th Job Systems
-//================================
-// How many trait points do players get when changing to a 4th job?
-// Default: 7
-trait_points_job_change: 7
-
-// Max trait stats cap.
-// Trait Stats: POW, STA, WIS, SPL, CON, CRT
-// Official is 100.
-max_trait_parameter: 100
-
-// Max amount of RES/MRES to take into the resistance damage reduction formula.
-// A setting of 625 means the max reduction of damage allowed is 50.0%.
-// Formula is 100 - 100 * (5000 + RES) / (5000 + 10 * RES)
-// Note: Best to leave this setting alone unless you know what your doing.
-// Default: 625
-max_res_mres_reduction: 625
-
-// Maximum AP
-// Default: 1000
-max_ap: 1000
-
-// Players' maximum AP rate? (Default is 100)
-ap_rate: 100
-
-// The amount of AP a player will respawn with, 0 is default.
-// (Unit is in percentage of total AP, 100 is full heal of AP, 0 is respawn with 0 AP total.)
-restart_ap_rate: 0
-
-// Is AP lost when the player dies?
-// Default: yes
-loose_ap_on_death: yes
-
-// Is AP lost when the player enters a PVP/GVG/WoE/Battleground maps?
-// Default: yes
-loose_ap_on_map: yes
-
-// Do player's keep their AP when logging out?
-// Default: yes
-keep_ap_on_logout: yes
+// Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) = 0x1F
+idletime_option: 0x1F
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -85,7 +85,7 @@ clear_skills_on_warp: 15

 //Setting this to YES will override the target mode of ground-based skills with the flag 0x01 to "No Enemies"
 //The two skills affected by default are Pneuma and Safety Wall (if set to yes, those two skills will not protect everyone, but only allies)
-//See db/(pre-)re/skill_db.yml for more info.
+//See db/skill_unit_db.txt for more info.
 defunit_not_enemy: no

 // Should skills always do at least 'hits' damage when they don't miss/are blocked?
@@ -107,11 +107,11 @@ auto_counter_type: 15

 // Can ground skills be placed on top of each other? (Note 3)
 // By default, skills with UF_NOREITERATION set cannot be stacked on top of 
-// other skills, this setting will override that.
+// other skills, this setting will override that. (skill_unit_db)
 skill_reiteration: 0

 // Can ground skills NOT be placed underneath/near players/monsters? (Note 3)
-// If set, only skills with UF_NOFOOTSET set will be affected.
+// If set, only skills with UF_NOFOOTSET set will be affected (skill_unit_db)
 skill_nofootset: 1

 // Should traps (hunter traps + quagmire) change their target to "all" inside gvg/pvp grounds? (Note 3)
@@ -122,8 +122,7 @@ gvg_traps_target_all: 1
 // 0 = Always visible
 // 1 = Enable invisibility in versus maps (GVG/PVP/BG)
 // 2 = Enable invisibility in all maps
-// Default on official servers: 0 for Pre-renewal, 2 for Renewal
-//traps_setting: 0
+traps_setting: 0

 // Restrictions applied to the Alchemist's Summon Flora skill (add as necessary)
 // 1: Enable players to damage the floras outside of versus grounds.
@@ -196,14 +195,6 @@ devotion_rdamage: 0
 // But if the target is being devoted, it ONLY reflects the damage for melee skill. (Note 1)
 devotion_rdamage_skill_only: yes

-// On AEGIS there is a bug when the player who is under devotion is sitting and getting hit.
-// The player stands up on client side, but will still remain sitting on server side.
-// Because of this the player will not be able to walk anymore, until the player sat down/stood up again or used @refresh.
-// You can read more about it on https://github.com/rathena/rathena/issues/1927
-// Default: yes (because it is a recommended bug fix from our side)
-// Official: no
-devotion_standup_fix: yes
-
 // If no than you can use the ensemble skills alone. (Note 1)
 player_skill_partner_check: yes

@@ -274,9 +265,8 @@ sg_miracle_skill_duration: 3600000
 sg_angel_skill_ratio: 10

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

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

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

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

 // On official servers, skills that hit all targets on a path (e.g. Focused Arrow Strike and First Wind) first
@@ -356,10 +346,6 @@ default_fixed_castrate: 20
 // Note: Brandish Spear will always use this algorithm due to its special damage behavior.
 skill_eightpath_algorithm: yes

-// Should skills that use skill_eightpath_algorithm include targets in the caster's cell?
-// Official: yes
-skill_eightpath_same_cell: yes
-
 // Can damage skill units like icewall and traps (Note 3)
 // On official servers, players can damage icewalls and some traps with skills. When monsters use skills, damage
 // will show on the icewalls and traps, but it is not actually substracted from the durability.
@@ -367,21 +353,6 @@ skill_eightpath_same_cell: yes
 // damage skills (previous behavior).
 can_damage_skill: 1

-// Land Protector behavior (Note 1)
-// On official servers, players standing on the border (outer cell) of the Land Protector can still be affected/hit
-// by AoE skills (if the skill has a splash effect, such as Storm Gust). The Athena behavior ignores AoE affects/hits
-// while players are standing on the border.
-// Official: 0
-// Legacy Athena: 1
-land_protector_behavior: 0
-
-// NPC EMOTION behavior (Note 1)
-// On official servers, certain mobs cast NPC EMOTION skill which displays an emoticon and change their mode from
-// Aggressive to Passive for a certain time. The Athena behavior does not change their mode to Passive.
-// Official: 0
-// Legacy Athena: 1
-npc_emotion_behavior: 0
-
 // Should Tarot Card of Fate have the same chance for each card to occur? (Note 1)
 // Official chances: 15%: LOVERS | 10%: FOOL, MAGICIAN, HIGH PRIESTESS, STRENGTH, SUN | 8%: TEMPERANCE
 // 7%: CHARIOT | 6%: THE HANGED MAN | 5%: DEATH, STAR | 2%: TOWER | 1%: WHEEL OF FORTUNE, DEVIL
@@ -398,20 +369,3 @@ dispel_song: no
 // 0: Uses the official duration
 // X: Enter a custom duration in milliseconds.
 banana_bomb_duration: 0
-
-// Should items that you try to create be dropped if you have no space left in your inventory? (Note 1)
-// Official: no
-// Legacy rAthena logic: yes
-skill_drop_items_full: no
-
-// EDP setting: (Note 3)
-// When switching/unequipping a right hand weapon, should EDP be removed? EDP can't be used with bare hand.
-// 0: Disabled (rAthena legacy and pre-renewal behavior).
-// 1: Enabled on pre-renewal.
-// 2: Enabled on renewal.
-// 3: 1+2
-switch_remove_edp: 2
-
-// Max Level Difference when casting Meister's Attack Machine on other party members.
-// Default: 15
-attack_machine_level_difference: 15
--- a/conf/battle/status.conf
+++ b/conf/battle/status.conf
@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // Should skill casting be cancelled when inflicted by curse/stun/sleep/etc (includes silence) (Note 3)?
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -85,7 +85,7 @@ char_maintenance: 0

 // Enable or disable creation of new characters.
 // Now it is actually supported [Kevin]
-char_new: yes
+char_new: 1

 // Display (New) in the server list.
 char_new_display: 0
@@ -109,7 +109,7 @@ save_log: yes

 // Starting point for new characters
 // Format: <map_name>,<x>,<y>{:<map_name>,<x>,<y>...}
-// Max number of start points is MAX_STARTPOINT in char.hpp (default 5)
+// Max number of start points is MAX_STARTPOINT in char.h (default 5)
 // Location is randomly picked on character creation.
 // NOTE: For Doram, this requires client 20151001 or newer.
 start_point: iz_int,18,26:iz_int01,18,26:iz_int02,18,26:iz_int03,18,26:iz_int04,18,26
@@ -117,7 +117,7 @@ start_point_pre: new_1-1,53,111:new_2-1,53,111:new_3-1,53,111:new_4-1,53,111:new
 start_point_doram: lasa_fild01,48,297

 // Starting items for new characters
-// Max number of items is MAX_STARTITEM in char.cpp (default 32)
+// Max number of items is MAX_STARTITEM in char.c (default 32)
 // Format: <id>,<amount>,<position>{:<id>,<amount>,<position>...}
 // To auto-equip an item, include the position where it will be equipped; otherwise, use zero.
 // NOTE: For Doram, this requires client 20151001 or newer.
@@ -141,7 +141,7 @@ guild_exp_rate: 100
 unknown_char_name: Unknown

 // To log the character server?
-log_char: yes
+log_char: 1

 // Allow or not identical name for characters but with a different case (upper/lower):
 // example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
@@ -189,15 +189,7 @@ char_del_option: 2
 // 3: Character cannot be deleted as long as he remains in a party or guild(default)
 char_del_restriction: 3

-// Restrict certain class from being created. (Only functional on 20151001aRagexe or later)
-// 0: No character creation is allowed
-// 1: Only novice is allowed to be created    (pre-renewal default)
-// 2: Only summoner is allowed to be created
-// 3: Both novice and summoner can be created (renewal default)
-// Uncomment to customize the restriction
-//allowed_job_flag: 3
-
-// Folder that contains the database files.
+// What folder the DB files are in (item_db.txt, etc.)
 db_path: db

 //===================================
@@ -284,14 +276,4 @@ mail_return_days: 15
 // Default: 15
 mail_delete_days: 15

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

-// Amount of status points a new character will start with
-start_status_points: 48
-
 // You can specify the codepage to use in your MySQL tables here.
 // (Note that this feature requires MySQL 4.1+)
 //default_codepage:
@@ -84,6 +81,8 @@ mysql_reconnect_count: 1
 // Login Database Tables
 login_server_account_db: login
 ipban_table: ipbanlist
+
+// Shared
 global_acc_reg_num_table: global_acc_reg_num
 global_acc_reg_str_table: global_acc_reg_str

@@ -117,6 +116,7 @@ skill_homunculus_db: skill_homunculus
 mercenary_db: mercenary
 mercenary_owner_db: mercenary_owner
 elemental_db: elemental
+ragsrvinfo_db: ragsrvinfo
 skillcooldown_db: skillcooldown
 bonus_script_db: bonus_script
 acc_reg_num_table: acc_reg_num
@@ -149,7 +149,6 @@ vending_table: vendings
 vending_items_table: vending_items
 market_table: market
 roulette_table: db_roulette
-guild_storage_log: guild_storage_log

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

-Header:
-  Type: INTER_SERVER_DB
-  Version: 1
-
-Body:
-  - ID: 0
-    Name: "Storage"
-    Table: storage
-
-Footer:
-  Imports:
-    - Path: conf/import/inter_server.yml
+Storages:
+    - ID: 0
+      Name: "Storage"
+      Table: "storage"
--- a/conf/log_athena.conf
+++ b/conf/log_athena.conf
@@ -4,7 +4,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
 //--------------------------------------------------------------

 // Enable Logs? (Note 3)
@@ -37,7 +37,7 @@
 // Please note that moving items from inventory to cart and back is not logged by design.
 enable_logs: 0xFFFFFF

-// Use MySQL Logs? (Note 1)
+// Use MySQL Logs? [SQL Version Only] (Note 1)
 sql_logs: yes

 // LOGGING FILTERS
@@ -86,8 +86,10 @@ log_branch: no
 // 0 - don't log; 1 - log any zeny changes; 2.....1000000 - minimal absolute logging zeny value
 log_zeny: 0

-// Track Cash Changes (Note 1)
-log_cash: yes
+// Track Cash Changes
+// 0 - don't log
+// 1 - log any changes
+log_cash: 1

 // Log MVP Monster Drops (Note 1)
 // Outdated. Use Pick_Log instead. But this log could be useful to keep track slayed MVPs
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -52,8 +52,7 @@ console_silent: 0
 console: off

 // Can you use _M/_F to make new accounts on the server?
-// Note: This only works if client side password encryption is not enabled.
-new_account: no
+new_account: yes

 //If new_account is enabled, minimum length to userid and passwords should be 4?
 //Must be 'Yes' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
@@ -90,7 +89,7 @@ min_group_id_to_connect: -1
 vip_group: 5

 // How many characters are allowed per account?
-// You cannot exceed the limit of MAX_CHARS slots, defined in mmo.hpp, or chars_per_account
+// You cannot exceed the limit of MAX_CHARS slots, defined in mmo.h, or chars_per_account
 // will default to MAX_CHARS.
 // 0 will default to the value of MIN_CHARS. (default)
 chars_per_account: 0
@@ -99,7 +98,7 @@ 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.
-// -1 will default to MAX_CHAR_VIP (src/config/core.hpp)
+// -1 will default to MAX_CHAR_VIP (src/config/core.h)
 vip_char_increase: -1

 // Create accounts with limited time?
@@ -111,16 +110,6 @@ start_limited_time: -1
 // NOTE: Will not work with clients that use <passwordencrypt>
 use_MD5_passwords: no

-// User count colorization on login window (requires PACKETVER >= 20170726)
-// Disable colorization and description in general?
-usercount_disable: no
-// Amount of users that will display in green
-usercount_low: 200
-// Amount of users that will display in yellow
-usercount_medium: 500
-// Amount of users that will display in red
-usercount_high: 1000
-
 // Ipban features
 ipban_enable: yes
 // Dynamic password failure ipban system
@@ -163,10 +152,6 @@ dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net
 // Note: see 'doc/md5_hashcheck.txt' for more details.
 client_hash_check: off

-// Enable web authentication token system
-// This is required for new clients that get data via an additional API over HTTP
-use_web_auth_token: yes
-
 // Client MD5 hashes
 // The client with the specified hash can be used to log in by players with
 // a group_id equal to or greater than the given value.
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -105,18 +105,18 @@ minsave_time: 100
 // 32: After successfully submitting an item for auction
 // 64: After successfully get/delete/complete a quest
 // 128: After every bank transaction (deposit/withdraw)
-// 256: After every attendance reward
-// 4095: Always
 // NOTE: These settings decrease the chance of dupes/lost items when there's a
 // server crash at the expense of increasing the map/char server lag. If your 
 // server rarely crashes, but experiences interserver lag, you may want to set
 // these off.
-save_settings: 4095
+save_settings: 255

 // Message of the day file, when a character logs on, this message is displayed.
 motd_txt: conf/motd.txt

 // When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands.
+help_txt: conf/help.txt
+help2_txt: conf/help2.txt
 charhelp_txt: conf/charhelp.txt

 // Load channel config from
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1174,7 +1174,6 @@ map: 1@glast

 // Biochemical Laboratory Nightmare
 map: lhz_dun_n
-map: lhz_d_n2

 // Copy of Old Glast Heim memorial map
 map: 1@gl_kh
@@ -1247,7 +1246,7 @@ map: rebel_in
 map: 1@md_gef
 map: 1@md_pay

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

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

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

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

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

-// Suspicious shipwreck
+// ??
 map: 1@tre

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

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

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

-// ??
-map: ordeal_a00
-map: ordeal_a02
-map: pprontera
-
-// ??
-map: niflxmas
-map: sch_lab
-map: nakhyang
-
-// Noodles Festival July
-map: lasa_sea
-map: 1@drdo
-
-// X anniversary
-map: x_lhz
-map: x_prt
-map: x_ra
-
-// November hunting contest
-map: prt_evt_in
-
-// Welcome Corridor
-map: vis_h01
-map: vis_h02
-map: vis_h03
-map: vis_h04
-
-// Illusion of Teddy Bear
-map: ein_d02_i
-
-// Illusion of Luanda
-map: com_d02_i
-
-// Soul Reaper Job Change
-map: 1@soul
-
-// Star Emperor Job Change
-map: star_frst
-map: star_in
-
-// RWC Maps
-map: 2009rwc_01
-map: 2009rwc_02
-map: 2009rwc_03
-map: 2009rwc_04
-map: 2009rwc_05
-map: 2009rwc_06
-map: 2009rwc_07
-map: 2009rwc_08
-map: 2009rwc_f01
-map: 2012rwc_01
-map: 2012rwc_02
-map: 2012rwc_03
-map: 2012rwc_04
-map: 2012rwc_05
-map: 2012rwc_06
-map: 2012rwc_07
-map: 2012rwc_08
-
-// ep17.1
-map: 1@cor
-map: 1@os_a
-map: 1@os_b
-map: 1@rgsr
-map: gl_cas01_
-map: mag_dun03
-map: pub_cat
-map: rgsr_in
-map: sp_cor
-map: sp_os
-map: sp_rudus
-map: sp_rudus2
-map: sp_rudus3
-
-// ep17.2
-map: 1@bamn
-map: 1@bamq
-map: 1@ghg
-map: 1@herbs
-map: 1@lost
-map: ba_2whs01
-map: ba_2whs02
-map: ba_bath
-map: ba_in01
-map: ba_lib
-map: ba_maison
-map: ba_pw01
-map: ba_pw02
-map: ba_pw03
-map: 1@odin
-map: ba_chess
-map: ba_go
-map: ba_lost
-
-// Illusion of Labyrinth
-map: prt_mz03_i
-
-// Illusion of Underwater
-map: iz_d04_i
-map: iz_d05_i
-
-// 4th jobs change
-map: 1@4win
-map: 1@4mag
-map: 1@4mst
-map: 1@4sac
-map: 1@4tro
-map: 1@4inq
-map: 1@4cdn
-map: 1@4igd
-map: 1@4drk
-map: job4_bio
-map: job4_mag
-map: job4_tro
-
-// Gefen Night Arena
-map: 1@ge_sn
-
-// Traces of heroes
-map: 1@mjo1
-map: 1@mjo2
-map: 1@spa2
-
-// Instance Thanatos Tower
-map: 1@thts
-map: 2@thts
-map: 3@thts
-map: 4@thts
-map: 5@thts
-map: 6@thts
-map: 7@thts
-map: 8@thts
-
-// Glastheim Challenge Mode
-map: 1@gl_he
-map: 1@gl_he2
-
-// EDDA
-map: 1@gl_prq
-map: 1@gol1
-map: 1@gol2
-
-// 2018 Halloween
-map: 1@halo
-
-// Constellation Tower
-map: 1@ch_t
-map: 2@ch_t
-map: 3@ch_t
-
-// Level 200 Expansion
-map: abyss_04
-map: ein_dun03
-map: odin_past
-
-// Grade Enhancer
-map: grademk
-
-// Level 250 Expansion
-map: sp_rudus4
-map: amicitia1
-map: amicitia2
-map: nif_dun01
-map: nif_dun02
-
-// // Monster Invasion event
-map: e_hugel
-
-// Training Ground outside Prontera
-map: tra_fild
-
-// Episode 18: Direction of Prayer
-map: 1@adv
-map: 1@advs
-map: 1@nyr
-map: 1@oz
-map: 1@tcamp
-map: 2@nyr
-map: gw_fild01
-map: gw_fild02
-map: oz_dun01
-map: oz_dun02
-map: que_thr
-map: wolfvill
-
-// Sunken tower
-map: 1@ch_u
-
-// Illusion of Twins
-map: ant_d02_i
-
-// ??
-map: verus02_a
-map: verus02_b
-map: tur_d04ia
-map: tur_d04ib
-
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
+
+// Ragnarok World Championship 2004
+// Requires: RWC 2004 Client
+// or Akaru's SuperGRF 1.64 or newer
+//map: rwc01
+//map: rwc02
+//map: rwc03
+
+// Ragnarok World Championship 2009
+// Requires: RWC 2009 Map files
+//map: 2009rwc_f01
+//map: 2009rwc_01
+//map: 2009rwc_02
+//map: 2009rwc_03
+//map: 2009rwc_04
+
+// Ragnarok World Championship 2008?
+// Requires: RWC 2008 Map files?
+//map: 2008rwc_04
+
+//Christmas & Sakura Special
+//Requires Akaru's SuperGRF 1.1 or newer
+//map: prontera_x
+//map: alberta_x
+//map: aldebaran_x
+//map: geffen_x
+//map: izlude_x
+//map: prt_church_x
+//map: prontera_s
+//map: pay_arche_s
+
+//Fenced Lutie
+//Requires Akaru's SuperGRF 1.23 or newer
+//map: xmas_old
+
+//Alpha Maps
+//Requires adata.grf containing alpha maps and data
+//map: fay_vilg00
+//map: fay_vilg01
+//map: gef_vilg00
+//map: gef_vilg01
+//map: moc_dugn01
+//map: moc_dugn02
+//map: moc_fild01
+//map: moc_fild02
+//map: moc_fild03
+//map: moc_fild04
+//map: moc_intr00
+//map: moc_intr01
+//map: moc_intr02
+//map: moc_intr04
+//map: moc_vilg00
+//map: moc_vilg01
+//map: moc_vilg02
+//map: probemap
+//map: probemap02
+//map: prt_cstl01
+//map: prt_dugn00
+//map: prt_dugn01
+//map: prt_fild00
+//map: prt_fild01
+//map: prt_fild03
+//map: prt_fild04
+//map: prt_fild05
+//map: prt_intr01
+//map: prt_intr01_a
+//map: prt_intr02
+//map: prt_vilg00
+//map: prt_vilg01
+//map: prt_vilg02
+//map: tank_test
+//map: tank_test2
+//map: test
--- a/conf/motd.txt
+++ b/conf/motd.txt
@@ -1,2 +1,2 @@
-// Internal default is limited to 128 lines.  If you need more, you will need to modify the MOTD_LINE_SIZE definition in pc.cpp
+// Internal default is limited to 128 lines.  If you need more, you will need to modify the MOTD_LINE_SIZE definition in pc.c
 Welcome to rAthena! Enjoy! Please report any bugs you find.
--- a/conf/msg_conf/char_msg.conf
+++ b/conf/msg_conf/char_msg.conf
@@ -125,32 +125,7 @@
 115: Baby Soul Linker
 116: Baby Gunslinger
 117: Baby Rebellion
-118: Star Emperor
-119: Soul Reaper
-120: Baby Star Emperor
-121: Baby Soul Reaper
-122: Dragon Knight
-123: Meister
-124: Shadow Cross
-125: Arch Mage
-126: Cardinal
-127: Windhawk
-128: Imperial Guard
-129: Biolo
-130: Abyss Chaser
-131: Elemental Master
-132: Inquisitor
-133: Troubadour
-134: Trouvere
-135: Sky Emperor
-136: Soul Ascetic
-137: Shinkiro
-138: Shiranui
-139: Night Watch
-140: Hyper Novice
-141: Spirit Handler
-
-199: Unknown Job
+118: Unknown Job

 //Auction
 200: Auction Manager
@@ -174,8 +149,8 @@
 216: No account with ID '%d' was found.
 217: -- Account %d --
 218: User: %s | GM Group: %d | State: %d
-//219: FREE
-//220: FREE
+219: Password: %s (PIN:%s)
+220: ****
 221: Account e-mail: %s | Birthdate: %s
 222: Last IP: %s (%s)
 223: This user has logged in %d times, the last time was at %s
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -41,7 +41,7 @@
 24: Job level raised.
 25: Job level lowered.
 26: Help commands:
-//27: free
+27: Commands help is not available.
 28: No player found.
 29: 1 player found.
 30: %d players found.
@@ -92,7 +92,7 @@
 75: War of Emperium is currently not in progress.
 76: All skills have been added to your skill tree.
 77: The reference result of '%s' (name: id):
-78: - %s: %u
+78: - %s: %d
 79: It is %d affair above.
 80: Give the display name or monster name/id please.
 81: Your GM level doesn't authorize you to perform this action on the specified player.
@@ -179,7 +179,7 @@
 166: No item has been refined.
 167: 1 item has been refined.
 168: %d items have been refined.
-169: The item (%u: '%s') is not equipable.
+169: The item (%hu: '%s') is not equipable.
 170: The item is not equipable.
 171: %d - void
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -353,12 +353,6 @@
 // 334: Thirty-Four Castles
 334: Total Domination

-// Battlegrounds Queue
-337: You can't apply to a battleground queue from this map.
-338: You can't apply to a battleground queue due to recently deserting a battleground. Time remaining: %d minutes and %d seconds.
-339: You can't apply to a battleground queue for %d seconds due to recently leaving one.
-340: Participants were unable to join. Delaying entry for more participants.
-
 // Templates for @who output
 343: Name: %s
 344: (%s)
@@ -429,8 +423,8 @@
 404: War of Emperium SE is currently in progress.
 405: War of Emperium SE has been ended.
 406: War of Emperium SE is currently not in progress.
+//407: free
 //chrif related
-407: Char-Server disconnected
 408: Need disconnection to perform change-sex request...
 409: Your sex has been changed (need disconnection by the server)...
 //410-411 used by cash shop
@@ -464,7 +458,8 @@
 // Homunculus messages
 450: You already have a homunculus

-451: Cash Shop is disabled on this map.
+// Return pet to egg message
+451: You can't return your pet because your inventory is full.

 // Message System
 460: Please enter a valid language (usage: @langtype <language>).
@@ -551,7 +546,7 @@

 // Trade Spoof Messages
 538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
-539: This player has %d of a kind of item (id: %u), and tried to trade %d of them.
+539: This player has %d of a kind of item (id: %hu), and tried to trade %d of them.
 540: This player has been definitivly blocked.

 // Rare Items Drop/Steal announce
@@ -695,7 +690,7 @@
 666: Pets are not allowed in Guild Wars.
 667: You're not dead.
 668: Your actual memo positions are:
-//669 free
+669: You broke the target's weapon.
 670: You can't leave battleground guilds.
 671: Friend already exists.
 672: Name not found in list.
@@ -739,19 +734,19 @@
 707: You are VIP until: %s
 708: The player is now VIP until: %s

-709: Item %u has been removed from your inventory.
-710: Item %u has been removed from your cart.
-711: Item %u has been removed from your storage.
+709: Item %hu has been removed from your inventory.
+710: Item %hu has been removed from your cart.
+711: Item %hu has been removed from your storage.

 // Item shop
-712: You do not have enough %s (%u).
+712: You do not have enough %s (%hu).
 713: You do not have enough '%s'.
-714: Item Shop List: %s (%u)
+714: Item Shop List: %s (%hu)
 715: Point Shop List: '%s'
 716: Your '%s' is now: %d

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

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

-// @refineui
-773: This command requires packet version 2016-10-12 or newer.
-774: This command is disabled via configuration.
-775: You have already opened the refine UI.
-//776-781 reserved for tax system
-
-782: Star Emperor
-783: Soul Reaper
-784: Baby Star Emperor
-785: Baby Soul Reaper
-
-// Guild Storage Expansion Skill
-786: The guild does not have a guild storage.
-787: You do not have permission to use the guild storage.
-
-// Attendance
-// Mail sender: Officer
-788: <MSG>3455</MSG>
-// Mail title: %dday attendance has been paid.
-789: <MSG>3456,%d</MSG>
-// Mail body: %dday attendance has been paid.
-790: <MSG>3456,%d</MSG>
-791: You are not allowed to use the attendance system.
-
-// Private Airship
-792: The private airship system is disabled.
-
-793: Usage @camerainfo range rotation latitude
-
-// pcblock command
-794: This action is currently blocked.
-
-// @reloadattendancedb
-795: Attendance database has been reloaded.
-
-// NoRODEX Mapflag
-796: You cannot use RODEX on this map.
-
-797: This command is unavailable to non-4th class.
-
-//798-799 free
-
-800: Dragon Knight
-801: Meister
-802: Shadow Cross
-803: Arch Mage
-804: Cardinal
-805: Windhawk
-806: Imperial Guard
-807: Biolo
-808: Abyss Chaser
-809: Elemental Master
-810: Inquisitor
-811: Troubadour
-812: Trouvere
-813: Sky Emperor
-814: Soul Ascetic
-815: Shinkiro
-816: Shiranui
-817: Night Watch
-818: Hyper Novice
-819: Spirit Handler
-
-// @trpoint
-820: Please enter a number (usage: @trpoint <number of points>).
-
-// @chargeap
-821: AP recovered.
-822: AP modified.
-823: AP have already been recovered.
-
-// @displayskillcast
-824: Usage: @displayskillcast <skill ID> {<skill level> <ground target flag> <cast time>}
-
-// @displayskill (2nd Message Line)
-825: Effect Types: 0: All, 1: Damage, 2: Splash Dmg, 3: No Damage, 4: Ground
-
-// @displayskillunit
-826: Usage: @displayskillunit <unit ID> {<skill level> <range>}
-
-// @mobinfo RES/MRES
-827:  RES:%d  MRES:%d
-
-//828-899 free
+//773-899 free

 //------------------------------------
 // More atcommands message
@@ -1106,7 +1018,7 @@

 // @reloadatcommand
 1036: Error reading groups.conf, reload failed.
-//1037 free
+1037: Error reading atcommand_athena.conf, reload failed.

 // @mapinfo
 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
@@ -1124,10 +1036,7 @@
 1050: Other Flags:
 1051: Other Flags2:
 1052: Skill Damage Adjustments:
-1053:  > [Map] %d%%, %d%%, %d%%, %d%% | Caster:%d
-1054:  > [Map Skill] Name : Player, Monster, Boss Monster, Other | Caster
-1055: Skill Duration Adjustments:
-//1056-1064 free
+//1053-1064 free
 1065:  No Exp Penalty: %s | No Zeny Penalty: %s
 1066: On
 1067: Off
@@ -1240,7 +1149,7 @@
 1165: Usage: @useskill <skill ID> <skill level> <char name>

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

 // @skilltree
 1167: Usage: @skilltree <skill ID> <char name>
@@ -1286,9 +1195,9 @@
 1189: Item not found.
 1190: You're already autolooting this item.
 1191: Your autolootitem list is full. Remove some items first with @autolootid -<item name or ID>.
-1192: Autolooting item: '%s'/'%s' {%u}
+1192: Autolooting item: '%s'/'%s' {%hu}
 1193: You're currently not autolooting this item.
-1194: Removed item: '%s'/'%s' {%u} from your autolootitem list.
+1194: Removed item: '%s'/'%s' {%hu} from your autolootitem list.
 1195: You can have %d items on your autolootitem list.
 1196: To add an item to the list, use "@alootid +<item name or ID>". To remove an item, use "@alootid -<item name or ID>".
 1197: "@alootid reset" will clear your autolootitem list.
@@ -1378,12 +1287,12 @@
 1239: Please enter a monster name/ID (usage: @mobinfo <monster_name_or_monster_ID>).
 1240: MVP Monster: '%s'/'%s'/'%s' (%d)
 1241: Monster: '%s'/'%s'/'%s' (%d)
-1242:  Lv:%d  HP:%d  Base EXP:%llu  Job EXP:%llu  HIT:%d  FLEE:%d
+1242:  Lv:%d  HP:%d  Base EXP:%u  Job EXP:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)
 1245:  Drops:
 1246: This monster has no drops.
-1247:  MVP Bonus EXP:%llu
+1247:  MVP Bonus EXP:%u
 1248:  MVP Items:
 1249: This monster has no MVP prizes.

@@ -1437,7 +1346,7 @@

 // @iteminfo
 1276: Please enter an item name/ID (usage: @ii/@iteminfo <item name/ID>).
-1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%hu) Type: %s | Extra Effect: %s
 1278: None
 1279: With script
 1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f
@@ -1447,7 +1356,7 @@

 // @whodrops
 1284: Please enter item name/ID (usage: @whodrops <item name/ID>).
-1285: Item: '%s'[%d] (ID: %u)
+1285: Item: '%s'[%d] (ID:%hu)
 1286:  - Item is not dropped by mobs.
 1287:  - Common mobs with highest drop chance (only max %d are listed):

@@ -1585,7 +1494,7 @@
 1370: Usage: ex. "@set PoringCharVarSTR$" outputs its value, Super Duper String.
 1371: NPC variables may not be used with @set.
 1372: Instance variables may not be used with @set.
-1373: %s value is now: %lld
+1373: %s value is now: %d
 1374: %s value is now: %s
 1375: %s is blank.

@@ -1618,7 +1527,7 @@
 1391: You do not possess a cart to be removed
 1392: Cart Added.

-// atcommand.cpp::is_atcommand
+// atcommand.c::is_atcommand
 1393: You can't use commands while dead.

 // @clearstorage
@@ -1758,24 +1667,5 @@
 1503: You've entered a PK Zone.
 1504: You've entered a PK Zone (safe until level %d).

-// @setquest, @erasequest, @completequest
-1505: Usage: %s <quest ID>
-1506: Quest %d not found in DB.
-1507: Character already has quest %d.
-1508: Character doesn't have quest %d.
-
-// @checkquest
-1509: Checkquest value for quest %d
-1510: >    HAVEQUEST : %d
-1511: >    HUNTING   : %d
-1512: >    PLAYTIME  : %d
-
-// @changegm
-1513: Currently in WoE hours, unable to delegate Guild leader
-1514: You have to wait for a while before delegating a new Guild leader
-
-// @hatereset
-1515: Reset 'Hatred' monsters.
-
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt
--- a/conf/msg_conf/map_msg_chn.conf
+++ b/conf/msg_conf/map_msg_chn.conf
@@ -45,7 +45,7 @@
 24: 職業等級 上升
 25: 職業等級 下降
 26: 求助指令:
-//27: free
+27: 找不到檔案: help.txt
 28: 沒有玩家
 29: 有 1 位玩家
 30: 有 %d 位玩家
@@ -96,7 +96,7 @@
 75: 公會戰還沒開始
 76: 您學會了所有技能
 77: 委託 '%s' (名字: 編號):
-78: %s: %u
+78: %s: %d
 79: 查詢到 %d 個符合條件的結果
 80: 重新讀取任務資料庫
 81: 您的GM 等級並沒有權限在這位玩家上執行這個動作
@@ -183,7 +183,7 @@
 166: 沒有道具被精練
 167: 1 個道具已被精練
 168: %d 個道具已被精練
-169: 此物品 (%u: '%s')不是裝備
+169: 此物品 (%d '%s')不是裝備
 170: 此物品不是裝備
 171: %d - 無
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -441,7 +441,8 @@
 // Homunculus messages
 450: 你已經擁有一個人工生命體了

-451: Cash Shop is disabled on this map.
+// Return pet to egg message
+451: 你無法收回寵物,因為你身上沒有空間了

 // Message System
 460: 請輸入合法的語言 (usage: @langtype <language>).
@@ -500,7 +501,7 @@
 537: 玩家'%s' (account: %d) 試圖使用外掛(它試圖偵測假的怪物)
 // Trade Spoof Messages
 538: 危險交易: 玩家 '%s' (account: %d) 嘗試交易超過他所有的數量
-539: 這個使用者有%d 個物品(物品id: %u), 嘗試交易%d 個
+539: 這個使用者有%d 個物品(物品id: %d), 嘗試交易%d 個
 540: 這個使用者已經被伺服器屏蔽
 // Rare Items Drop/Steal announce
 541: '%s' 取得 %s's %s (機率為: %%%0.02f)
@@ -642,7 +643,7 @@
 666: 公會戰不允許有寵物
 667: 你沒死亡
 668: 你實際儲存點是:
-//669 free
+669: 你破壞目標的武器
 670: 你無法離開戰場公會
 671: 這朋友已存在
 672: 該名稱不在清單內
@@ -867,7 +868,7 @@

 // @reloadatcommand
 1036: Error reading groups.conf, reload failed.
-//1037 free
+1037: Error reading atcommand_athena.conf, reload failed.

 // @mapinfo
 1038: 請至少輸入一個有效的列表數字 (使用方法: @mapinfo <0-3> [地圖名稱])
@@ -1042,9 +1043,9 @@
 1189: 未找到此道具。
 1190: 此道具已在自動檢取列表中了。
 1191: 自動檢取列表已經滿了，移除某些道具方法 @autolootid -<道具名稱或ID>。
-1192: 自動檢取的道具為: '%s'/'%s' {%u}。
+1192: 自動檢取的道具為: '%s'/'%s' {%d}。
 1193: 目前你尚未將此道具列入自動檢取項目中。
-1194: 已從自動檢取列表中移除道具: '%s'/'%s' {%u}。
+1194: 已從自動檢取列表中移除道具: '%s'/'%s' {%d}。
 1195: 在自動檢取列表你最多能有 %d 個檢取的項目。
 1196: 如要在自動檢取項目列表增加檢取道具，使用 "@alootid +<道具名稱或ID>", 如要從列表移除道具 "@alootid -<道具名稱或ID>"。
 1197: "@alootid reset" 將會清空所有自動檢取項目列表。
@@ -1134,12 +1135,12 @@
 1239: 請輸入魔物名稱或魔物ID (用法: @mobinfo <魔物名稱或魔物ID>).
 1240: MVP 魔物: '%s'/'%s'/'%s' (%d)
 1241: 魔物: '%s'/'%s'/'%s' (%d)
-1242: 等級:%d  血量:%d  基本經驗值:%llu  職業經驗值:%llu  命中率:%d  迴避率:%d
+1242: 等級:%d  血量:%d  基本經驗值:%u  職業經驗值:%u  命中率:%d  迴避率:%d
 1243: 防禦:%d  魔防:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244: 物理攻擊力:%d~%d 攻擊範圍:%d~%d~%d  體型:%s  種族: %s  屬性: %s (Lv:%d)
 1245: 掉落:
 1246: 此魔物不掉落道具.
-1247: MVP額外經驗值:%llu
+1247: MVP額外經驗值:%u
 1248: MVP額外獎勵道具:
 1249: 此魔物無MVP額外獎勵道具.

@@ -1193,7 +1194,7 @@

 // @iteminfo
 1276: 請輸入 物品名稱/ID (用法: @ii/@iteminfo <物品名稱/ID>).
-1277: 物品: '%s'/'%s'[%d] (%u) 類型: %s | 額外效果: %s
+1277: 物品: '%s'/'%s'[%d] (%d) 類型: %s | 額外效果: %s
 1278: None
 1279: With script
 1280: NPC 買價:%dz, 賣價:%dz | 重量: %.1f 
@@ -1341,8 +1342,8 @@
 1370: 用法: ex. "@set PoringCharVarSTR$" outputs its value, Super Duper String.
 1371: NPC variables may not be used with @set.
 1372: Instance variables may not be used with @set.
-1373: %s value is now: %lld
-1374: %s value is now: %s
+1373: %s value is now :%d
+1374: %s value is now :%s
 1375: %s is empty
 //1376: free

@@ -1372,7 +1373,7 @@
 1391: You do not possess a cart to be removed
 1392: Cart Added.

-// atcommand.cpp::is_atcommand
+// atcommand.c::is_atcommand
 1393: 角色死亡時不能使用指令。

 // @clearstorage
--- a/conf/msg_conf/map_msg_frn.conf
+++ b/conf/msg_conf/map_msg_frn.conf
@@ -45,7 +45,7 @@
 24: Job level augmenté.
 25: Job level baissé.
 26: Commandes d'aide:
-//27: free
+27: Commandes d'aide non-disponible.
 28: Aucun Joueur trouvé.
 29: 1 Joueur trouvé.
 30: %d Joueurs trouvés.
@@ -96,7 +96,7 @@
 75: La War of Emperium n'est pas en cours.
 76: Toutes les compétences sont ajoutées à votre arbre de compétence.
 77: Résultat de '%s' (nom: id):
-78: %s: %u
+78: %s: %d
 79: %d résultats sont affichés.
 80: Veuillez donner le nom/id du montre.
 81: Votre niveau de GM ne vous autorise pas à effectuer cette action sur le Joueur spécifié.
@@ -183,7 +183,7 @@
 166: Aucun équipement n'a été raffiné.
 167: 1 objet raffiné.
 168: %d objets raffinés.
-169: L'objet (%u: '%s') ne peut pas s'équiper.
+169: L'objet (%hu: '%s') ne peut pas s'équiper.
 170: L'objet ne peut pas s'équiper.
 171: %d - void
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -449,7 +449,8 @@
 // Homunculus messages
 450: Vous possédez déjà un homunculus

-451: Cash Shop is disabled on this map.
+// Return pet to egg message
+451: Vous ne pouvez pas remettre votre pet dans son oeuf car votre inventaire est plein.

 // Message System
 460: Entrez une langue (usage: @langtype <langue>).
@@ -512,7 +513,7 @@
 537: Personnage '%s' (compte: %d) essaie d'utiliser un bot (il essaie de détecter un faux mob).
 // Trade Spoof Messages
 538: Hack sur échange: Personnage '%s' (account: %d) essaie d'échanger plus d'Objets qu'il ne possède.
-539: Ce Joueur a %d d'une sorte d'Objet (id: %u), et tente d'en échanger %d.
+539: Ce Joueur a %d d'une sorte d'Objet (id: %hu), et tente d'en échanger %d.
 540: Joueur définitivement bloqué.
 // Rare Items Drop/Steal announce
 541: '%s' obtient de %s l'Objet %s (chance: %0.02f%%)
@@ -654,7 +655,7 @@
 666: Pets non-autorisés lors d'une guerre entre guilde.
 667: Vous n'êtes pas mort(e).
 668: Votre position memo actuelle est:
-//669 free
+669: Vous brisez l'arme de la cible.
 670: Vous ne pouvez pas quitter votre guilde.
 671: Cette personne est déjà dans votre liste d'ami.
 672: Nom introuvable dans la liste.
@@ -879,7 +880,7 @@

 // @reloadatcommand
 1036: Erreur à la lecture de groups.conf, reload échoué.
-//1037 free
+1037: Erreur à la lecture de atcommand_athena.conf, reload échoué.

 // @mapinfo
 1038: Entrez un numéro de la liste (usage: @mapinfo <0-3> <map>).
@@ -1055,9 +1056,9 @@
 1189: Objet trouvable.
 1190: Vous ramasser déjà automatiquement cet Objet.
 1191: Votre liste d'Objet à ramasser est pleine. Supprimez des Objets avec @autolootid -<nom_ou_ID_Objet>.
-1192: Ramassage automatique de: '%s'/'%s' {%u}
+1192: Ramassage automatique de: '%s'/'%s' {%hu}
 1193: Actuellement vous ne ramassez pas automatiquement cet Objet.
-1194: Onjet supprimé: '%s'/'%s' {%u} de votre liste de 'autolootitem'.
+1194: Onjet supprimé: '%s'/'%s' {%hu} de votre liste de 'autolootitem'.
 1195: Vous pouvez avoir %d Objets dans votre liste d'Objets ramassés automatiquement avec 'autolootitem'.
 1196: Pour ajouter un Objet à votre liste, utilisez "@alootid +<nom_ou_ID_Objet>". Pour supprimer un Objet de la liste, utilisez "@alootid -<nom_ou_ID_Objet>".
 1197: "@alootid reset" videra votre liste d'Objets ramassés automatiquement avec 'autolootitem'.
@@ -1147,12 +1148,12 @@
 1239: Entrez un nom de monstre/ID (usage: @mobinfo <nom_du_monstre_ou_ID>).
 1240: Monstre MVP: '%s'/'%s'/'%s' (%d)
 1241: Monstre: '%s'/'%s'/'%s' (%d)
-1242:  Lv:%d  HP:%d  Base EXP:%llu  Job EXP:%llu  HIT:%d  FLEE:%d
+1242:  Lv:%d  HP:%d  Base EXP:%u  Job EXP:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Elément: %s (Lv:%d)
 1245:  Drops:
 1246: Ce monstre n'a pas de drops.
-1247:  MVP Bonus EXP:%llu
+1247:  MVP Bonus EXP:%u
 1248:  MVP Items:
 1249: Ce monstre n'a pas de Prix spécial MVP.

@@ -1206,7 +1207,7 @@

 // @iteminfo
 1276: Entrez un nom/ID d'objet (usage: @ii/@iteminfo <nom/ID>).
-1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%hu) Type: %s | Extra Effect: %s
 1278: Aucun
 1279: Avec script
 1280: NPC Acheté:%dz, Vendu:%dz | Poids: %.1f 
@@ -1354,8 +1355,8 @@
 1370: Usage: ex. "@set PoringCharVarSTR$" affiche sa valeur actuelle, Super Duper String.
 1371: Les variables des NPC ne peuvent pas être utilisées/changées avec @set.
 1372: Les variables d'Instance ne peuvent pas être utilisées avec @set.
-1373: %s valeur est maintenant: %lld
-1374: %s valeur est maintenant: %s
+1373: %s valeur est maintenant :%d
+1374: %s valeur est maintenant :%s
 1375: %s est vide
 //1376: free

@@ -1385,7 +1386,7 @@
 1391: Vous ne possédez pas de chariot.
 1392: Chariot ajouté.

-// atcommand.cpp::is_atcommand
+// atcommand.c::is_atcommand
 1393: Les morts ne pouvent pas utiliser de commande.

 // @clearstorage
--- a/conf/msg_conf/map_msg_grm.conf
+++ b/conf/msg_conf/map_msg_grm.conf
@@ -44,7 +44,7 @@
 24: Job Level erhöht.
 25: Job Level verringert.
 26: Hilfsbefehle:
-//27: free
+27: Der help-Befehl ist nicht verfügbar.
 28: Kein Spieler gefunden.
 29: 1 Spieler gefunden.
 30: %d Spieler gefunden.
@@ -95,7 +95,7 @@
 75: War of Emperium ist zur Zeit nicht im Gange.
 76: Alle Fähigkeiten wurden deinem Fähigkeitenbaum hinzugefügt.
 77: Das Ergebnis der Suche nach '%s' lautet (Name: ID):
-78: %s: %u
+78: %s: %d
 79: Es wurden %d Gegenstände gefunden.
 80: Gib bitte den Anzeige-Namen oder die Monster-ID an.
 81: Dein GM-Level berechtigt dich nicht, diese Aktion auf dem angegebenen Spieler auszuführen.
@@ -182,7 +182,7 @@
 166: Kein Items sind refined.
 167: 1 Item ist refined.
 168: %d Items sind refined.
-169: Das Item (%u: '%s') ist nicht ausrüstbar.
+169: Das Item (%d: '%s') ist nicht ausrüstbar.
 170: Das Item ist nicht ausrüstbar.
 171: %d - ungültig
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -407,8 +407,6 @@
 // Homunculus messages
 450: Du hast bereitz ein Homunculus

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

@@ -440,7 +438,7 @@
 537: Charakter '%s' (account: %d) Versucht einen Bot zu benutzen (Es versucht einen fake Mob zu entlarven).
 // Trade Spoof Messages
 538: Hack bei Handel: Charakter '%s' (account: %d) versucht mit mehr Items zu Handeln als er besitzt.
-539: Dieser Spieler hat %d vom folgendem Item (id: %u), und versuchte %d von ihnen zu Handeln.
+539: Dieser Spieler hat %d vom folgendem Item (id: %d), und versuchte %d von ihnen zu Handeln.
 540: Dieser Spieler wurde definitiv blockiert.
 // Rare Items Drop/Steal announce
 541: '%s' got %s's %s (chance: %0.02f%%)
--- a/conf/msg_conf/map_msg_idn.conf
+++ b/conf/msg_conf/map_msg_idn.conf
@@ -41,7 +41,7 @@
 24: Job Level dinaikkan.
 25: Job Level diturunkan.
 26: Bantuan command:
-//27: free
+27: Bantuan command tidak tersedia.
 28: Pemain tidak ditemukan.
 29: 1 pemain ditemukan.
 30: %d pemain ditemukan.
@@ -92,7 +92,7 @@
 75: War of Emperium saat ini tidak sedang berjalan.
 76: Semua skill telah ditambahkan ke skill tree.
 77: Hasil referensi dari '%s' (nama: id):
-78: - %s: %u
+78: - %s: %d
 79: Terdapat %d hal di atas.
 80: Harap berikan nama tampilan atau nama/id monster.
 81: Level GM kamu tidak diizinkan untuk untuk melakukan aksi ini pada pemain tertentu.
@@ -179,7 +179,7 @@
 166: Tidak ada item yang ditempa.
 167: 1 item berhasil ditempa.
 168: %d item berhasil ditempa.
-169: Item (%u: '%s') tidak bisa dipakai.
+169: Item (%hu: '%s') tidak bisa dipakai.
 170: Item ini tidak bisa dipakai.
 171: %d - sudah habis
 //172: Kamu sudah mengganti posisi memo %d - %s (%d,%d).
@@ -459,7 +459,8 @@
 // Pesan-pesan untuk Homunculus
 450: Kamu sudah memiliki homunculus

-451: Cash Shop is disabled on this map.
+// Pesan tentang mengembalikan peliharaan ke telur
+451: Kamu tidak dapat mengembalikan peliharaan kamu karena inventory penuh.

 // Sistem Pesan
 460: Harap masukkan tipe bahasa yang valid. (Penggunaan: @langtype <bahasa>).
@@ -544,7 +545,7 @@

 // Pesan tentang pelanggaran transaksi.
 538: Hack pada transaksi: Karakter '%s' (akun: %d) sedang mencoba mentransaksikan item lebih dari yang dia punya.
-539: Pemain ini memiliki %d jenis item (id: %u), dan sedang mencoba untuk mentransaksikan %d item.
+539: Pemain ini memiliki %d jenis item (id: %hu), dan sedang mencoba untuk mentransaksikan %d item.
 540: Pemain ini sudah diblok.

 // Pesan tentang item langka yang berhasil didapatkan atau dicuri.
@@ -688,7 +689,7 @@
 666: Peliharaan tidak diperbolehkan di Guild Wars.
 667: Kamu tidak mati.
 668: Posisi memomu saat ini adalah:
-//669 kosong
+669: Kamu menghancurkan senajta lawan.
 670: Kamu tidak dapat meninggalkan guild battleground.
 671: Teman sudah ada.
 672: Nama tidak ditemukan di daftar.
@@ -732,17 +733,20 @@
 707: VIP anda berlaku hingga: %s
 708: Status VIP pemain aktif hingga: %s

-709: Item %u telah dihapus dari inventory-mu.
-710: Item %u telah dihapus dari cart-mu.
-711: Item %u telah dihapus dari storage-mu.
+709: Item %hu telah dihapus dari inventory-mu.
+710: Item %hu telah dihapus dari cart-mu.
+711: Item %hu telah dihapus dari storage-mu.

 //Item shop
-712: %s (%u) yang kamu miliki tidak cukup.
+712: %s (%hu) yang kamu miliki tidak cukup.
 713: '%s' yang kamu miliki tidak cukup.
-714: Item Shop: %s (%u)
+714: Item Shop: %s (%hu)
 715: Point Shop: '%s'
 716: '%s' milikmu saat ini: %d

+//Item Group
+717: [%s] mendapatkan [%s] dari '%s'
+
 //@showrate
 718: Informasi mengenai rate pribadi tidak akan ditampilkan lagi.
 719: Informasi mengenai rate pribadi akan ditampilkan kembali.
@@ -966,7 +970,7 @@

 // @reloadatcommand
 1036: Terjadi kesalahan saat membaca groups.conf, tidak berhasil dimuat ulang.
-//1037 free
+1037: Terjadi kesalahan saat membaca atcommand_athena.conf, tidak berhasil dimuat ulang.

 // @mapinfo
 1038: Harap masukkan setidaknya 1 pilihan. (Penggunaan: @mapinfo <0-3> <map>).
@@ -1143,9 +1147,9 @@
 1189: Item tidak ditemukan.
 1190: Kamu sudah mengambil secara otomatis item ini.
 1191: Daftar autolooitem penuh. Hilangkan sebagian terlebih dahulu dengan @autolootid -<nama/ID item>.
-1192: Mengambil item secara otomatis: '%s'/'%s' {%u}
+1192: Mengambil item secara otomatis: '%s'/'%s' {%hu}
 1193: Kamu saat ini sedang tidak mengambil item ini secara otomatis.
-1194: Item dihilangkan: '%s'/'%s' {%u} dari daftar pengambilan otomatismu.
+1194: Item dihilangkan: '%s'/'%s' {%hu} dari daftar pengambilan otomatismu.
 1195: Kamu hanya memiliki item %d di daftarmu.
 1196: Untuk menambahkan item ke daftar, gunakan \"@alootid +<ID atau nama item>\". Untuk menghilangkannya, gunakan \"@alootid -<ID atau nama item>\".
 1197: \"@alootid reset\" akan membersihkan daftar autolootitem.
@@ -1240,7 +1244,7 @@
 1244: ATK:%d~%d  Jarak:%d~%d~%d  Ukuran:%s  Race: %s  Elemen: %s (Lv:%d)
 1245: Barang yang dijatuhkan:
 1246: Monster ini tidak menjatuhkan barang.
-1247: Bonus EXP MVP:%llu
+1247: Bonus EXP MVP:%u
 1248: Item MVP:
 1249: Monster ini tidak memiliki bonus MVP.

@@ -1294,7 +1298,7 @@

 // @iteminfo
 1276: Harap masukkan nama/ID item. (Penggunaan: @ii/@iteminfo <nama/ID item>).
-1277: Item: '%s'/'%s'[%d] (%u) Jenis: %s | Efek tambahan: %s
+1277: Item: '%s'/'%s'[%d] (%hu) Jenis: %s | Efek tambahan: %s
 1278: Tidak ada
 1279: Dengan script.
 1280: NPC Harga Beli:%dz, Harga jual:%dz | Berat: %.1f 
@@ -1442,7 +1446,7 @@
 1370: Contoh penggunaan: \"@set PoringCharVarSTR$\" menampilkan nilainya, Super Duper String.
 1371: Variabel pada NPC tidak boleh digunakan dengan @set.
 1372: Variabel instansi tidak boleh digunakan dengan @set.
-1373: Nilai %s saat ini: %lld
+1373: Nilai %s saat ini: %d
 1374: Nilai %s saat ini: %s
 1375: %s kosong
 //1376: free
@@ -1473,7 +1477,7 @@
 1391: Kamu tidak memiliki keranjang yang akan dihapus.
 1392: Gerobak ditambahkan.

-// atcommand.cpp::is_atcommand
+// atcommand.c::is_atcommand
 1393: Kamu tidak bisa menggunakan perintah ini ketika mati.

 // @clearstorage
--- a/conf/msg_conf/map_msg_mal.conf
+++ b/conf/msg_conf/map_msg_mal.conf
@@ -1,3 +0,0 @@
-
-//Custom translations
-import: conf/msg_conf/import/map_msg_mal_conf.txt
--- a/conf/msg_conf/map_msg_por.conf
+++ b/conf/msg_conf/map_msg_por.conf
@@ -7,7 +7,6 @@
 // msg_number: mensagem traduzida

 // Brazilian Portuguese Translation by mkbu95
-// Brazilian Portuguese Translation by Mahiro

 // If you find any error or typo in this translation, please send me a private message at rAthena.org forums
 // Caso você encontre algum erro de tradução ou gramatical, me envie uma mensagem pessoal no fórum do rAthena.org
@@ -51,7 +50,7 @@
 24: Nível de classe acrescido.
 25: Nível de classe decrescido.
 26: Comandos de ajuda:
-//27: free
+27: Comandos de ajuda não disponível.
 28: Nenhum jogador encontrado.
 29: 1 jogador encontrado.
 30: %d jogadores encontrados.
@@ -102,7 +101,7 @@
 75: A Guerra do Emperium ainda não foi iniciada.
 76: Todas as habilidades foram adicionadas à sua árvore de habilidades.
 77: O resultado da referência à '%s' (nome: id):
-78: %s: %u
+78: %s: %d
 79: Encontrado %d acima.
 80: Entre com o nome de exibição ou nome/id do monstro.
 81: Seu nível de Game Master não autoriza a realização desta ação neste personagem.
@@ -189,7 +188,7 @@
 166: Nenhum item foi refinado.
 167: 1 item foi refinado.
 168: %d itens foram refinados.
-169: O item (%u: '%s') não é equipável.
+169: O item (%hu: '%s') não é equipável.
 170: O item não é equipável.
 171: %d - vazio
 //172: Você substituiu o ponto de memorização %d - %s (%d,%d).
@@ -316,13 +315,6 @@
 290: O jogador não pode ser mais morto.
 291: Efeitos de clima dissipar-se ao mover-se/atualizar-se
 292: Estado de assassino redefinido.
-// Item Bound System
-293: Este item é limitado não pode ser negociado com esse personagem.
-294: Este item é limitado não pode ser armazenado aqui.
-295: Por favor, insira um nome ou ID do item (uso: @item <item name/ID> <quantidade> <tipo de vínculo>).
-296: Por favor, entre com todos os parâmetros (uso: @itembind2 <nome/ID> <quantidade>
-297:   <flag_identidade> <refinamento> <atributo> <carta1> <carta2> <carta3> <carta4> <tipo de vínculo>).
-298: Tipo de limitação inválida. Tipos válidos: 1-Conta, 2-Clã, 3-Grupo, 4-Personagem.
 // Números dos Castelos
 // --------------------
 //299: ?? Castelos
@@ -372,8 +364,7 @@
 347: | Nv:%d/%d | Classe: %s
 //Você pode omiter os dois últimos %d, para que apenas o nome do mapa sem as coordenadas sejam exibidas
 348: | Localização: %s %d %d
-// @fullstrip
-349: Please enter a player name (usage: @fullstrip <char name/ID>).
+
 // @duel (parte 1)
 350: Duelo: Você não pode usar @invite. Você não está em um duelo.
 351: Duelo: O limite de jogadores foi atingido.
@@ -400,21 +391,7 @@
 375:  <- Jogador %s abandonou o duelo --
 376:  -> Jogador %s aceitou o desafio --
 377:  -- Jogador %s não aceitou o desafio --
-//etc
-378: Eleanor está agora no modo %s.
-379: Item falhou. [%s] está em tempo de espera. Aguarde %.1f minutos.
-380: Item falhou. [%s] está em tempo de espera. Aguarde %d segundos.
-381: Habilidade falhou. [% s] requer %dx %s.
-382: Você está muito perto de uma pedra ou emperium para usar essa habilidade.
-383: Você não pode criar um ponto de salvamento em uma instância.
-384: Você não pode criar uma memorização em uma instância.
-//emblem chk
-385: Você não tem permissão para mudar o emblema durante o WOE
-386: O emblema escolhido foi detectado como inválido
-387: O emblema escolhido foi detectado como inválido, pois contém muita transparência (limite=%d)
-//etc
-388: Você não pode usar este item enquanto o armazém estiver aberto.
-389: Velocidade voltou ao normal.
+//378-389 livre
 //NoAsk
 390: Autorejeição ativada.
 391: Autorejeição desativada.
@@ -458,17 +435,12 @@
 430: desbloquear
 431: desbanir
 432: alterar o sexo de
-433: Este personagem foi banido até
-434: Foi solicitado ao servidor de Personagem para %s o personagem '%.*S'.
-435: Por favor insira um nome de jogador (uso: %s <nome do char>).
-436: VIP
-437: GM não pode se tornar VIP.
-438: Você não é mais VIP.

 // Mensagens de homunculus
 450: Você já possui um homunculus

-451: Cash Shop is disabled on this map.
+// Mensagem de retorno do pet ao ovo
+451: Você não pode retornar o seu bichinho de estimação para o ovo pois o seu inventário está lotado.

 // Sistema de Mensagens
 460: Digite um idioma válido (uso: @langtype <idioma>).
@@ -515,56 +487,26 @@
 // Mensagens de tentativa de Spoof em Negociações
 507: Este jogador foi banido por %d minuto(s).
 508: Este jogador não foi banido (opção de banimento desativada).
-
-509: Comandos ligados a script:
+//509 Disponível....

 // Sistema de Correio
+//----------------------
 510: Você possui %d novas mensagens (%d não lidas).

-// Instancing
-515: Sua instância foi recarregada.
-516: O banco de dados de instâncias foi recarregado.
-
-// @auction
-517: Sistema de Leilão está desativado.
-
-// @itemlist -- continued
-518: Lower Costume Head, 
-519: Top Costume Head, 
-520: Top/Lower Costume Head, 
-521: Mid Costume Head, 
-522: Mid/Lower Costume Head, 
-523: Top/Mid/Lower Costume Head, 
-524: Costume Robe, 
-525: Costume Floor, 
-526: Ammo, 
-527: Shadow Body, 
-528: Shadow Right Hand, 
-529: Shadow Left Hand, 
-530: Shadow Both Hands, 
-531: Shadow Shoes, 
-532: Shadow Right Accessory, 
-533: Shadow Left Accessory, 
-
-534: Loja está sem estoque! Por favor, volte mais tarde.
-
 // Mensagens de detecção de Bot (atualmente não usadas)
 535: Possível uso de BOT (99%% de chance) ou client modificado por '%s' (account: %d, char_id: %d). Este jogador pediu o seu nome enquanto você estava escondido.
 536: Personagem '%s' (account: %d) está tentando utilizar um bot (tentativa de detecção de jogador falso).
 537: Personagem '%s' (account: %d) está tentando utilizar um bot (tentativa de detecção de monstro falso).
-
 // Mensagens de tentativa de Spoof em Negociações
 538: Hack em negociação: personagem '%s' (account: %d) tentou negociar mais itens que possuía.
-539: Este jogador possui %d unidades de um item (id: %u), e tentou negociar %d destes.
+539: Este jogador possui %d unidades de um item (id: %hu), e tentou negociar %d destes.
 540: Este jogador foi bloqueado indefinidamente.
-
 // Anúncio de drop de Itens Raros/Furtar
 541: '%s' conseguiu %s's %s (chance: %0.02f%%)
 //541: %.0s%.0sAlguém conseguiu %s
 542: '%s' furtou %s's %s (chance: %0.02f%%)
 //542: %.0s%.0sAlguém furtou %s
 // 543~548 não são usadas (previamente usadas por @away)
-
 // @Autotrade
 549: Você deve abrir uma venda antes de usar @autotrade.

@@ -605,18 +547,14 @@
 583: Sumo-Sacerdote
 584: Arquimago
 585: Mestre-Ferreiro
-//
 586: Atirador de Elite
 587: Algoz
 588: Paladino
 589: Mestre
 590: Professor
-//
 591: Desordeiro
 592: Criador
-//
 593: Menestrel
-//
 594: Cigana
 595: Mini Aprendiz
 596: Mini Espadachim
@@ -657,11 +595,9 @@
 631: Guardião Real
 632: Feiticeiro
 633: Trovador
-//
 634: Musa
 635: Shura
 636: Bioquímico
-//
 637: Renegado
 638: Mini Cavaleiro Rúnico
 639: Mini Arcano
@@ -699,7 +635,7 @@
 666: Bichinhos de estimação não são permitidos na Guerra de Clãs.
 667: Você não está morto.
 668: Seu ponto de retorno atual é:
-//669 livre
+669: Você quebrou a arma de seu oponente.
 670: Você não pode deixar os campos de batalha em uma guerra.
 671: Amigo já existente.
 672: Nome não encontrado na lista.
@@ -733,135 +669,14 @@
 698: Baby Summoner
 699: Baby Ninja

-// @vip
-700: Uso: @vip <time> <character name>
-701: Tempo inválido para o comando VIP.
-702: O formato do parâmetro de tempo é +/- <valor> para alterar. y/a = Ano, m = Mês, d/j = Dia, h = Hora, n/mn = Minuto, s = Segundo.
-703: GM removeu seu tempo VIP.
-704: O jogador não é mais VIP.
-705: Seu status VIP é válido para %d anos, %d meses, %d dias, %d horas e %d minutos.
-706: O jogador '% s' agora é VIP por %d anos, %d meses, %d dias, %d horas e %d minutos.
-707: Você é VIP até: %s
-708: O jogador agora é VIP até: %s
-
-709: Item %u foi removido do seu inventário.
-710: Item %u foi removido do seu carrinho.
-711: Item %u foi removido do seu armazém.
-
-// Item shop
-712: Você não possui %s suficiente (%u).
-713: Você não tem '%s' suficiente.
-714: Lista de Loja de Itens: %s (%u)
-715: Lista de loja de pontos: '%s'
-716: Seu '%s' agora é: %d
-// MVP EXP reward message
-717: Parabéns! Você é o MVP! Sua recompensa EXP Points are %llu !!
-
-// @showrate
-718: As informações de taxa pessoal não são exibidas agora.
-719: A informação da taxa pessoal será mostrada.
-
-//Skill messages
-//720: Free
-721: [%s] O efeito de veneno foi aplicado à arma.
-//722: Free
-
-// @costume
-723: '%s' é um traje desconhecido
-724: Você já está vestindo um traje (n) '%s', digite '@costume' para removê-lo.
-725: -- %s
-726: - Trajes Disponíveis
-727: Traje '%s' removido.
-
-// Monster Transformation
-728: Traaaansformação-!! %s forma!!
-729: Não é possível transformar em monstro enquanto disfarçado.
-730: O personagem não pode ser disfarçado enquanto estiver em forma de monstro.
-731: Transformar em monstro não é permitido em GvG.
-
-732: O item não pode ser aberto quando o seu inventário está cheio.
-
-733: Por favor insira um nome de arquivo NPC (uso: @reloadnpcfile <nome do arquivo>).
-
-// @cloneequip/@clonestat
-734: Não é possível clonar seus próprios %s.
-735: Uso: %s <nome do char/ID>
-736: Não é possível clonar %s deste player.
-737: '%s' (%d) não pode ser clonado, limite (%d).
-738: Clone '%s' está pronto.
-
-// @bodystyle
-739: Por favor, insira um estilo de corpo (uso: @bodystyle <ID do corpo: %d-%d>).
-740: Este Job não possui estilos de corpo alternativos.
-
-// @showexp
-741: Ganho
-742: Perda
-743: Experiência %s Base:%ld (%0.2f%%) Job:%ld (%0.2f%%)
-
-// @adopt
-744: Bebê já adotado ou em processo de adoção.
-745: Você precisa se casar e participar de um Grupo com seu parceiro e o bebê para adotar.
-746: Ambos os pais precisam ter seus anéis de casamento equipados.
-747: O bebê não é um novato.
-748: Um parente ou Bebê não foi encontrado.
-
-// WoE TE (@agitstart3/@agitend3)
-749: Guerra do Emperium TE foi iniciado.
-750: Guerra do Emperium TE está atualmente em andamento.
-751: Guerra do Emperium TE foi encerrado.
-752: Guerra do Emperium TE atualmente não está em andamento.
-
 // Expanded Baby Jobs
-753: Bebê Kagerou
-754: Bebê Oboro
-755: Bebê Taekwon
-756: Bebê Star Gladiator
-757: Bebê Soul Linker
-758: Bebê Justiceiro
-759: Bebê Renegado
-
-// Channel System
-760: Você não pode ingressar no canal '%s'. Limite de %d foi cumprido.
-761: %s %s se juntou.
-762: Você não pode deixar o canal '%s'.
-763: %s %s restantes.
-764: Você não pode alterar a cor do canal '%s'.
-765: Você não tem permissão para banir um jogador.
-766: Você não pode chutar um jogador do canal '%s'.
-767: Você não tem permissão para chutar um jogador.
-768: %s %s foi chutado.
-769: %s %s foi banido.
-770: %s %s foi desbanido.
-
-//@reloadachievementdb
-771: O banco de dados de Conquistas foi recarregado.
-
-// Achievements
-772: Conquistas estão desativadas.
-
-//773-775 reserved for refine UI
-//776-781 reserved for tax system
-
-782: Star Emperor
-783: Soul Reaper
-784: Baby Star Emperor
-785: Baby Soul Reaper
-
-// Guild Storage Expansion Skill
-786: A guilda não possui armazenamento de guilda.
-787: Você não tem permissão para usar o armazenamento da guilda.
-
-// Attendance
-// Mail sender: Officer
-788: <MSG>3455</MSG>
-// Mail title: %dday attendance has been paid.
-789: <MSG>3456,%d</MSG>
-// Mail body: %dday attendance has been paid.
-790: <MSG>3456,%d</MSG>
-791: Você não tem permissão para usar o sistema de atendimento.
-
-//792-899 free
+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
@@ -1015,9 +830,6 @@
 // @charunblock
 1024: Digite o nome de um jogador (uso: @charunblock <nome do personagem>).

-// @recall
-1025: O jogador está atualmente autotrade e não pode ser chamado.
-
 // @kick
 1026: Digite o nome de um jogador (uso: @kick <nome do personagem/ID>).

@@ -1048,7 +860,7 @@

 // @reloadatcommand
 1036: Erro na leitura do grups.conf, recarregamento falhou.
-//1037 free
+1037: Erro na leitura do atcommand_athena.conf, recarregamento falhou.

 // @mapinfo
 1038: Digite pelo menos um número válido da lista (uso: @mapinfo <0-3> <mapa>).
@@ -1065,8 +877,7 @@
 1049: Flags de Clima: 
 1050: Outras Flags: 
 1051: Outras Flags2:
-1052: Skill Damage Adjustments:
-//1053-1064 free
+//1052-1064 free
 1065: Sem Penalidade de Exp: %s | Sem Penalidade de Zeny: %s
 1066: Habilitado
 1067: Desabilitado
@@ -1075,6 +886,7 @@
 1070: Sem Salvo, Ponto de Retorno: %s,%d,%d
 

+
 // @mount
 1119: Você montou um Dragão.
 1120: Você desmontou de seu Dragão.
@@ -1225,9 +1037,9 @@
 1189: Item não encontrado.
 1190: Você já está autorrecolhendo este item.
 1191: Sua lista de autorrecolhimento está cheia. Remova alguns itens com @autolootid -<nome ou ID do item>.
-1192: Autorrecolhendo item: '%s'/'%s' {%u}
+1192: Autorrecolhendo item: '%s'/'%s' {%hu}
 1193: Você atualmente não está autorrecolhendo este item.
-1194: Removido item: '%s'/'%s' {%u} da sua lista de autorrecolhimento.
+1194: Removido item: '%s'/'%s' {%hu} da sua lista de autorrecolhimento.
 1195: Você pode possuir %d itens na sua lista de autorrecolhimento.
 1196: Para adicionar um item a lista, use "@alootid +<nome ou ID do item>". Para remover um item, use "@alootid -<nome ou ID do item>".
 1197: "@alootid reset" irá limpar a sua lista de autorrecolhimento.
@@ -1317,12 +1129,12 @@
 1239: Digite o nome de um monstro/ID (uso: @mobinfo <nome_ou_ID_do_monstro>).
 1240: Monstro MVP: '%s'/'%s'/'%s' (%d)
 1241: Monstro: '%s'/'%s'/'%s' (%d)
-1242:  Nv:%d  HP:%d  EXP Base:%llu  EXP Classe:%llu  HIT:%d  ESQV:%d
+1242:  Nv:%d  HP:%d  EXP Base:%u  EXP Classe:%u  HIT:%d  ESQV:%d
 1243:  DEF:%d  DEFM:%d  FOR:%d  AGI:%d  VIT:%d  INT:%d  DES:%d  SOR:%d
 1244:  ATQ:%d~%d  Alcance:%d~%d~%d  Tamanho:%s  Raça: %s  Elemento: %s (Nv:%d)
 1245:  Drops:
 1246: Este monstro não possui drops.
-1247:  EXP Bônus MVP:%llu
+1247:  EXP Bônus MVP:%u
 1248:  Itens MVP:
 1249: Este monstro não possui prêmios MVP.

@@ -1376,7 +1188,7 @@

 // @iteminfo
 1276: Digite o nome/ID de um item (uso: @ii/@iteminfo <nome do item/ID>).
-1277: Item: '%s'/'%s'[%d] (%u) Tipo: %s | Efeito Extra: %s
+1277: Item: '%s'/'%s'[%d] (%hu) Tipo: %s | Efeito Extra: %s
 1278: Nenhum
 1279: Com script
 1280: NPC Compra:%dz, Venda:%dz | Peso: %.1f 
@@ -1524,8 +1336,8 @@
 1370: Uso: ex. "@set PoringCharVarSTR$" exibe seu valor, Super Duper String.
 1371: Variáveis de NPC não podem ser usadas com @set.
 1372: Variáveis de instância não podem ser usadas com @set.
-1373: %s valor agora é: %lld
-1374: %s valor agora é: %s
+1373: %s valor agora é :%d
+1374: %s valor agora é :%s
 1375: %s é vazia
 //1376: free

@@ -1555,7 +1367,7 @@
 1391: Você não possui um carrinho para remover
 1392: Carrinho Adicionado.

-// atcommand.cpp::is_atcommand
+// atcommand.c::is_atcommand
 1393: Você não pode utilizar comandos caso esteja morto.

 // @clearstorage
@@ -1651,51 +1463,8 @@
 1475: ---- Meus Canais ----
 1476: Você ainda não está em nenhum canal.

-// @effect
-1477: Por favor insira um id de efeito válido no intervalo de %d a %d.
-
-// @partysharelvl
-1478: A faixa de nível de compartilhamento de Grupos foi alterada com sucesso.
-1479: Falha ao atualizar a configuração. O servidor de caracteres está offline.
-
-// @autoloottype
-1480: Tipo de item não encontrado.
-1481: Você já está autolotando este tipo de item.
-1482: Sua lista de autoloot tem todos os tipos de itens. Você pode remover alguns itens com @autoloottype - <nome do tipo ou ID>.
-1483: Tipo de item de autolifting: '%s' {%d}
-1484: Você não está atualmente fazendo autoloot deste tipo de item.
-1485: tipo de item removido: '%s' {%d} da sua lista de autoloot.
-1486: Para adicionar um tipo de item à lista, use "@aloottype + <nome do tipo ou ID>". Para remover um tipo de item, use "@aloottype - <type name or ID>".
-1487: Tipo de Lista: cura = 0, utilizável = 2, etc = 3, armadura = 4, arma = 5, carta = 6, petegg = 7, petarmor = 8, munição = 10
-1488: "@aloottype reset" irá limpar sua lista de autoloot.
-1489: Sua lista de autoloot está vazia.
-1490: Tipos de item na sua lista de autoloot:
-1491: Sua lista de autoloot foi redefinida.
-
-// @dropall
-1492: Uso: @dropall {<type>}
-1493: Tipo de Lista: (padrão) all = -1, cura = 0, utilizável = 2, etc = 3, armadura = 4, arma = 5, carta = 6, petegg = 7, petarmor = 8, munição = 10
-1494: %d itens são descartados (%d ignorados)!
-
-// Banking
-1495: Você não pode retirar tanto dinheiro
-1496: Banco está desativado
-
-// Roulette
-1497: Roleta está desabilitada
-
 // @guild
-1498: Você não pode criar uma guilda porque você está em um clã.
-
-// @clanspy
-1499: Por favor insira um nome/ID de clã (uso: @clanspy <nome_do_clan/ID>).
-1500: Não mais espionando o clã %s.
-1501: Espionando o clã %s.
-1502: Nome/ID do clã incorreto.
-
-// PK Mode msgs
-1503: Você entrou em uma Zona PK.
-1504: Você entrou em uma Zona PK (segura até o nível %d).
+1498: You cannot create a guild because you are in a clan.

 //Custom translations
 import: conf/msg_conf/import/map_msg_por_conf.txt
--- a/conf/msg_conf/map_msg_rus.conf
+++ b/conf/msg_conf/map_msg_rus.conf
@@ -43,7 +43,7 @@
 24: Уровень профессии повышен.
 25: Уровень профессии снижен.
 26: Подсказки для команд:
-//27: free
+27: Подсказки для команд не доступны.
 28: Игроки не найдены.
 29: Найден 1 игрок.
 30: Найдено %d игрока(ов).
@@ -94,7 +94,7 @@
 75: Война за Империум в настоящее время не идёт.
 76: Все навыки добавлены в дерево умений.
 77: Результаты поиска '%s' (название: ID):
-78: %s: %u
+78: %s: %d
 79: Всего найдено %d результатов.
 80: Введите отображаемое имя или ID/название монстра.
 81: Ваши права Администратора не позволяют выполнять данное действие на указанного игрока.
@@ -181,7 +181,7 @@
 166: Ни один предмет не был заточен.
 167: 1 предмет заточен.
 168: %d предметов заточено.
-169: Предмет (%u: '%s') невозможно надеть.
+169: Предмет (%hu: '%s') невозможно надеть.
 170: Предмет невозможно надеть.
 171: %d - пусто
 //172: НЕ ИСПОЛЬЗУЕТСЯ
@@ -449,7 +449,8 @@
 // Сообщения команды @makehomun
 450: У вас уже есть гомункулус

-451: Cash Shop is disabled on this map.
+// Возвращение питомца в яйцо
+451: Вы не можете вернуть питомца в яйцо, потому что ваш инвентарь забит.

 // @langtype
 460: Введите существующий язык (Используйте: @langtype <язык>).
@@ -512,7 +513,7 @@
 537: Персонаж '%s' (account: %d) пытается использовать бота (попытка определения поддельного монстра).
 // Сообщения о хаках при торгах
 538: Хак при торге: персонаж '%s' (account: %d) попытался выменять больше предметов чем у него есть.
-539: У игрока есть %d штук (id: %u), и пытался выменять %d из них.
+539: У игрока есть %d штук (id: %hu), и пытался выменять %d из них.
 540: Этот игрок был навсегда заблокирован.
 // Объявления о выбивании/краже редких предметов
 541: '%s' выбил %s's %s (шанс: %0.02f%%)
@@ -654,7 +655,7 @@
 666: Питомцы запрещены во время Войны за Империум.
 667: Вы не мертвы.
 668: Ваши текущие точки сохранения:
-//669 НЕ ИСПОЛЬЗУЕТСЯ
+669: Вы сломали оружие цели.
 670: Вы не можете покинуть БГ.
 671: Друг уже добавлен.
 672: Имя не найдено в списке.
@@ -880,7 +881,7 @@

 // @reloadatcommand
 1036: Ошибка чтения файла groups.conf, перезагрузка не удалась.
-//1037 free
+1037: Ошибка чтения файла atcommand_athena.conf, перезагрузка не удалась.

 // @mapinfo
 1038: Введите хотя бы один номер (Использование: @mapinfo <0-3> <локация>).
@@ -1055,9 +1056,9 @@
 1189: Предмет не найден.
 1190: Этот предмет вы уже собираете автоматически.
 1191: Список автоматической сборки полон. Удалите некоторые предметы через команду @autolootid -<ID/название предмета>.
-1192: Автоматическое поднятие предмета: '%s'/'%s' {%u}
+1192: Автоматическое поднятие предмета: '%s'/'%s' {%hu}
 1193: Этот предмет вы не собираете автоматически.
-1194: Предмет: '%s'/'%s' {%u} удалён из списка автоматической сборки предметов.
+1194: Предмет: '%s'/'%s' {%hu} удалён из списка автоматической сборки предметов.
 1195: Вы можете иметь %d предметов в списке автоматической сборки предметов.
 1196: Чтобы добавить предмет в список используйте "@alootid +<ID/название предмета>". Чтобы удалить предмет из списка: "@alootid -<ID/название предмета>".
 1197: Команда "@alootid reset" очистит список.
@@ -1147,12 +1148,12 @@
 1239: Введите ID/название монстра (Использование: @mobinfo <ID/название монстра>).
 1240: MVP монстр: '%s'/'%s'/'%s' (%d)
 1241: Монстр: '%s'/'%s'/'%s' (%d)
-1242:  Ур.:%d  HP:%d  Базовый опыт:%llu   Проф. опыт:%llu  HIT:%d  FLEE:%d
+1242:  Ур.:%d  HP:%d  Базовый опыт:%u   Проф. опыт:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Дальность:%d~%d~%d  Размер:%s  Раса: %s  Элемент: %s (Ур.:%d)
 1245:  Предметы:
 1246: С этого монстра не падают предметы.
-1247:  MVP бонус к опыту:%llu
+1247:  MVP бонус к опыту:%u
 1248:  MVP предметы:
 1249:  Этот монстр не имеет MVP призов.

@@ -1206,7 +1207,7 @@

 // @iteminfo
 1276: Введите ID/название предмета (Использование: @ii/@iteminfo <ID/название предмета>).
-1277: Предмет: '%s'/'%s'[%d] (%u) Тип: %s | Доп. эффект: %s
+1277: Предмет: '%s'/'%s'[%d] (%hu) Тип: %s | Доп. эффект: %s
 1278: Пусто
 1279: Скрипт
 1280: НИП покупка:%d зени, продажа:%d зени | Вес: %.1f 
@@ -1354,8 +1355,8 @@
 1370: Использование: прим. "@set PoringCharVarSTR$" будет иметь значение "Super Duper String".
 1371: Переменные НИП не могут быть использованы командой @set.
 1372: Переменные групп не могут быть использованы командой @set.
-1373: %s значение: %lld
-1374: %s значение: %s
+1373: %s значение :%d
+1374: %s значение :%s
 1375: %s пусто
 //1376: free

@@ -1385,7 +1386,7 @@
 1391: У вас нет телеги.
 1392: Телега добавлена.

-// atcommand.cpp::is_atcommand
+// atcommand.c::is_atcommand
 1393: Вы не можете использовать команды когда мертвы.
 
 // @clearstorage
--- a/conf/msg_conf/map_msg_spn.conf
+++ b/conf/msg_conf/map_msg_spn.conf
@@ -2,16 +2,20 @@
 // Configuración de mensajes
 // Si vas a traducirlo simplemente tienes que cambiar el msg de la segunda línea, no tienes que modificar el código fuente,
 // aunque también puedes utilizar conf/import/map_msg_spn_conf.txt
-// 
-// Formato:
-// msg_number: mensaje traducido (tamaño máximo: 255 caracteres)
-//
+// El formato es el siguiente:
+// // Mensaje en inglés
+// msg_number: mensaje traducido
+
+// Del 0 al 410 están reservados para comandos de GM (Game Master)
+// Del 500-900 están reservados para otros usos
+// Del 900 al 1300 son mensajes de @atcommand
+
 // Si quieres desactivar una variable (%s) de una cadena de texto, haz que su tamaño máximo sea 0:
 // Por ejemplo:
 // 270: *%s %s* (Este es el formato de texto para el comando @me)
 // 270: *%.0s%s* (Si pones esto no se mostrará el nombre del personaje)

-// Mensajes de comandos de GM
+// Aquí empiezan los mensajes relacionados con los comandos de GM
 // -----------------------

 0: Te has teletransportado.
@@ -41,7 +45,7 @@
 24: Has aumentado tu nivel de oficio.
 25: Has disminuido tu nivel de oficio.
 26: Ayuda sobre comandos:
-//27: free
+27: No hay ninguna ayuda disponible.
 28: No se ha encontrado ningún jugador.
 29: Se ha encontrado 1 jugador.
 30: Se han encontrado %d jugadores.
@@ -86,13 +90,13 @@
 69: Has reducido el nivel de oficio de ese personaje.
 70: Has adquirido esa habilidad.
 71: Has olvidado esa habilidad.
-72: Ha comenzado la guerra de clanes.
-73: En estos momentos ya hay una guerra de clanes.
-74: La guerra de clanes ha finalizado.
-75: En estos momentos no hay ninguna guerra de clanes.
+72: Ha comenzado la Guerra del Emperium.
+73: En estos momentos ya hay una Guerra del Emperium.
+74: La Guerra del Emperium ha finalizado.
+75: En estos momentos no hay ninguna Guerra del Emperium.
 76: Se han añadido todas las habilidades a tu árbol de habilidades.
 77: Estos son los resultados de la búsqueda de '%s' (nombre: ID):
-78: %s: %u
+78: %s: %d
 79: Total de resultados: %d
 80: Debes introducir el nombre del monstruo o su ID.
 81: Tu nivel de GM no te permite utilizar este comando en ese jugador.
@@ -127,9 +131,9 @@
 110: El NPC ha sido cargado con éxito.
 111: Ese NPC no existe.
 112: El NPC ha sido desactivado.
-113: Un GM te ha eliminado esta cantidad de objetos: %d.
-114: Objetos eliminados del jugador: %d.
-115: Objetos eliminados: %d. El jugador sólo tenía %d de %d objetos.
+113: Un GM te ha eliminado %d objeto(s).
+114: Se han eliminado %d objeto(s) del jugador.
+115: Se han eliminado %d objeto(s). El jugador sólo tenía %d de %d objetos.
 116: Ese personaje no tiene el objeto que has introducido.
 117: Un GM te ha enviado a la cárcel.
 118: Has enviado al jugador a la cárcel.
@@ -154,7 +158,7 @@
 141: Has quitado el disfraz de ese personaje.
 142: Ese personaje no lleva ningún disfraz.
 143: No puedes utilizar ese comando en este mapa.
-144: La dirección de correo electrónico no es válida, si no sabes cuál es prueba a@a.com
+144: La dirección de correo electrónico no es válida, si no sabes cual es prueba a@a.com
 145: La dirección de correo electrónico no es válida. Introduce una de verdad.
 146: Debes introducir una dirección de correo electrónico de verdad.
 147: La nueva dirección de correo electrónico debe ser distinta a la actual.
@@ -179,7 +183,7 @@
 166: No se ha refinado ningún objeto.
 167: Se ha refinado 1 objeto.
 168: Se han refinado %d objetos.
-169: El objeto (%u: '%s') no puede ser equipado.
+169: El objeto (%hu: '%s') no puede ser equipado.
 170: No puedes equiparte ese objeto.
 171: %d - vacío
 //172: Has reemplazado tu lugar memorizado %d - %s (%d,%d).
@@ -255,7 +259,7 @@
 242: Ahora cualquier jugador puede atacarte.
 243: Ya no se pueden utilizar habilidades en este mapa.
 244: Ahora se pueden utilizar habilidades en este mapa.
-245: Tiempo de conexión del servidor: Días: %ld. Horas: %ld. Minutos: %ld. Segundos: %ld.
+245: El servidor lleva en marcha %ld días, %ld horas, %ld minutos, %ld segundos.
 246: Tu nivel de GM no está autorizado para realizar esa acción.
 247: No tienes permiso para ir a ese mapa.
 248: No tienes permiso para salir de este mapa.
@@ -306,13 +310,6 @@
 290: Ahora nadie puede atacar a ese jugador.
 291: Los efectos climáticos desaparecerán al teletransportarse o al utilizar @refresh.
 292: Has restablecido la condición de asesino.
-// Sistema de ligado de objetos
-293: Este objeto está ligado y no puede intercambiarse.
-294: Este objeto está ligado y no puede almacenarse.
-295: Introduce el nombre de un objeto o su ID (instrucciones: @item <nombre/ID> <cantidad> <ligado>).
-296: Introduce todos los parámetros (instrucciones: @item2 <nombre/ID> <cantidad>)
-297:   <identificado> <refinamiento> <atributo> <carta1> <carta2> <carta3> <carta4> <ligado>).
-298: El ligado del objeto no es válido. Tipos válidos: 1-Cuenta, 2-Clan, 3-Grupo, 4-Personaje.
 // Número de los castillos
 // --------------------
 //299: ?? castillos
@@ -355,15 +352,14 @@

 //Plantillas para el resultado de @who
 343: Nombre: %s
-344:  (%s)
+344: (%s)
 345: | Grupo: '%s'
 346: | Clan: '%s'
 //Si eliminas el último %s no verás el oficio de tus jugadores.
 347: | Nv:%d/%d | Oficio: %s
 //Si eliminas los 2 últimos %d no verás las coordenadas de tus jugadores, tan solo el nombre el mapa donde están
 348: | Ubicación: %s %d %d
-// @fullstrip
-349: Introduce el nombre de un jugador (instrucciones: @fullstrip <personaje/ID>).
+
 // @duel (1ª parte)
 350: Duelo: No puedes usar @invite porque no estás en un duelo.
 351: Duelo: Se ha alcanzado el límite máximo de jugadores para este duelo.
@@ -396,15 +392,7 @@
 380: Ha ocurrido un error. El objeto [%s] no puede usarse todavía. Espera %d segundos.
 381: La habilidad ha fallado. Para utilizar [%s] necesitas %dx %s.
 382: Estás demasiado cerca de un emperium o una piedra guardián.
-383: No puedes crear un punto de guardado en una instancia.
-384: No puedes hacer memo en una instancia.
-//Comprobación de emblemas
-385: No se puede cambiar el emblema durante una guerra de clanes.
-386: El emblema que has elegido no es válido.
-387: El emblema que has elegido tiene demasiada transparencia (límite=%d)
-//etc
-388: No puedes utilizar este objeto con el almacén abierto.
-389: La velocidad ha vuelto a la normalidad.
+//383-389 vacíos
 //NoAsk (rechazar invitaciones)
 390: Rechazas todas las invitaciones de manera automática.
 391: Ya no rechazas todas las invitaciones de manera automática.
@@ -418,11 +406,11 @@
 400: Instrucciones @jailfor <tiempo> <nombre del personaje>
 401: Tu pena de prisión es de %d años, %d meses, %d días, %d horas y %d minutos.
 402: %s estará en la cárcel durante %d años, %d meses, %d días, %d horas y %d minutos.
-// WoE SE (@agitstart2) guerra de clanes, 2ª edición.
-403: Ha dado comienzo la guerra de clanes de la 2ª edición.
-404: Hay una guerra de clanes de la 2ª edición en marcha.
-405: Ha finalizado la guerra de clanes de la 2ª edición.
-406: No hay ninguna guerra de clanes de la 2ª edición en marcha.
+// WoE SE (@agitstart2) Guerra del Emperium, 2ª edición.
+403: Ha dado comienzo la Guerra del Emperium de la 2ª edición.
+404: Hay una Guerra del Emperium de la 2ª edición en marcha.
+405: Ha finalizado la Guerra del Emperium de la 2ª edición.
+406: No hay ninguna Guerra del Emperium de la 2ª edición en marcha.
 //407 free
 //Mensajes de chrif
 408: Necesitas desconectarte para realizar el cambio de sexo.
@@ -448,20 +436,15 @@
 430: desbloquear
 431: desbloquear
 432: cambiar el sexo de
-433: Este personaje tiene el acceso bloqueado hasta 
-434: El char-server va a %s al personaje '%.*s'.
-435: Introduce el nombre de un jugador (instrucciones: %s <nombre de personaje>).
-436: VIP
-437: Un GM no puede ser VIP.
-438: Ya no eres VIP.

 // Mensajes de homúnculos
 450: Ya tienes un homúnculo.

-451: Cash Shop is disabled on this map.
+// Return pet to egg message
+451: No puedes devolver tu pet al huevo porque tu inventario está lleno.

 // Sistema de mensajería
-460: Introduce un idioma válido (instrucciones: @langtype <idioma>)
+460: Introduce un idioma válido (Instrucciones: @langtype <idioma>)
 461: Has establecido %s como idioma.
 462: Ese idioma está desactivado.
 463: Se ha actualizado la configuración de los mensajes.
@@ -475,7 +458,7 @@
 485:    Usuarios: %d/%d | Contraseña: %s | Abierto: %s
 486: Sí
 487: No
-488: Introduce un valor de la lista (instrucciones: @mapinfo <0-3> <mapa>).
+488: Introduce un valor de la lista (Instrucciones: @mapinfo <0-3> <mapa>).
 489: NPC %d: %s::%s | Dirección: %s | Sprite: %d | Ubicación: %d %d
 490: NPC %d: %s | Dirección: %s | Sprite: %d | Ubicación: %d %d
 491: Norte
@@ -496,65 +479,35 @@
 503: Está activado el modo nocturno.

 //Mensajes de los puntos de cash
-504: Puntos utilizados: Kafra: %d. Cash: %d. Puntos restantes: Kafra: %d. Cash: %d.
-505: Puntos de cash obtenidos: %d. Puntos totales: %d.
-506: Puntos de Kafra obtenidos %d. Puntos totales: %d.
-410: Puntos de cash eliminados: %d. Puntos restantes: %d.
-411: Puntos de Kafra eliminados: %d. Puntos restantes: %d.
+504: Has utilizado %d puntos Kafra y %d puntos de cash. Te quedan %d puntos Kafra y %d puntos de cash.
+505: Has obtenido %d puntos de cash. Tienes un total de %d puntos.
+506: Has obtenido %d puntos Kafra. Tienes un total de %d puntos.
+410: Se han eliminado %d puntos de cash. Quedan %d puntos.
+411: Se han eliminado %d puntos Kafra. Quedan %d puntos.

-// Bloqueo de personajes
-507: Este jugador ha sido bloqueado durante estos minutos: %d.
-508: Este jugador no ha sido bloqueado (el bloqueo está desactivado).
-
-509: Comandos de scripts ligados:
+// Mensajes del sistema de intercambio de objetos
+507: Este jugador ha sido expulsado durante %d minuto(s).
+508: Este jugador no ha sido expulsado (La opción está desactivada).
+//509 vacío

 // Sistema de correo
-510: Correos nuevos: %d (%d sin leer).
-
-//Instancing
-515: Tu instancia se ha recargado.
-516: Se ha recargado la base de datos de instancias.
-
-// @auction
-517: El sistema de subastas está desactivado.
-
-//@itemlist -- continuación
-518: Adorno para la boca,
-519: Adorno para la cabeza,
-520: Adorno para la cabeza y la boca,
-521: Adorno para los ojos,
-522: Adorno para ojos y boca,
-523: Adorno para toda la cara,
-524: Ropa decorativa,
-525: Suelo decorativo,
-526: Armadura,
-527: Cuerpo sombrío,
-528: Mano derecha sombría,
-529: Mano izquierda sombría,
-530: Sombra en ambas manos,
-531: Zapatos sombríos,
-532: Accesorio derecho sombrío,
-533: Accesorio izquierdo sombrío,
-
-534: ¡No quedan existencias! Vuelve más tarde.
+//----------------------
+510: Tienes un total de %d cartas nuevas (%d sin leer).

 // Mensajes de detección de bots (sin uso)
 535: Se ha detectado un posible bot (99% de probabilidades) o un cliente modificado: '%s' (cuenta: %d, char_id: %d). Este jugador te pregunta el nombre si estás escondido.
 536: El personaje '%s' (cuenta: %d) está intentando utilizar un bot (intentando detectar a un jugador falso).
 537: El personaje '%s' (cuenta: %d) está intentando utilizar un bot (intentando detectar a un monstruo falso).
-
 // Mensajes del sistema de intercambio de objetos
 538: Se ha detectado una irregularidad en el intercambio de objetos del personaje '%s' (cuenta: %d), está intentando intercambiar más de lo que tiene.
-539: Ese jugador tiene %d unidades del objeto (id: %u), pero ha intentado intercambiar %d.
+539: Ese jugador tiene %d unidades del objeto (id: %hu), pero ha intentado intercambiar %d.
 540: Ese jugador ha sido bloqueado.
-
 // Anuncios de consecución de objetos poco comunes y robos de objetos.
 541: '%s' ha conseguido de %s un %s (probabilidad: %0.02f%%)
 //541: %.0s%.0s alguien ha conseguido %s
 542: '%s' ha robado de %s un %s (probabilidad: %0.02f%%)
 //542: %.0s%.0s alguien ha robado%s
 //543~548 no se utilizan (pertenecían a @away)
-
 // @autotrade
 549: Debes abrir una tienda para poder utilizar @autotrade.

@@ -686,21 +639,22 @@
 663: Duelo: No puedes utilizar ese objeto en pleno duelo.
 664: No puedes utilizar ese comando estando muerto.
 665: No puedes crear una sala de chat en este mapa.
-666: Las mascotas están prohibidas en la guerra de clanes.
+666: Las mascotas están prohibidas en la Guerra del Emperium.
 667: No estás muerto.
 668: Tus puntos de memorización actuales son los siguientes:
-//669 vacío
+669: Has roto el arma de tu enemigo.
 670: No puedes abandonar un clan especial de battleground.
 671: Ese jugador ya es amigo tuyo.
 672: No se ha encontrado el nombre que has introducido.
 673: No puedes realizar esa acción en estos momentos. Inténtalo más tarde.
 674: Se ha eliminado de tu lista de amigos.
 675: No puedes enviar tantos correos seguidos.
-676: No se pueden establecer alianzas durante una guerra de clanes.
-677: No se puede romper una alianza durante una guerra de clanes.
+676: No se pueden establecer alianzas durante una Guerra del Emperium.
+677: No se puede romper una alianza durante una Guerra del Emperium.
 678: Ya no eres el líder del clan.
 679: Te has convertido en el líder del clan.
 680: Te has recuperado.
+//681-899 vacíos

 681: Rune Knight T
 682: Warlock T
@@ -722,86 +676,6 @@
 698: Baby Summoner
 699: Baby Ninja

-// @vip
-700: Instrucciones: @vip <tiempo> <nombre del personaje>
-701: El tiempo introducido no es válido.
-702: El formato del tiempo es +/-<valor>. y/a = Año, m = Mes, d/j = Día, h = Horas, n/mn = Minutos, s = Segundos.
-703: Un GM te ha retirado el VIP.
-704: El jugador ya no es VIP.
-705: Tiempo restante como VIP: Años: %d. Meses: %d. Días: %d. Horas: %d. Minutos: %d.
-706: El jugador '%s' será VIP durante: Años: %d. Meses: %d. Días: %d. Horas: %d. Minutos: %d.
-707: Serás VIP hasta: %s
-708: El jugador será VIP hasta: %s
-
-709: El objeto %u ha sido eliminado de tu inventario.
-710: El objeto %u ha sido eliminado de tu carro.
-711: El objeto %u ha sido eliminado de tu almacén.
-
-// Item shop
-712: No tienes suficientes %s (%u).
-713: No tienes suficientes '%s'.
-714: Listado de la tienda de objetos: %s (%u)
-715: Listado de puntos de la tienda: '%s'
-716: Tu '%s' ahora es: %d
-
-// MVP EXP reward message
-717: ¡Enhorabuena! ¡Eres todo un MVP! ¡¡Puntos de experiencia obtenidos: %llu!!
-
-// @showrate
-718: La información de ratio personal no se mostrará.
-719: Ahora se mostrará la información de ratio personal.
-
-//Skill messages
-//720: Vacío
-721: [%s] Se ha imbuido el arma con veneno.
-//722: Vacío
-
-// @costume
-723: No existe el disfraz '%s'.
-724: Ya llevas puesto el disfraz '%s', escribe '@costume' para quitártelo.
-725: -- %s
-726: - Disfraces disponibles
-727: Disfraz '%s' eliminado.
-
-// Monster Transformation
-728: ¡¡Traaaansformación!! ¡¡Forma %s!!
-729: No puedes transformarte en un monstruo si llevas un disfraz.
-730: El personaje no puede disfrazarse si está transformado en un monstruo.
-731: No puedes transformarte en monstruo durante la guerra de clanes.
-
-732: No puedes abrir el objeto porque tu inventario está lleno.
-
-733: Introduce la ruta de archivo de un NPC (instrucciones: @reloadnpcfile <ruta>).
-
-// @cloneequip/@clonestat
-734: No puedes clonar tu propio %s.
-735: Instrucciones: %s <personaje/ID>
-736: No se puede clonar el %s de ese jugador.
-737: '%s' (%d) no se puede clonar, límite (%d).
-738: Clonación de '%s' realizada.
-
-// @bodystyle
-739: Introduce un estilo de cuerpo (instrucciones: @bodystyle <ID de cuerpo: %d-%d>).
-740: Este oficio no tiene estilos de cuerpo alternativos.
-
-// @showexp
-741: Obtenida
-742: Perdida
-743: Experiencia %s Base:%ld (%0.2f%%) Oficio:%ld (%0.2f%%)
-
-// @adopt
-744: El bebé ya está adoptado o está en proceso de adopción.
-745: Necesitas estar casado y dentro de un grupo con tu pareja y el bebé para adoptarlo.
-746: El padre y la madre deben equiparse sus anillos de boda.
-747: El bebé no es un Novice.
-748: Falta uno de los padres o el bebé.
-
-// Guerra de clanes de entrenamiento (@agitstart3/@agitend3)
-749: Ha empezado la guerra de clanes de entrenamiento.
-750: La guerra de clanes de entrenamiento ya ha sido iniciada.
-751: Ha terminado la guerra de clanes de entrenamiento.
-752: La guerra de clanes de entrenamiento no ha sido iniciada.
-
 // Expanded Baby Jobs
 753: Baby Kagerou
 754: Baby Oboro
@@ -811,27 +685,6 @@
 758: Baby Gunslinger
 759: Baby Rebellion

-// Channel System
-760: No puedes unirte al canal '%s'. Se ha llegado al límite de %d usuarios.
-761: %s %s se ha unido al canal.
-762: No puedes abandonar el canal '%s'.
-763: %s %s ha abandonado el canal.
-764: No puedes modificar el color del canal '%s'.
-765: No tienes permisos para bloquear a nadie.
-766: No puedes expulsar a nadie del canal '%s'.
-767: No puedes expulsar a nadie del canal.
-768: Se ha expulsado a %s %s del canal.
-769: Se ha bloqueado a %s %s del canal.
-770: Se ha desbloqueado a %s %s del canal.
-
-//@reloadachievementdb
-771: Se ha recargado la base de datos de logros.
-
-// Achievements
-772: Los logros están desactivados.
-
-//773-899 vacíos
-
 //------------------------------------
 // Más mensajes relacionados con comandos
 //------------------------------------
@@ -848,13 +701,13 @@
 908: Has introducido un valor desconocido en:

 // @rura
-909: Introduce un nombre de mapa (instrucciones: @warp/@rura/@mapmove <nombre de mapa> <x> <y>).
+909: Introduce un nombre de mapa (Instrucciones: @warp/@rura/@mapmove <nombre de mapa> <x> <y>).

 // @where
-910: Introduce el nombre de algún jugador (instrucciones: @where <personaje>).
+910: Introduce el nombre de algún jugador (Instrucciones: @where <personaje>).

 // @jumpto
-911: Introduce el nombre de algún jugador (instrucciones: @jumpto/@warpto/@goto <personaje/ID>).
+911: Introduce el nombre de algún jugador (Instrucciones: @jumpto/@warpto/@goto <personaje/ID>).

 // @who
 912: (CID:%d/AID:%d)
@@ -867,7 +720,7 @@
 917: Ninguno

 // @speed
-918: Introduce un valor para tu velocidad (instrucciones: @speed <%d-%d>).
+918: Introduce un valor para tu velocidad (Instrucciones: @speed <%d-%d>).

 // @storage
 919: Has abierto el almacén.
@@ -884,22 +737,22 @@
 //924-979 vacíos (¿posibles futuros oficios?)

 // @kami
-980: Introduce un mensaje (instrucciones: @kami <mensaje>).
-981: Introduce un color y un mensaje (instrucciones: @kamic <color> <mensaje>).
+980: Introduce un mensaje (Instrucciones: @kami <mensaje>).
+981: Introduce un color y un mensaje (Instrucciones: @kamic <color> <mensaje>).
 982: Ese color no es válido.

 // @item
-983: Introduce el nombre de un objeto o su ID (instrucciones: @item <nombre del objeto/ID> <cantidad>).
+983: Introduce el nombre de un objeto o su ID (Instrucciones: @item <nombre del objeto/ID> <cantidad>).

 // @item2
-984: Introduce todos los parámetros (instrucciones: @item2 <nombre del objeto/id> <cantidad>)
+984: Introduce todos los parámetros (Instrucciones: @item2 <nombre del objeto/id> <cantidad>)
 985: <¿identificado?> <refinamiento> <atributos> <carta1> <carta2> <carta3> <carta4>.

 // @baselevelup
-986: Introduce una cifra (instrucciones @lvup/@blevel/@baselvlup <cantidad de niveles>).
+986: Introduce una cifra (Instrucciones @lvup/@blevel/@baselvlup <cantidad de niveles>).

 // @joblevelup
-987: Introduce una cifra (instrucciones: @joblvup/@jlevel/@joblvlup <cantidad de niveles>).
+987: Introduce una cifra (Instrucciones: @joblvup/@jlevel/@joblvlup <cantidad de niveles>).

 // @help
 988: No hay ayuda disponible para %c%s.
@@ -907,22 +760,22 @@
 990: Alternativas disponibles:

 // @model
-991: Introduce al menos un valor (instrucciones: @model <ID del peinado: %d-%d> <color del peinado: %d-%d> <tinte de ropa: %d-%d>).
+991: Introduce al menos un valor (Instrucciones: @model <ID del peinado: %d-%d> <color del peinado: %d-%d> <tinte de ropa: %d-%d>).

 // @dye
-992: Introduce un tinte de ropa (instrucciones: @dye/@ccolor <tinte de ropa: %d-%d>).
+992: Introduce un tinte de ropa (Instrucciones: @dye/@ccolor <tinte de ropa: %d-%d>).

 // @hairstyle
-993: Introduce un tipo de peinado (instrucciones: @hairstyle/@hstyle <ID del peinado: %d-%d>).
+993: Introduce un tipo de peinado (Instrucciones: @hairstyle/@hstyle <ID del peinado: %d-%d>).

 // @haircolor
-994: Introduce un color de peinado (instrucciones: @haircolor/@hcolor <color del peinado: %d-%d>).
+994: Introduce un color de peinado (Instrucciones: @haircolor/@hcolor <color del peinado: %d-%d>).

 // @go
 995: No puedes utilizar @go en este mapa.

 // @refine
-996: Introduce una pieza de equipo y una cantidad (instrucciones: @refine <pieza de equipo> <+/- cantidad>).
+996: Introduce una pieza de equipo y una cantidad (Instrucciones: @refine <pieza de equipo> <+/- cantidad>).
 997: %d: Boca
 998: %d: Mano derecha
 999: %d: Ropaje
@@ -935,92 +788,89 @@
 1006: %d: Ojos / Orejas

 // @produce
-1007: Introduce el nombre/ID de un objeto (instrucciones: @produce <pieza de equipo/ID> <elemento> <# cantidad de "muy">)
+1007: Introduce el nombre/ID de un objeto (Instrucciones: @produce <pieza de equipo/ID> <elemento> <# cantidad de "muy">)

 // @memo
-1008: Introduce una ubicación válida (instrucciones: @memo <posición_memo:%d-%d>).
+1008: Introduce una ubicación válida (Instrucciones: @memo <posición_memo:%d-%d>).

 // @displaystatus
-1009: Introduce un valor válido (instrucciones: @displaystatus <tipo de estado> <identificador> <punto> {<valor1> {<valor2> {<valor3>}}}).)
+1009: Introduce un valor válido (Instrucciones: @displaystatus <tipo de estado> <identificador> <punto> {<valor1> {<valor2> {<valor3>}}}).)

 // @stpoint
-1010: Introduce una cantidad (instrucciones: @stpoint <cantidad de puntos>)
+1010: Introduce una cantidad (Instrucciones: @stpoint <cantidad de puntos>)

 // @skpoint
-1011: Introduce una cantidad (instrucciones: @skpoint <cantidad de puntos>)
+1011: Introduce una cantidad (Instrucciones: @skpoint <cantidad de puntos>)

 // @zeny
-1012: Introduce una cantidad (instrucciones: @zeny <cantidad>).
+1012: Introduce una cantidad (Instrucciones: @zeny <cantidad>).

 // @param
-1013: Introduce una cantidad (instrucciones: @str/@agi/@vit/@int/@dex/@luk <+/- cantidad>).
+1013: Introduce una cantidad (Instrucciones: @str/@agi/@vit/@int/@dex/@luk <+/- cantidad>).

 // @guildlevelup
-1014: Introduce una cantidad (instrucciones: @guildlvup/@guildlvlup <cantidad de niveles>).
+1014: Introduce una cantidad (Instrucciones: @guildlvup/@guildlvlup <cantidad de niveles>).

 // @makeegg
-1015: Introduce el nombre de un monstruo/huevo/ID (instrucciones: @makeegg <mascota>).
+1015: Introduce el nombre de un monstruo/huevo/ID (Instrucciones: @makeegg <mascota>).

 // @petfriendly
-1016: Introduce una cantidad (instrucciones: @petfriendly <0-1000>).
+1016: Introduce una cantidad (Instrucciones: @petfriendly <0-1000>).

 // @pethungry
-1017: Introduce una cantidad (instrucciones: @pethungry <0-100>).
+1017: Introduce una cantidad (Instrucciones: @pethungry <0-100>).

 // @recall
-1018: Introduce el nombre de un jugador (instrucciones: @recall <nombre/ID>)
+1018: Introduce el nombre de un jugador (Instrucciones: @recall <nombre/ID>)
 1019: No estás autorizado a llevar a nadie a este mapa.

 // @recall
 1020: No estás autorizado a sacar a ese jugador de su mapa.

-// @charblock/@charunblock
-1021: Introduce el nombre de un jugador (instrucciones: @charblock/@block <nombre del personaje>)
+// @charblock
+1021: Introduce el nombre de un jugador (Instrucciones: @charblock/@block <nombre del personaje>)

-// @ban/@charban
-1022: Introduce la duración del bloqueo y el nombre del jugador (instrucciones: %s <tiempo> <nombre del personaje>).
+// @charban
+1022: Introduce la duración del bloqueo y el nombre del jugador que quieres bloquear (Instrucciones: @charban/@ban/@banish/@charbanish <tiempo> <nombre del personaje>).
 1023: No estás autorizado para modificar ningún bloqueo temporal.

-// @rates
-1024: Ratio de objetos de MVP: Comunes %.2fx / Curativos %.2fx / Consumibles %.2fx / Equipo %.2fx / Carta %.2fx
-
-// @recall
-1025: El personaje está en autotrade y no puede acudir.
+// @charunblock
+1024: Introduce el nombre de un jugador bloqueado (Instrucciones: @charunblock <nombre del personaje>).

 // @kick
-1026: Introduce el nombre de un personaje (instrucciones: @kick <nombre del personaje/ID>).
+1026: Introduce el nombre de un personaje (Instrucciones: @kick <nombre del personaje/ID>).

 // @questskill / @lostskill
 1027: Introduce la ID de una habilidad de quest.

 // @spiritball
-1028: Introduce una cantidad (instrucciones: @spiritball <cantidad: 0-%d>).
+1028: Introduce una cantidad (Instrucciones: @spiritball <cantidad: 0-%d>).

 // @party
-1029: Introduce el nombre de un grupo (instrucciones: @party <nombre del grupo>).
+1029: Introduce el nombre de un grupo (Instrucciones: @party <nombre del grupo>).

 // @guild
-1030: Introduce el nombre de un clan (instrucciones: @guild <nombre del clan>).
+1030: Introduce el nombre de un clan (Instrucciones: @guild <nombre del clan>).

 // @idsearch
-1031: Introduce una parte del nombre de un objeto (instrucciones: @idsearch <parte del nombre>).
+1031: Introduce una parte del nombre de un objeto (Instrucciones: @idsearch <parte del nombre>).

 // @recallall / @guildrecall / @partyrecall
 1032: No estás autorizado a traer nadie a este mapa.
 1033: Jugadores no convocados: %d (no estás autorizado).

 // @guildrecall
-1034: Introduce el nombre/ID de un clan (instrucciones: @guildrecall <nombre/ID del clan>).
+1034: Introduce el nombre/ID de un clan (Instrucciones: @guildrecall <nombre/ID del clan>).

 // @partyrecall
-1035: Introduce el nombre/ID de un grupo (instrucciones: @partyrecall <nombre/ID del grupo>).
+1035: Introduce el nombre/ID de un grupo (Instrucciones: @partyrecall <nombre/ID del grupo>).

 // @reloadatcommand
 1036: Ha ocurrido un error al cargar el archivo groups.conf.
-//1037 free
+1037: Ha ocurrido un error al cargar el archivo atcommand_athena.conf.

 // @mapinfo
-1038: Introduce un número de la lista (instrucciones: @mapinfo <0-3> <mapa>).
+1038: Introduce un número de la lista (Instrucciones: @mapinfo <0-3> <mapa>).
 1039: ------ Información del mapa ------
 1040: Mapa: %s | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
 1041: ------ Opciones del mapa ------
@@ -1034,16 +884,14 @@
 1049: Opciones climáticas:
 1050: Otras opciones:
 1051: Otras opciones2:
-1052: Ajustes de daño de habilidades:
-//1053-1064 vacíos
+
 1065: Sin penalización de experiencia: %s | Sin penalización de zeny: %s
 1066: Activado
 1067: Desactivado
-1068: Sin opción de guardado (vuelves al punto de guardado)
+1068: Sin opción de guardado (Vuelves al punto de guardado)
 1069: Sin opción de guardado, punto de guardado: %s, aleatorio
 1070: Sin opción de guardado, punto de guardado: %s,%d,%d

-
 // @mount
 1119: Te has montado en tu dragón.
 1120: Has liberado a tu dragón.
@@ -1054,34 +902,34 @@

 // @guildspy
 1125: Este comando está desactivado.
-1126: Introduce el nombre/ID de un clan (instrucciones: @guildspy <nombre/ID del clan>).
+1126: Introduce el nombre/ID de un clan (Instrucciones: @guildspy <nombre/ID del clan>).

 // @partyspy
-1127: Introduce el nombre/ID de un grupo (instrucciones: @partyspy <nombre/ID del grupo>).
+1127: Introduce el nombre/ID de un grupo (Instrucciones: @partyspy <nombre/ID del grupo>).

 // @nuke
-1128: Introduce el nombre de algún jugador (instrucciones: @nuke <nombre del personaje>).
+1128: Introduce el nombre de algún jugador (Instrucciones: @nuke <nombre del personaje>).

 // @tonpc
-1129: Introduce el nombre de algún NPC (instrucciones: @tonpc <nombre del NPC>).
+1129: Introduce el nombre de algún NPC (Instrucciones: @tonpc <nombre del NPC>).

 // @enablenpc
-1130: Introduce el nombre de un NPC (instrucciones: @enablenpc <nombre del NPC>).
+1130: Introduce el nombre de un NPC (Instrucciones: @enablenpc <nombre del NPC>).

 // @hidenpc
-1131: Introduce el nombre de un NPC (instrucciones: @hidenpc <nombre del NPC>).
+1131: Introduce el nombre de un NPC (Instrucciones: @hidenpc <nombre del NPC>).

 // @loadnpc
-1132: Introduce el nombre de un script (instrucciones: @loadnpc <ruta del script>)
+1132: Introduce el nombre de un script (Instrucciones: @loadnpc <ruta del script>)

 // @unloadnpc
-1133: Introduce el nombre de un NPC (instrucciones: @unloadnpc <nombre del NPC>).
+1133: Introduce el nombre de un NPC (Instrucciones: @unloadnpc <nombre del NPC>).

 // @jail
-1134: Introduce el nombre de algún jugador (instrucciones: @jail <nombre del personaje>).
+1134: Introduce el nombre de algún jugador (Instrucciones: @jail <nombre del personaje>).

 // @unjail
-1135: Introduce el nombre de algún jugador (instrucciones: @unjail/@discharge <nombre del personaje>).
+1135: Introduce el nombre de algún jugador (Instrucciones: @unjail/@discharge <nombre del personaje>).

 // @jailfor
 1136: La duración que has introducido no es válida.
@@ -1095,32 +943,32 @@
 1142: Te quedarás

 // @disguise
-1143:Introduce el nombre/ID de un monstruo/NPC (instrucciones: @disguise <nombre/ID>).
+1143:Introduce el nombre/ID de un monstruo/NPC (Instrucciones: @disguise <nombre/ID>).
 1144: No puedes disfrazarte en una montura.

 // @disguiseall
-1145: Introduce el nombre/ID de un monstruo/NPC (instrucciones: @disguiseall <nombre/ID>).
+1145: Introduce el nombre/ID de un monstruo/NPC (Instrucciones: @disguiseall <nombre/ID>).

 // @disguiseguild
-1146: Introduce el nombre/ID de un monstruo, y el nombre/ID de un clan (instrucciones: @disguiseguild <nombre/ID del monstruo> <nombre/ID del clan>).
+1146: Introduce el nombre/ID de un monstruo, y el nombre/ID de un clan (Instrucciones: @disguiseguild <nombre/ID del monstruo> <nombre/ID del clan>).

 // @undisguiseguild
-1147: Introduce el nombre/ID de un clan (instrucciones: @undisguiseguild <nombre/ID del clan>).
+1147: Introduce el nombre/ID de un clan (Instrucciones: @undisguiseguild <nombre/ID del clan>).

 // @exp
 1148: Nivel de base: %d (%.3f%%) | Nivel de oficio: %d (%.3f%%)

 // broadcast
-1149: Escribe un mensaje (instrucciones: @broadcast <mensaje>).
+1149: Escribe un mensaje (Instrucciones: @broadcast <mensaje>).

 // localbroadcast
-1150: Introduce un mensaje (instrucciones @localbroadcast <mensaje>).
+1150: Introduce un mensaje (Instrucciones @localbroadcast <mensaje>).

 // @email
-1151: Introduce dos correos electrónicos (instrucciones: @email <actual> <nuevo>)
+1151: Introduce dos correos electrónicos (Instrucciones: @email <actual> <nuevo>)

 // @effect
-1152: Introduce el ID de algún efecto (instrucciones: @effect <ID del efecto>)
+1152: Introduce el ID de algún efecto (Instrucciones: @effect <ID del efecto>)

 // @npcmove
 1153: Instrucciones: @npcmove <X> <Y> <nombre del NPC>
@@ -1141,7 +989,7 @@
 1162: Has almacenado todos tus objetos.

 // @skillid
-1163: Introduce el nombre de la habilidad a buscar (instrucciones: @skillid <nombre de la habilidad>).
+1163: Introduce el nombre de la habilidad a buscar (Instrucciones: @skillid <nombre de la habilidad>).
 1164: habilidad %d: %s (%s)

 // @useskill
@@ -1194,12 +1042,12 @@
 1189: Ese objeto no existe.
 1190: Ese objeto ya estaba programado para ser recogido automáticamente.
 1191: Tu lista de recogida de objetos de forma automática está llena. Elimina alguno de esos objetos con @autolootid <nombre/ID del objeto>.
-1192: Recogiendo: '%s'/'%s' {%u}
+1192: Recogiendo: '%s'/'%s' {%hu}
 1193: No estás recogiendo ese objeto.
-1194: Has eliminado '%s'/'%s' {%u} de tu lista de recogida de objetos.
+1194: Has eliminado '%s'/'%s' {%hu} de tu lista de recogida de objetos.
 1195: Puedes almacenar %d objetos en tu lista de recogida de objetos.
-1196: Para añadir un nuevo objeto a la lista utiliza @alootid +<nombre/ID del objeto>. Para eliminar un objeto utiliza @alootid -<nombre/ID del objeto>.
-1197: "@alootid reset" reiniciará tu lista de recogida de objetos.
+1196: Para añadir un nuevo objeto a la lista utiliza @alootid <nombre/ID del objeto>. Para eliminar un objeto utiliza @alootid <nombre/ID del objeto>.
+1197: @alootid reset reiniciará tu lista de recogida de objetos.
 1198: Tu lista de recogida de objetos está vacía.
 1199: Lista de objetos para recoger automáticamente:
 1200: Has reiniciado tu lista de recogida de objetos.
@@ -1237,10 +1085,10 @@
 1216: Ha comenzado el espectáculo de fuegos artificiales.

 // @sound
-1217: Introduce el nombre de un archivo de sonido (instrucciones: @sound <archivo>).
+1217: Introduce el nombre de un archivo de sonido (Instrucciones: @sound <archivo>).

 // @mobsearch
-1218: Introduce el nombre de un monstruo (instrucciones: @mobsearch <nombre del monstruo>),
+1218: Introduce el nombre de un monstruo (Instrucciones: @mobsearch <nombre del monstruo>),
 1219: Ese monstruo no existe (%s).
 1220: Búsqueda... %s %s

@@ -1248,14 +1096,14 @@
 1221: Has eliminado todos los objetos arrojados al suelo.

 // @npctalk
-1222: Introduce los siguientes parámetros (instrucciones: @npctalk <nombre del npc> <mensaje>).
-1223: Introduce los siguientes parámetros (instrucciones @npctalk <color> <nombre del npc> <mensaje>).
+1222: Introduce los siguientes parámetros (Instrucciones: @npctalk <nombre del npc> <mensaje>).
+1223: Introduce los siguientes parámetros (Instrucciones @npctalk <color> <nombre del npc> <mensaje>).

 // @pettalk
-1224: Introduce un mensaje (instrucciones: @pettalk <mensaje>).
+1224: Introduce un mensaje (Instrucciones: @pettalk <mensaje>).

 // @summon
-1225: Introduce el nombre de un monstruo (instrucciones: @summon <nombre del monstruo> {duración}).
+1225: Introduce el nombre de un monstruo (Instrucciones: @summon <nombre del monstruo> {duración}).

 // @adjgroup
 1226: Instrucciones @adjgroup <ID del grupo>
@@ -1264,7 +1112,7 @@
 1229: Has cambiado de grupo.

 // @trade
-1230: Introduce el nombre de un jugador (instrucciones: @trade <nombre del personaje>).
+1230: Introduce el nombre de un jugador (Instrucciones: @trade <nombre del personaje>).

 // @setbattleflag
 1231: Instrucciones: @setbattleflag <opción> <parámetro>
@@ -1272,7 +1120,7 @@
 1233: Se ha configurado con éxito.

 // @unmute
-1234: Introduce el nombre de un jugador (instrucciones: @unmute <nombre del personaje>).
+1234: Introduce el nombre de un jugador (Instrucciones: @unmute <nombre del personaje>).
 1235: El jugador no está silenciado.
 1236: El jugador ya no está silenciado.

@@ -1283,15 +1131,15 @@
 1238: No tienes ningún objeto para identificar.

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

@@ -1301,7 +1149,7 @@
 1252: Búsqueda de monstruos... %s %s

 // @homlevel
-1253: Introduce un nivel (instrucciones: @homlevel <cantidad de niveles>).
+1253: Introduce un nivel (Instrucciones: @homlevel <cantidad de niveles>).

 // @homlevel / @homevolve / @homfriendly / @homhungry / @homtalk / @hominfo / @homstats
 1254: No tienes ningún homúnculo.
@@ -1310,17 +1158,17 @@
 1255: Tu homúnculo no puede evolucionar.

 // @makehomun
-1256: Introduce el ID de un homúnculo (instrucciones: @makehomun <ID del homúnculo>).
+1256: Introduce el ID de un homúnculo (Instrucciones: @makehomun <ID del homúnculo>).
 1257: El ID que has introducido no es válido.

 // @homfriendly
-1258: Introduce un valor de amistad (instrucciones: @homfriendly <valor de amistad [0-1000]>).
+1258: Introduce un valor de amistad (Instrucciones: @homfriendly <valor de amistad [0-1000]>).

 // @homhungry
-1259: Introduce un valor de hambre (instrucciones: @homhungry <valor de hambre [0-100]>).
+1259: Introduce un valor de hambre (Instrucciones: @homhungry <valor de hambre [0-100]>).

 // @homtalk
-1260: Introduce un mensaje (instrucciones: @homtalk <mensaje>).
+1260: Introduce un mensaje (Instrucciones: @homtalk <mensaje>).

 // @hominfo
 1261: Atributos del homúnculo:
@@ -1344,8 +1192,8 @@
 1275: Has alterado los atributos del homúnculo.

 // @iteminfo
-1276: Introduce el nombre/ID de un objeto (instrucciones: @ii/@iteminfo <nombre/ID del objeto>).
-1277: Objeto: '%s'/'%s'[%d] (%u) Tipo: %s | Efecto: %s
+1276: Introduce el nombre/ID de un objeto (Instrucciones: @ii/@iteminfo <nombre/ID del objeto>).
+1277: Objeto: '%s'/'%s'[%d] (%hu) Tipo: %s | Efecto: %s
 1278: Ninguno
 1279: Contiene código
 1280: Compra en NPC:%dz, Venta:%dz | Peso: %.1f
@@ -1354,13 +1202,13 @@
 1283: - Ningún monstruo tiene este objeto.

 // @whodrops
-1284: Introduce el nombre/ID de un objeto (instrucciones: @whodrops <nombre/ID del objeto>). 
+1284: Introduce el nombre/ID de un objeto (Instrucciones: @whodrops <nombre/ID del objeto>). 
 1285: Objeto: '%s'[%d] (ID:%d)
 1286: - Ningún monstruo tiene ese objeto.
 1287: - Estos monstruos tienen ese objeto (sólo se muestran un máximo de %d):

 // @whereis
-1288: Introduce el nombre/ID de un monstruo (instrucciones: @whereis <nombre/ID del monstruo>).
+1288: Introduce el nombre/ID de un monstruo (Instrucciones: @whereis <nombre/ID del monstruo>).
 1289: Puedes encontrar un %s en:
 1290: Este monstruo no aparece en ninguna parte.

@@ -1375,7 +1223,7 @@
 1296: No se puede especificar la versión SVN.

 // @mutearea
-1297: Introduce la cantidad de minutos (instrucciones: @mutearea/@stfu <minutos>).
+1297: Introduce la cantidad de minutos (Instrucciones: @mutearea/@stfu <minutos>).

 // @rates
 1298: Experiencia: Base %.2fx / Oficio %.2fx
@@ -1384,13 +1232,13 @@
 1301: Otros objetos: MvP %.2fx / Cartas %.2fx / Cofres %.2fx

 // @me
-1302: Introduce un mensaje (instrucciones: @me <mensaje>).
+1302: Introduce un mensaje (Instrucciones: @me <mensaje>).

 // @size / @sizeall / @sizeguild
 1303: Has alterado tu tamaño.

 // @sizeguild
-1304: Introduce el nombre/ID de un clan (instrucciones: @sizeguild <tamaño> <nombre/ID del clan>).
+1304: Introduce el nombre/ID de un clan (Instrucciones: @sizeguild <tamaño> <nombre/ID del clan>).

 // @monsterignore
 1305: Ahora eres inmune a cualquier ataque.
@@ -1467,7 +1315,7 @@
 1354: Objetos encontrados: %d en %d %s ranuras.

 // @delitem
-1355: Introduce el nombre/ID de un objeto, una cantidad, y el nombre de un jugador (instrucciones: #delitem <jugador> <nombre/ID del objeto> <cantidad>).
+1355: Introduce el nombre/ID de un objeto, una cantidad, y el nombre de un jugador (Instrucciones: #delitem <jugador> <nombre/ID del objeto> <cantidad>).

 // @font
 1356: Ahora se utilizará la fuente por defecto.
@@ -1488,23 +1336,21 @@

 // @set
 1367: Instrucciones: @set <nombre de la variable> <valor>
-1368: Instrucciones: ej. "@set PoringCharVar 50"
-1369: Instrucciones: ej. "@set PoringCharVarSTR$ Cadena de texto"
-1370: Instrucciones: ej. "@set PoringCharVarSTR$" muestra su valor, cadena de texto.
+1368: Instrucciones: ej. @set PoringCharVar 50
+1369: Instrucciones: ej. @set PoringCharVarSTR$ Cadena de texto
+1370: Instrucciones: ej. @set PoringCharVarSTR$ muestra su valor, Cadena de texto.
 1371: Las variables de NPC no se pueden editar con @set.
 1372: Las variables de instancias no se pueden editar con @set.
-1373: El valor %s ahora es: %lld
-1374: El valor %s ahora es: %s
+1373: El valor %s ahora es:%d
+1374: El valor %s ahora es :%s
 1375: %s está vacío
-
-// @cash/@points
-1376: Cierra la tienda de cash antes de ejecutar este comando.
+//1376: free

 // @reloadquestdb
 1377: Se ha actualizado la base de datos de las quest con éxito.

 // @addperm
-1378: Instrucciones: %s <permisos>
+1378: Instrucciones %s <permisos>
 1379: -- Listado de permisos
 1380: '%s' no es un permiso válido.
 1381: El jugador '%s' ya tiene el permiso '%s'.
@@ -1518,15 +1364,15 @@
 1387: Ese archivo no existe.

 // Mensajes de comandos en general
-1388: Ha fallado el comando (instrucciones: %c<comando> <nombre del personaje> <parámetros>).
+1388: Ha fallado el comando (Instrucciones: %c<comando> <nombre del personaje> <parámetros>).
 1389: Ha ocurrido un error con %s. El jugador no existe o no está conectado.

 // @cart
-1390: Ese carro no existe (instrucciones: %s <0-%d>).
+1390: Ese carro no existe (Instrucciones: %s <0-%d>).
 1391: No tienes ningún carro.
 1392: Ahora tienes un carro.

-// atccomand.cpp::is_atcommand
+// atccomand.c::is_atcommand
 1393: No puedes utilizar ningún comando porque estás muerto.

 // @clearstorage
@@ -1541,9 +1387,9 @@
 1398: -- Mostrando los primeros %d resultados:

 // @channel
-1399: Ese canal no existe (instrucciones: %s <#nombre del canal>).
-1400: El canal '%s' no existe (instrucciones: %s <#nombre del canal>).
-1401: El canal '%s' está protegido con contraseña (instrucciones: %s <#nombre del canal> <contraseña>).
+1399: Ese canal no existe (Instrucciones: %s <#nombre del canal>).
+1400: El canal '%s' no existe (Instrucciones: %s <#nombre del canal>).
+1401: El canal '%s' está protegido con contraseña (Instrucciones: %s <#nombre del canal> <contraseña>).
 1402: No estás en ese canal, escribe '@join <#nombre del canal>'.
 1403: Has entrado al canal '%s'.
 1404: %s ha fallado.
@@ -1613,62 +1459,15 @@
 1468: -- Limpia la lista de accesos prohibidos al canal.
 1469: * %s delete <#nombre del canal>
 1470: -- Elimina el canal especificado.
-1471: * %s listado propio
+1471: * %s list mine
 1472: -- Muestra una lista de todos los canales en los que estás conectado.
 1473: * %s join <#nombre del canal> <contraseña>
 1474: -- Te unes al canal especificado.
 1475: ---- Mis canales ----
 1476: No te has unido a ningún canal.

-// @effect
-1477: Introduce un efecto válido dentro del rango de ID %d a %d.
-
-// @partysharelvl
-1478: Se ha modificado el rango para compartir experiencia en grupos.
-1479: No se ha podido actualizar la configuración. El char-server está desconectado.
-
-// @autoloottype
-1480: Tipo de objeto no encontrado.
-1481: Ya estás autorrecogiendo ese tipo de objeto.
-1482: Tu lista de autorrecogida de objetos tiene todos los tipos.Puedes eliminar algunos con @autoloottype -<tipo o ID>.
-1483: Autorrecogida de objetos del tipo: '%s' {%d}
-1484: No estás autorrecogiendo ese tipo de objeto.
-1485: Tipo de objeto: '%s' {%d} eliminado de tu lista de autorrecogida de objetos.
-1486: Para añadir un tipo de objetos a la lista, usa  "@aloottype +<tipo o ID>". Para eliminarlo, use "@aloottype -<tipo o ID>".
-1487: Lista de tipos: curativo = 0, consumible = 2, etc = 3, armadura = 4, arma = 5, carta = 6, huevo de mascota = 7, equipo de mascota = 8, municición = 10
-1488: "@aloottype reset" borrará tu lista de autorrecogida de objetos.
-1489: Tu lista de autorrecogida de objetos está vacía.
-1490: Tipos de objetos presentes en tu lista:
-1491: Tu lista de autorrecogida de objetos se ha reseteado.
-
-// @dropall
-1492: Instrucciones: @dropall {<tipo>}
-1493: Listado de tipos: (por defecto) todos = -1, curativos = 0, consumibles = 2, etc = 3, armadura = 4, arma = 5, carta = 6, huevo de mascota = 7, equipo de mascota = 8, munición = 10
-1494: ¡Objetos tirados: %d (omitidos: %d)!
-
-// Banking
-1495: ¡No puedes retirar tanto dinero!
-1496: El banco está desactivado
-
-// Roulette
-1497: La ruleta está desactivada
-
 // @guild
-1498: No puedes crear un clan porque ya estás en uno.
-
-// @clanspy
-1499: Introduce un nombre de de clan o ID (instrucciones: @clanspy <clan o ID>).
-1500: Ya no estás espiando al clan %s.
-1501: Estás espiando al clan %s.
-1502: Nombre o ID de clan no válido.
-
-// PK Mode msgs
-1503: Has entrado en una zona PK.
-1504: Has entrado en una zona PK (segura hasta el nivel %d).
-
-// @changegm
-1513: No puedes delegar el liderazgo del clan durante el horario de WoE
-1514: Debes esperar un tiempo antes de poder designar un nuevo líder de clan
+1498: You cannot create a guild because you are in a clan.

 //Traducciones personalizadas
 import: conf/msg_conf/import/map_msg_spn_conf.txt
--- a/conf/msg_conf/map_msg_tha.conf
+++ b/conf/msg_conf/map_msg_tha.conf
@@ -45,7 +45,7 @@
 24: Job level א¾<D790>ט<EFBFBD>¢<EFBFBD>י¹.
 25: Job level <20>´<EFBFBD>§.
 26: Help commands:
-//27: free
+27: ¤<EFBFBD><EFBFBD><EFBFBD>ט§ help ה<>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶ד×יה´י.
 28: ה<>ט¾÷¼<C3B7>יא<D799>ט¹.
 29: ¾÷¼<C3B7>יא<D799>ט¹ 1 ¤¹.
 30: ¾÷¼<C3B7>יא<D799>ט¹ %d ¤¹.
@@ -96,7 +96,7 @@
 75: War of Emperium ה<>טה´י·<D799>§<EFBFBD>¹<EFBFBD><C2B9><EFBFBD>טד¹¢³<C2A2>¹<EFBFBD>י.
 76: ·<><C2B7> Skill ה´י¶<D799><C2B6>א¾<D790>ט<EFBFBD>÷¹µ<C2B9><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>¤<EFBFBD>³א<C2B3><D790><EFBFBD>÷<EFBFBD>י<EFBFBD><D799>ב<EFBFBD>י<EFBFBD>.
 77: ¼<><C2BC><EFBFBD>¾¸ל<C2B8><D79C><EFBFBD>¤י¹<D799><C2B9>ג´<D792><C2B4>י<EFBFBD>§<EFBFBD><C2A7>§¨<C2A7><C2A8> '%s' (×<>ט<EFBFBD>: <20><><EFBFBD><EFBFBD>):
-78: %s: %u
+78: %s: %d
 79: ¼<><C2BC><EFBFBD>¾¸ל %d ¢י<C2A2>§µי¹.
 80: <20><><EFBFBD>³<EFBFBD><C2B3><EFBFBD>÷<EFBFBD>×<EFBFBD>ט<EFBFBD> Monster <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> Monster.
 81: <20><>´<EFBFBD>÷ GM ¢<>§¤<C2A7>³ ה<>טה´י<C2B4><D799>÷<EFBFBD>¹<EFBFBD><EFBFBD>µד<C2B5>י¤<D799>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD>¶´<C2B6>א¹<D790>¹<EFBFBD><C2B9><EFBFBD><EFBFBD><EFBFBD>÷µ<C3B7><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>·<EFBFBD>ט<EFBFBD><D798>÷<EFBFBD>ה´י.
@@ -183,7 +183,7 @@
 166: ה<>ט<EFBFBD><D798> Item ·<>טה´י<C2B4><D799>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD>¾א<C2BE><D790>µ.
 167: <20><> 1 Item ·<>טה´י<C2B4><D799>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD>¾א<C2BE><D790>µ.
 168: <20><> %d Item ·<>טה´י<C2B4><D799>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD>¾א<C2BE><D790>µ.
-169: Item (%u: '%s') ¹<>יה<D799>טד×ט<C397><D798>»<EFBFBD><C2BB>³ל<C2B3><D79C><EFBFBD>ד<EFBFBD>ט.
+169: Item (%hu: '%s') ¹<>יה<D799>טד×ט<C397><D798>»<EFBFBD><C2BB>³ל<C2B3><D79C><EFBFBD>ד<EFBFBD>ט.
 170: ה<>ט¾÷ Item ×<>י¹¹<C2B9>יד¹°<C2B9>¹¢י<C2A2><D799><EFBFBD><EFBFBD>.
 171: %d - <20>ט<EFBFBD>§
 //172: You replace previous memo position %d - %s (%d,%d).
@@ -447,7 +447,8 @@
 // Homunculus messages
 450: ¤<>³<EFBFBD><C2B3> Homunculus <20><><EFBFBD>טב<D798>י<EFBFBD>.

-451: Cash Shop is disabled on this map.
+// Return pet to egg message
+451: ¤<>³ה<C2B3>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶א<C2B6>ח÷<D797><C3B7>µ<EFBFBD>לא<D79C><D790>י<EFBFBD>§ה´יא¾<D790><C2BE><EFBFBD>×ט<C397>§א<C2A7>ח÷¢<C3B7>§ד¹µ<C2B9><C2B5><EFBFBD><EFBFBD>¤<EFBFBD>אµח<C2B5>.

 // Message System
 460: ג»<D792>´א<C2B4><D790><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>טµי<C2B5>§<EFBFBD><C2A7><EFBFBD> (<28><>¸<EFBFBD>ד×י: @langtype <<3C><><EFBFBD><EFBFBD>>).
@@ -506,7 +507,7 @@
 537: µ<><C2B5><EFBFBD><EFBFBD>¤<EFBFBD> '%s' (account: %d) ¾<><C2BE><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>ט¨<D798>ד×י bot (<28><>¹¾<C2B9><C2BE><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>ט¨<D798>µ<EFBFBD><C2B5>¨¾÷ monster »<><C2BB><EFBFBD>).
 // Trade Spoof Messages
 538: Hack on trade: µ<><C2B5><EFBFBD><EFBFBD>¤<EFBFBD> '%s' (account: %d) ¾<><C2BE><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>ט¨<D798>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹ item ¨<>¹<EFBFBD>¹<EFBFBD><C2B9><EFBFBD><EFBFBD><EFBFBD>ט<EFBFBD>·<EFBFBD>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>ט.
-539: ¼<>יא<D799>ט¹<D798><C2B9> item ¨<>¹<EFBFBD>¹ %d (id: %u), ב<><D791>¾<EFBFBD><C2BE><EFBFBD><EFBFBD><EFBFBD>¨<EFBFBD>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹ד¹¨<C2B9>¹<EFBFBD>¹ %d.
+539: ¼<>יא<D799>ט¹<D798><C2B9> item ¨<>¹<EFBFBD>¹ %d (id: %hu), ב<><D791>¾<EFBFBD><C2BE><EFBFBD><EFBFBD><EFBFBD>¨<EFBFBD>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹ד¹¨<C2B9>¹<EFBFBD>¹ %d.
 540: ¼<>יא<D799>ט¹¹<C2B9>י¶<D799><C2B6><EFBFBD>י<EFBFBD><D799>ב<EFBFBD><D791>א»<D790><C2BB>ט<EFBFBD>¹.
 // Rare Items Drop/Steal announce
 541: '%s' א<>ח÷ %s's %s (ג<><D792><EFBFBD><EFBFBD>: %0.02f%%)
@@ -648,7 +649,7 @@
 666: <20><>µ<EFBFBD>לא<D79C><D790>י<EFBFBD>§ה<C2A7>טה´י¶<D799><C2B6><EFBFBD><EFBFBD>÷<EFBFBD>¹<EFBFBD><EFBFBD>µד<C2B5>י¹<D799>א¢י<C2A2>ד¹¾<C2B9>י¹·<C2B9>ט Guild Wars.
 667: ¤<>³ה<C2B3>טה´יµ<D799><C2B5>.
 668: µ<>ב<EFBFBD>¹ט§·<C2A7>ט¤<D798>³ה´י÷<D799>¹·<C2B9><C2B7>ה<EFBFBD>י<EFBFBD><D799>´<EFBFBD>§¹<C2A7>י:
-//669 free
+669: ¤<>³ה´י·<D799><C2B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸¢<C2B8>§א»י<C2BB><D799><EFBFBD><EFBFBD><EFBFBD>.
 670: ¤<>³ה<C2B3>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶<EFBFBD><C2B6><EFBFBD>¨<EFBFBD><C2A8> Guild ה´יד¹¢³<C2A2><C2B3><EFBFBD><EFBFBD>טד¹ battleground.
 671: א¾<D790>ט<EFBFBD>¹·<C2B9>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>טב<D798>י<EFBFBD>.
 672: ה<>ט¾÷×<C3B7>ט<EFBFBD>ד¹<D793><C2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
@@ -873,7 +874,7 @@

 // @reloadatcommand
 1036: א<><D790>´¢י<C2A2>¼<EFBFBD>´¾<C2B4><C2BE>´ד¹<D793><C2B9><EFBFBD>¼ט<C2BC>¹ה<C2B9><D794>ל groups.conf, <20><><EFBFBD>ג<EFBFBD><D792>´ד<C2B4><D793>ט<EFBFBD>י<EFBFBD>א<EFBFBD><D790><EFBFBD>.
-//1037 free
+1037: א<><D790>´¢י<C2A2>¼<EFBFBD>´¾<C2B4><C2BE>´ד¹<D793><C2B9><EFBFBD>¼ט<C2BC>¹ה<C2B9><D794>ל atcommand_athena.conf, <20><><EFBFBD>ג<EFBFBD><D792>´ד<C2B4><D793>ט<EFBFBD>י<EFBFBD>א<EFBFBD><D790><EFBFBD>.

 // @mapinfo
 1038: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>א<EFBFBD>¢<EFBFBD><C2A2>ט<EFBFBD>§<EFBFBD>¹ט<C2B9><D798><EFBFBD>¹<EFBFBD>ט§¤ט<C2A4>¨<EFBFBD><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>¸<EFBFBD>ד×י: @mapinfo <0-3> <map>).
@@ -1048,9 +1049,9 @@
 1189: ה<>ט¾÷ Item ´<>§<EFBFBD><C2A7>ט<EFBFBD><D798>.
 1190: ¤<>³ה´י÷<D799>¹·<C2B9><C2B7> item ¹<>י<EFBFBD>§ד¹<D793><C2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ה»א<C2BB><D790><EFBFBD>÷<EFBFBD>י<EFBFBD><D799>ב<EFBFBD>י<EFBFBD>.
 1191: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³אµח<C2B5>ב<EFBFBD>י<EFBFBD>. <20>÷ item ÷<>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ט<EFBFBD>¹´י<C2B4><D799> @autolootid -<×<>ט<EFBFBD>/ID item>.
-1192: ÷<>¹·<C2B9><C2B7> item : '%s'/'%s' {%u} <20>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
+1192: ÷<>¹·<C2B9><C2B7> item : '%s'/'%s' {%hu} <20>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
 1193: ¤<>³ה<C2B3>טה´י÷<D799>¹·<C2B9><C2B7> item ¹<>י<EFBFBD>§ד¹<D793><C2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>טב<D798>י<EFBFBD>.
-1194: <20>÷ item : '%s'/'%s' {%u} ¨<><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
+1194: <20>÷ item : '%s'/'%s' {%hu} ¨<><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
 1195: ¤<>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD>¶÷<C2B6>¹·<C2B9><C2B7>ה´י %d item ד¹<D793><C2B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem.
 1196: ד¹<D793><C2B9><EFBFBD>א¾<D790>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, ד×י "@alootid +<×<>ט<EFBFBD>/ID item>". ד¹<D793><C2B9><EFBFBD><EFBFBD>÷<EFBFBD><C3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, ד×י "@alootid -<×<>ט<EFBFBD>/ID item>".
 1197: "@alootid reset" ד¹<D793><C2B9><EFBFBD><EFBFBD>י<EFBFBD>§<EFBFBD><C2A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> autolootitem ¢<>§¤<C2A7>³.
@@ -1140,12 +1141,12 @@
 1239: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID Monster (<28><>¸<EFBFBD>ד×י: @mobinfo <×<>ט<EFBFBD>/ID mob>).
 1240: MVP Monster: '%s'/'%s'/'%s' (%d)
 1241: Monster: '%s'/'%s'/'%s' (%d)
-1242:  Lv:%d  HP:%d  Base EXP:%llu  Job EXP:%llu  HIT:%d  FLEE:%d
+1242:  Lv:%d  HP:%d  Base EXP:%u  Job EXP:%u  HIT:%d  FLEE:%d
 1243:  DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d
 1244:  ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)
 1245:  Drops:
 1246: Monster ¹<>יה<D799>ט<EFBFBD><D798>¢<EFBFBD>§µ<C2A7>.
-1247:  MVP Bonus EXP:%llu
+1247:  MVP Bonus EXP:%u
 1248:  MVP Items:
 1249: Monster ¹<>יה<D799>ט<EFBFBD><D798>¢<EFBFBD>§<EFBFBD><C2A7>§<EFBFBD><C2A7><EFBFBD> MVP.

@@ -1199,7 +1200,7 @@

 // @iteminfo
 1276: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID item (<28><>¸<EFBFBD>ד×י: @ii/@iteminfo <×<>ט<EFBFBD>/ID item>).
-1277: Item: '%s'/'%s'[%d] (%u) Type: %s | Extra Effect: %s
+1277: Item: '%s'/'%s'[%d] (%hu) Type: %s | Extra Effect: %s
 1278: None
 1279: With script
 1280: NPC Buy:%dz, Sell:%dz | Weight: %.1f
@@ -1347,7 +1348,7 @@
 1370: <20><>¸<EFBFBD>ד×י: ex. "@set PoringCharVarSTR$" ¨<>ב<EFBFBD>´§¼<C2A7><C2BC><EFBFBD>¾¸לא»ח¹¤ט<C2A4>, Super Duper String.
 1371: µ<><C2B5>ב»<D791> NPC ה<>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶µ<C2B6>י§¤ט<C2A4>ה´י´י<C2B4><D799> @set ה´י.
 1372: µ<><C2B5>ב»<D791> Instance ה<>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶µ<C2B6>י§¤ט<C2A4>ה´י´י<C2B4><D799> @set ה´י.
-1373: %s <20><>¤ט<C2A4>: %lld
+1373: %s <20><>¤ט<C2A4>: %d
 1374: %s <20><>¤ט<C2A4>: %s
 1375: %s ה<>ט<EFBFBD><D798>¤ט<C2A4>ד´ז.
 //1376: free
@@ -1378,7 +1379,7 @@
 1391: ¤<>³ה<C2B3>ט<EFBFBD><D798><EFBFBD>¶א¢ח¹·<C2B9>ט¨<D798><C2A8>÷<EFBFBD><C3B7><EFBFBD>.
 1392: µ<>´µ<C2B4>י§<D799>¶א¢ח¹א<C2B9><D790><EFBFBD>÷<EFBFBD>י<EFBFBD><D799>.

-// atcommand.cpp::is_atcommand
+// atcommand.c::is_atcommand
 1393: ¤<>³ה<C2B3>ט<EFBFBD><D798><EFBFBD><EFBFBD><EFBFBD>¶ד×י¤<D799><C2A4><EFBFBD>ט§ה´יד¹¢³<C2A2>µ<EFBFBD><C2B5><EFBFBD><EFBFBD><EFBFBD>ט.

 // @clearstorage
--- a/conf/packet_athena.conf
+++ b/conf/packet_athena.conf
@@ -5,19 +5,6 @@
 // Display debug reports (When something goes wrong during the report, the report is saved.)
 debug: no

-// Linux/Epoll: Maximum Events per cycle
-// Default Value:
-//	(Maximum Supported Connections)/2
-// NOTE: this controls the maximum collected socket-events per-cycle (call to epoll_wait())
-//       for example settings this to 32 will allow up to 32 events (incoming data/new connections
-//       per server-cycle.
-// NOTE: Recommended Settings is at least half the maximum supported connections
-//       Settings this to a lower value, may cause lags/delays
-//       Depending on available CPU Time
-// NOTE: This Setting is only available on Linux when build using EPoll as event dispatcher!
-//
-//epoll_maxevents: 1024
-
 // How long can a socket stall before closing the connection (in seconds)
 stall_time: 60

@@ -35,7 +22,7 @@ enable_ip_rules: yes

 order: deny,allow
 // order: allow,deny
-// order: mutual-failure
+// order: mutual-failture

 // IP rules
 //   allow : Accepts connections from the ip range (even if flagged as DDoS)
@@ -58,7 +45,7 @@ order: deny,allow
 ddos_interval: 3000

 // Consecutive attempts trigger
-// (default is 5 attempts)
+// (default is 5 attemps)
 ddos_count: 5

 // The time interval after which the threat of DDoS is assumed to be gone. (msec)
--- a/108
+++ b/108
@@ -584,7 +584,7 @@ PACKAGE_BUGREPORT=
 PACKAGE_URL=

 ac_unique_file="rAthena"
-ac_unique_file="src/common/cbasetypes.hpp"
+ac_unique_file="src/common/cbasetypes.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -623,7 +623,6 @@ ac_includes_default="\

 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-CXXFLAG_CLEARS
 CFLAGS_AR
 DLLEXT
 PCRE_CFLAGS
@@ -698,7 +697,6 @@ ac_user_opts='
 enable_option_checking
 enable_manager
 enable_packetver
-enable_epoll
 enable_debug
 enable_prere
 enable_vip
@@ -1339,8 +1337,7 @@ Optional Features:
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --enable-manager=ARG    memory managers: no, builtin, memwatch, dmalloc,
                          gcollect, bcheck (defaults to builtin)
-  --enable-packetver=ARG  Sets the PACKETVER define. (see src/common/mmo.hpp)
-  --enable-epoll          use epoll(4) on Linux
+  --enable-packetver=ARG  Sets the PACKETVER define. (see src/common/mmo.h)
  --enable-debug[=ARG]    Compiles extra debug code. (disabled by default)
                          (available options: yes, no, gdb)
  --enable-prere[=ARG]    Compiles serv in prere mode. (disabled by default)
@@ -1367,9 +1364,7 @@ Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  --with-maxconn[=ARG]    optionally set the maximum connections the core can
-                          handle. By default the system header value will be used.
-                          This will only be the compile time limit, make sure
-                          you set the correct limit with ulimit on your OS.
+                          handle (default: 16384) NOT USED YET - EXPERIMENTAL
  --with-outputlogin[=ARG]
                          Specify the login-serv output name (defaults to
                          login-server)
@@ -2740,7 +2735,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

 ac_config_files="$ac_config_files Makefile src/common/Makefile"

-ac_config_files="$ac_config_files 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile"
+ac_config_files="$ac_config_files 3rdparty/mt19937ar/Makefile 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile"

 ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile"

@@ -3240,55 +3235,6 @@ fi



-#
-# Epoll
-#
-# Check whether --enable-epoll was given.
-if test "${enable_epoll+set}" = set; then :
-  enableval=$enable_epoll; enable_epoll=$enableval
-else
-  enable_epoll=no
-
-fi
-
-if test x$enable_epoll = xno; then
-	have_linux_epoll=no
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux epoll(4)" >&5
-$as_echo_n "checking for Linux epoll(4)... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-		#ifndef __linux__
-		#error This is not Linux
-		#endif
-		#include <sys/epoll.h>
-
-int
-main ()
-{
-epoll_create1 (EPOLL_CLOEXEC);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  have_linux_epoll=yes
-else
-  have_linux_epoll=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_linux_epoll" >&5
-$as_echo "$have_linux_epoll" >&6; }
-fi
-if test x$enable_epoll,$have_linux_epoll = xyes,no; then
-    as_fn_error $? "epoll support explicitly enabled but not available" "$LINENO" 5
-fi
-
-
-
 #
 # debug
 #
@@ -3471,11 +3417,22 @@ fi
 # Check whether --with-maxconn was given.
 if test "${with_maxconn+set}" = set; then :
  withval=$with_maxconn;
-	if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
-		as_fn_error $? "Invalid argument --with-maxconn=$withval ... stopping" "$LINENO" 5
-	else
-		CPPFLAGS="$CPPFLAGS -DMAXCONN=$withval"
-	fi
+		if test "$withval" == "no";	 then
+			CPPFLAGS="$CPPFLAGS -DMAXCONN=16384"
+		else
+
+			if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
+				as_fn_error $? "Invalid argument --with-maxconn=$withval ... stopping" "$LINENO" 5
+			else
+				CPPFLAGS="$CPPFLAGS -DMAXCONN=$withval"
+			fi
+		fi
+
+else
+
+		CPPFLAGS="$CPPFLAGS -DMAXCONN=16384"
+
+
 fi


@@ -4503,8 +4460,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 CFLAGS="$CFLAGS -pipe -ffast-math -Wall"
 CPPFLAGS="$CPPFLAGS -I../common"
 CXXFLAGS="$CXXFLAGS -std=c++11"
-#CXXFLAGS="$CXXFLAGS -std=gnu++11"
-CXXFLAG_CLEARS="-std=c++11"
+

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -5807,8 +5763,8 @@ my_shared_test_flags=""
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5
 $as_echo_n "checking whether $CC supports -fno-strict-aliasing... " >&6; }
-OLD_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
+OLD_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fno-strict-aliasing"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo;
@@ -5820,7 +5776,7 @@ else

 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-		CPPFLAGS="$OLD_CPPFLAGS"
+		CFLAGS="$OLD_CFLAGS"


 fi
@@ -5962,19 +5918,6 @@ if test -n "$enable_packetver" ; then
 fi


-#
-# Epoll
-#
-case $have_linux_epoll in
-	"yes")
-		CPPFLAGS="$CPPFLAGS -DSOCKET_EPOLL"
-		;;
-	"no")
-		# default value
-		;;
-esac
-
-
 #
 # Debug
 #
@@ -7074,12 +7017,10 @@ else
 $as_echo "no" >&6; }
 fi

-CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS"
 CFLAGS="$OPT_LTO $CFLAGS"
 CFLAGS_AR="$OPT_LTO_AR $CFLAGS"


-
 { $as_echo "$as_me:${as_lineno-$LINENO}: Configure finish" >&5
 $as_echo "$as_me: Configure finish" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: CPPFLAGS= $CPPFLAGS" >&5
@@ -7804,6 +7745,7 @@ do
  case $ac_config_target in
    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "src/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/Makefile" ;;
+    "3rdparty/mt19937ar/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/mt19937ar/Makefile" ;;
    "3rdparty/libconfig/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/libconfig/Makefile" ;;
    "3rdparty/yaml-cpp/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/yaml-cpp/Makefile" ;;
    "src/char/Makefile") CONFIG_FILES="$CONFIG_FILES src/char/Makefile" ;;
--- a/configure.in
+++ b/configure.in
@@ -6,9 +6,9 @@ AC_REVISION($Revision$)
 AC_PREREQ([2.59])
 AC_LANG([C++])
 AC_LANG_COMPILER_REQUIRE
-AC_CONFIG_SRCDIR([src/common/cbasetypes.hpp])
+AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
 AC_CONFIG_FILES([Makefile src/common/Makefile])
-AC_CONFIG_FILES([3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile])
+AC_CONFIG_FILES([3rdparty/mt19937ar/Makefile 3rdparty/libconfig/Makefile 3rdparty/yaml-cpp/Makefile])
 AC_CONFIG_FILES([src/char/Makefile src/login/Makefile])
 AC_CONFIG_FILES([src/map/Makefile src/tool/Makefile])

@@ -53,40 +53,6 @@ AC_ARG_ENABLE(
 )


-#
-# Epoll
-#
-AC_ARG_ENABLE(
-	[epoll],
-	AC_HELP_STRING(
-		[--enable-epoll],
-		[use epoll(4) on Linux]
-	),
-	[enable_epoll=$enableval],
-	[enable_epoll=no]
-)
-if test x$enable_epoll = xno; then
-	have_linux_epoll=no
-else
-	AC_MSG_CHECKING([for Linux epoll(4)])
-	AC_LINK_IFELSE([AC_LANG_PROGRAM(
-		[
-		#ifndef __linux__
-		#error This is not Linux
-		#endif
-		#include <sys/epoll.h>
-		],
-		[epoll_create1 (EPOLL_CLOEXEC);])],
-		[have_linux_epoll=yes],
-		[have_linux_epoll=no]
-	)
-	AC_MSG_RESULT([$have_linux_epoll])
-fi
-if test x$enable_epoll,$have_linux_epoll = xyes,no; then
-	AC_MSG_ERROR([epoll support explicitly enabled but not available])
-fi
-
-
 #
 # debug
 #
@@ -295,24 +261,29 @@ AC_ARG_ENABLE(


 #
-# Optionally set the maximum number of network connections
-# the core will be able to handle
+# Optionally set the max number of network conenctions
+# the core will be support
 #
 AC_ARG_WITH(
 	[maxconn],
 	AC_HELP_STRING(
 		[--with-maxconn@<:@=ARG@:>@],
-		[optionally set the maximum connections the core can handle. By default the system header value is used.]
+		[optionally set the maximum connections the core can handle (default: 16384) NOT USED YET - EXPERIMENTAL]
 	),
 	[
-		if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
-			AC_MSG_ERROR([Invalid argument --with-maxconn=$withval ... stopping])
+		if test "$withval" == "no";	 then
+			CPPFLAGS="$CPPFLAGS -DMAXCONN=16384"
 		else
-			CPPFLAGS="$CPPFLAGS -DMAXCONN=$withval"
+
+			if ! test "$withval" -ge 0 -o "$withval" -lt 0 2>&- ; then
+				AC_MSG_ERROR([Invalid argument --with-maxconn=$withval ... stopping])
+			else
+				CPPFLAGS="$CPPFLAGS -DMAXCONN=$withval"
+			fi
 		fi
 	],
 	[
-		CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS -DMAXCONN=16384"
 	]
 )

@@ -471,8 +442,7 @@ AC_LANG([C++])
 CFLAGS="$CFLAGS -pipe -ffast-math -Wall"
 CPPFLAGS="$CPPFLAGS -I../common"
 CXXFLAGS="$CXXFLAGS -std=c++11"
-#CXXFLAGS="$CXXFLAGS -std=gnu++11"
-CXXFLAG_CLEARS="-std=c++11"
+

 AC_C_BIGENDIAN(
 	[AC_MSG_ERROR([[bigendian is not supported... stopping]])],
@@ -938,14 +908,14 @@ AC_SUBST([WITH_PLUGINS])
 # -O2 implies -fstrict-aliasing, but the code is not safe for that
 #
 AC_MSG_CHECKING([whether $CC supports -fno-strict-aliasing])
-OLD_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
+OLD_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fno-strict-aliasing"
 AC_COMPILE_IFELSE(
 	[AC_LANG_SOURCE([int foo;])],
 	[AC_MSG_RESULT([yes])],
 	[
 		AC_MSG_RESULT([no])
-		CPPFLAGS="$OLD_CPPFLAGS"
+		CFLAGS="$OLD_CFLAGS"
 	]
 )

@@ -1014,19 +984,6 @@ if test -n "$enable_packetver" ; then
 fi


-#
-# Epoll
-#
-case $have_linux_epoll in
-	"yes")
-		CPPFLAGS="$CPPFLAGS -DSOCKET_EPOLL"
-		;;
-	"no")
-		# default value
-		;;
-esac
-
-
 #
 # Debug
 #
@@ -1343,11 +1300,9 @@ else
 	AC_MSG_RESULT([no])
 fi

-CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS"
 CFLAGS="$OPT_LTO $CFLAGS" 
 CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
 AC_SUBST([CFLAGS_AR])
-AC_SUBST([CXXFLAG_CLEARS])

 AC_MSG_NOTICE([Configure finish])
 AC_MSG_NOTICE([CPPFLAGS= $CPPFLAGS])
--- a/db/abra_db.txt
+++ b/db/abra_db.txt
@@ -0,0 +1,227 @@
+// Hocus-Pocus (Abracadabra) Castable Skills Database
+//
+// Structure of Database:
+// SkillID,DummyName,ProbabilityPerLvl
+//
+// 01. SkillID                  Skill ID to be casted by hocus pocus.
+// 02. DummyName                Name of the skill (informative, not used by server).
+// 03. ProbabilityPerLvl        Not a rate! Chance at which the skill is selected compared
+//                              with other entries probabilties
+//
+// NOTE:
+// - The skill is picked at random from the entire database and then tested for rate. If it
+//   does not succeed at that rate, another skill is picked and tested. This continues
+//   until a skill succeeds. Abracadabra-specific skills have a different chance to occur
+//   depending on skill level used. All other skills have an equal chance and appear from
+//   level 1 onward.
+// - To remove entry by importing, put "clear" (without quotes) in DummyName
+
+5,Bash,500
+6,Provoke,500
+7,Magnum Break,500
+8,Endure,500
+
+10,Sight,500
+11,Napalm Beat,500
+12,Safety Wall,500
+13,Soul Strike,500
+14,Cold Bolt,500
+15,Frost Diver,500
+16,Stone Curse,500
+17,Fire Ball,500
+18,Fire Wall,500
+19,Fire Bolt,500
+20,Lightning Bolt,500
+21,Thunder Storm,500
+
+24,Ruwach,500
+25,Pneuma,500
+26,Teleport,500
+27,Warp Portal,500
+28,Heal,500
+29,Increase AGI,500
+30,Decrease AGI,500
+31,Aqua Benedicta,500
+32,Signum Crucis,500
+33,Angelus,500
+34,Blessing,500
+35,Cure,500
+
+40,Item Appraisal,500
+41,Vending,500
+42,Mammonite,500
+
+45,Improve Concentration,500
+46,Double Strafe,500
+47,Arrow Shower,500
+
+50,Steal,500
+51,Hiding,500
+52,Envenom,500
+53,Detoxify,500
+
+54,Resurrection,500
+
+56,Pierce,500
+57,Brandish Spear,500
+58,Spear Stab,500
+59,Spear Boomerang,500
+60,TwoHand Quicken,500
+61,Counter Attack,500
+62,Bowling Bash,500
+
+66,Impositio Manus,500
+67,Suffragium,500
+68,Aspersio,500
+69,B.S Sacramenti,500
+70,Sanctuary,500
+71,Slow poison,500
+72,Status Recovery,500
+73,Kyrie Eleison,500
+74,Magnificat,500
+75,Gloria,500
+76,Lex Divina,500
+77,Turn Undead,500
+78,Lex Aeterna,500
+79,Magnus Exorcismus,500
+
+80,Fire Pillar,500
+81,Sightrasher,500
+//82,Fire Ivy,500
+83,Meteor Storm,500
+84,Jupitel Thunder,500
+85,Lord of Vermilion,500
+86,Water Ball,500
+87,Ice Wall,500
+88,Frost Nova,500
+89,Storm Gust,500
+90,Earth spike,500
+91,Heaven's Drive,500
+92,Quagmire,500
+93,Sense,500
+
+//108,Weapon Repair,500
+110,Hammer Fall,500
+111,Adrenaline Rush,500
+112,Weapon Perfection,500
+113,Power-Thrust,500
+114,Maximize Power,500
+
+115,Skid Trap,500
+116,Land Mine,500
+117,Ankle Snare,500
+118,Shockwave Trap,500
+119,Sandman,500
+120,Flasher,500
+121,Freezing Trap,500
+122,Blast Mine,500
+123,Claymore Trap,500
+124,Remove Trap,500
+125,Talkie box,500
+129,Blitz Beat,500
+130,Detect,500
+131,Spring Trap,500
+
+135,Cloaking,500
+136,Sonic Blow,500
+137,Grimtooth,500
+138,Enchant Poison,500
+139,Poison React,500
+140,Venom Dust,500
+141,Venom Splasher,500
+
+//---EP4.0 Skill---
+211,Mug,500
+212,Back Stab,500
+214,Sightless Raid,500
+215,Divest Weapon,500
+216,Divest Shield,500
+217,Divest Armor,500
+218,Divest Helm,500
+219,Snatch,500
+220,Scribble,500
+//221,Piece,500
+222,Remover,500
+
+249,Guard,500
+250,Smite,500
+251,Shield Boomerang,500
+252,Shield Reflect,500
+253,Holy Cross,500
+254,Grand Cross,500
+255,Sacrifice,500
+256,Resistant Souls,500
+257,Defending Aura,500
+258,Spear Quicken,500
+
+261,Summon Spirit Sphere,500
+262,Absorb Spirit Sphere,500
+264,Snap,500
+266,Occult Impact,500
+267,Throw Spirit Sphere,500
+268,Mental Strength,500
+269,Root,500
+270,Fury,500
+271,Asura Strike,500
+//272,Raging Quadruple Blow,500
+//273,Raging Thrust,500
+
+275,Cast Cancel,500
+276,Magic Rod,500
+277,Spell Break,500
+279,Hindsight,500
+280,Endow Blaze,500
+281,Endow Tsunami,500
+282,Endow Tornado,500
+283,Endow Quake,500
+285,Volcano,500
+286,Deluge,500
+287,Whirlwind,500
+288,Magnetic Earth,500
+289,Dispel,500
+
+// Abracadabra Derivation Skill
+291,Monocell,250:500:750:1000:1250:1200:1750:2000:2250:2500
+292,Class Change,0:0:0:0:10:10:20:20:30:30
+293,Summon Monster,100:200:300:400:500:600:700:800:900:1000
+294,Grampus Morph,0:0:0:0:0:0:0:10:50:100
+295,Grim Reaper,50:100:150:200:250:300:350:400:450:500
+//296,Gold Digger,50:100:150:200:250:300:350:400:450:500
+//297,Beastly Hypnosis,50:100:150:200:250:300:350:400:450:500
+298,Questioning,1000:800:600:400:200:0:0:0:0:0
+299,Gravity,0:0:0:0:0:0:0:20:50:100
+//300,Leveling,0:0:0:0:0:0:0:0:10:50
+301,Suicide,0:0:0:0:0:0:0:10:50:100
+302,Rejuvination,0:0:0:0:0:0:20:50:100:200
+303,Coma,0:0:0:0:100:200:300:400:500:600
+
+// Dancer / Bard commonness
+//304,Amp,500
+//305,Encore,500
+//306,Lullaby,500
+//307,Mental Sensing,500
+//308,Down Tempo,500
+//309,Battle Theme,500
+//310,Harmonic Lick,500
+//311,Classical Pluck,500
+//312,Power Chord,500
+//313,Acoustic Rhythm,500
+//314,Ragnarok,500
+
+// Bard skill
+316,Melody Strike,500
+//317,Unchained Serenade,500
+318,Unbarring Octave,500
+//319,Perfect Tablature,500
+//320,Impressive Riff,500
+//321,Magic Strings,500
+//322,Song of Lutie,500
+
+// Dancer skill
+324,Slinging Arrow,500
+//325,Hip Shaker,500
+326,Dazzler,500
+//327,Focus Ballet,500
+//328,Slow Grace,500
+//329,Lady Luck,500
+//330,Gypsy's Kiss,500
--- a/db/abra_db.yml
+++ b/db/abra_db.yml
@@ -1,326 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Abracadabra Database
-###########################################################################
-#
-# Abracadabra Settings
-#
-###########################################################################
-# - Skill             Skill to be casted by Abracadabra.
-#   Probability:      Probability of skill compared to others in database (1 = 0.01%, 10000 = 100%). (Default: 500)
-#     - Level         Skill level.
-#       Probability   Probability at specific skill level (1 = 0.01%, 10000 = 100%). (Default: 0)
-###########################################################################
-
-Header:
-  Type: ABRA_DB
-  Version: 1
-
-Body:
-  - Skill: SM_BASH
-  - Skill: SM_PROVOKE
-  - Skill: SM_MAGNUM
-  - Skill: SM_ENDURE
-  - Skill: MG_SIGHT
-  - Skill: MG_NAPALMBEAT
-  - Skill: MG_SAFETYWALL
-  - Skill: MG_SOULSTRIKE
-  - Skill: MG_COLDBOLT
-  - Skill: MG_FROSTDIVER
-  - Skill: MG_STONECURSE
-  - Skill: MG_FIREBALL
-  - Skill: MG_FIREWALL
-  - Skill: MG_FIREBOLT
-  - Skill: MG_LIGHTNINGBOLT
-  - Skill: MG_THUNDERSTORM
-  - Skill: AL_RUWACH
-  - Skill: AL_PNEUMA
-  - Skill: AL_TELEPORT
-  - Skill: AL_WARP
-  - Skill: AL_HEAL
-  - Skill: AL_INCAGI
-  - Skill: AL_DECAGI
-  - Skill: AL_HOLYWATER
-  - Skill: AL_CRUCIS
-  - Skill: AL_ANGELUS
-  - Skill: AL_BLESSING
-  - Skill: AL_CURE
-  - Skill: MC_IDENTIFY
-  - Skill: MC_VENDING
-  - Skill: MC_MAMMONITE
-  - Skill: AC_CONCENTRATION
-  - Skill: AC_DOUBLE
-  - Skill: AC_SHOWER
-  - Skill: TF_STEAL
-  - Skill: TF_HIDING
-  - Skill: TF_POISON
-  - Skill: TF_DETOXIFY
-  - Skill: ALL_RESURRECTION
-  - Skill: KN_PIERCE
-  - Skill: KN_BRANDISHSPEAR
-  - Skill: KN_SPEARSTAB
-  - Skill: KN_SPEARBOOMERANG
-  - Skill: KN_TWOHANDQUICKEN
-  - Skill: KN_AUTOCOUNTER
-  - Skill: KN_BOWLINGBASH
-  - Skill: PR_IMPOSITIO
-  - Skill: PR_SUFFRAGIUM
-  - Skill: PR_ASPERSIO
-  - Skill: PR_BENEDICTIO
-  - Skill: PR_SANCTUARY
-  - Skill: PR_SLOWPOISON
-  - Skill: PR_STRECOVERY
-  - Skill: PR_KYRIE
-  - Skill: PR_MAGNIFICAT
-  - Skill: PR_GLORIA
-  - Skill: PR_LEXDIVINA
-  - Skill: PR_TURNUNDEAD
-  - Skill: PR_LEXAETERNA
-  - Skill: PR_MAGNUS
-  - Skill: WZ_FIREPILLAR
-  - Skill: WZ_SIGHTRASHER
-  - Skill: WZ_METEOR
-  - Skill: WZ_JUPITEL
-  - Skill: WZ_VERMILION
-  - Skill: WZ_WATERBALL
-  - Skill: WZ_ICEWALL
-  - Skill: WZ_FROSTNOVA
-  - Skill: WZ_STORMGUST
-  - Skill: WZ_EARTHSPIKE
-  - Skill: WZ_HEAVENDRIVE
-  - Skill: WZ_QUAGMIRE
-  - Skill: WZ_ESTIMATION
-  - Skill: BS_HAMMERFALL
-  - Skill: BS_ADRENALINE
-  - Skill: BS_WEAPONPERFECT
-  - Skill: BS_OVERTHRUST
-  - Skill: BS_MAXIMIZE
-  - Skill: HT_SKIDTRAP
-  - Skill: HT_LANDMINE
-  - Skill: HT_ANKLESNARE
-  - Skill: HT_SHOCKWAVE
-  - Skill: HT_SANDMAN
-  - Skill: HT_FLASHER
-  - Skill: HT_FREEZINGTRAP
-  - Skill: HT_BLASTMINE
-  - Skill: HT_CLAYMORETRAP
-  - Skill: HT_REMOVETRAP
-  - Skill: HT_TALKIEBOX
-  - Skill: HT_BLITZBEAT
-  - Skill: HT_DETECTING
-  - Skill: HT_SPRINGTRAP
-  - Skill: AS_CLOAKING
-  - Skill: AS_SONICBLOW
-  - Skill: AS_GRIMTOOTH
-  - Skill: AS_ENCHANTPOISON
-  - Skill: AS_POISONREACT
-  - Skill: AS_VENOMDUST
-  - Skill: AS_SPLASHER
-  - Skill: RG_STEALCOIN
-  - Skill: RG_BACKSTAP
-  - Skill: RG_RAID
-  - Skill: RG_STRIPWEAPON
-  - Skill: RG_STRIPSHIELD
-  - Skill: RG_STRIPARMOR
-  - Skill: RG_STRIPHELM
-  - Skill: RG_INTIMIDATE
-  - Skill: RG_GRAFFITI
-  - Skill: RG_CLEANER
-  - Skill: CR_AUTOGUARD
-  - Skill: CR_SHIELDCHARGE
-  - Skill: CR_SHIELDBOOMERANG
-  - Skill: CR_REFLECTSHIELD
-  - Skill: CR_HOLYCROSS
-  - Skill: CR_GRANDCROSS
-  - Skill: CR_DEVOTION
-  - Skill: CR_PROVIDENCE
-  - Skill: CR_DEFENDER
-  - Skill: CR_SPEARQUICKEN
-  - Skill: MO_CALLSPIRITS
-  - Skill: MO_ABSORBSPIRITS
-  - Skill: MO_BODYRELOCATION
-  - Skill: MO_INVESTIGATE
-  - Skill: MO_FINGEROFFENSIVE
-  - Skill: MO_STEELBODY
-  - Skill: MO_BLADESTOP
-  - Skill: MO_EXPLOSIONSPIRITS
-  - Skill: MO_EXTREMITYFIST
-  - Skill: SA_CASTCANCEL
-  - Skill: SA_MAGICROD
-  - Skill: SA_SPELLBREAKER
-  - Skill: SA_AUTOSPELL
-  - Skill: SA_FLAMELAUNCHER
-  - Skill: SA_FROSTWEAPON
-  - Skill: SA_LIGHTNINGLOADER
-  - Skill: SA_SEISMICWEAPON
-  - Skill: SA_VOLCANO
-  - Skill: SA_DELUGE
-  - Skill: SA_VIOLENTGALE
-  - Skill: SA_LANDPROTECTOR
-  - Skill: SA_DISPELL
-  - Skill: SA_MONOCELL
-    Probability:
-      - Level: 1
-        Probability: 250
-      - Level: 2
-        Probability: 500
-      - Level: 3
-        Probability: 750
-      - Level: 4
-        Probability: 1000
-      - Level: 5
-        Probability: 1250
-      - Level: 6
-        Probability: 1200
-      - Level: 7
-        Probability: 1750
-      - Level: 8
-        Probability: 2000
-      - Level: 9
-        Probability: 2250
-      - Level: 10
-        Probability: 2500
-  - Skill: SA_CLASSCHANGE
-    Probability:
-      - Level: 5
-        Probability: 10
-      - Level: 6
-        Probability: 10
-      - Level: 7
-        Probability: 20
-      - Level: 8
-        Probability: 20
-      - Level: 9
-        Probability: 30
-      - Level: 10
-        Probability: 30
-  - Skill: SA_SUMMONMONSTER
-    Probability:
-      - Level: 1
-        Probability: 100
-      - Level: 2
-        Probability: 200
-      - Level: 3
-        Probability: 300
-      - Level: 4
-        Probability: 400
-      - Level: 5
-        Probability: 500
-      - Level: 6
-        Probability: 600
-      - Level: 7
-        Probability: 700
-      - Level: 8
-        Probability: 800
-      - Level: 9
-        Probability: 900
-      - Level: 10
-        Probability: 1000
-  - Skill: SA_REVERSEORCISH
-    Probability:
-      - Level: 8
-        Probability: 10
-      - Level: 9
-        Probability: 50
-      - Level: 10
-        Probability: 100
-  - Skill: SA_DEATH
-    Probability:
-      - Level: 1
-        Probability: 50
-      - Level: 2
-        Probability: 100
-      - Level: 3
-        Probability: 150
-      - Level: 4
-        Probability: 200
-      - Level: 5
-        Probability: 250
-      - Level: 6
-        Probability: 300
-      - Level: 7
-        Probability: 350
-      - Level: 8
-        Probability: 400
-      - Level: 9
-        Probability: 450
-      - Level: 10
-        Probability: 500
-  - Skill: SA_QUESTION
-    Probability:
-      - Level: 1
-        Probability: 1000
-      - Level: 2
-        Probability: 800
-      - Level: 3
-        Probability: 600
-      - Level: 4
-        Probability: 400
-      - Level: 5
-        Probability: 200
-  - Skill: SA_GRAVITY
-    Probability:
-      - Level: 8
-        Probability: 20
-      - Level: 9
-        Probability: 50
-      - Level: 10
-        Probability: 100
-  - Skill: SA_INSTANTDEATH
-    Probability:
-      - Level: 8
-        Probability: 10
-      - Level: 9
-        Probability: 50
-      - Level: 10
-        Probability: 100
-  - Skill: SA_FULLRECOVERY
-    Probability:
-      - Level: 7
-        Probability: 20
-      - Level: 8
-        Probability: 50
-      - Level: 9
-        Probability: 100
-      - Level: 10
-        Probability: 200
-  - Skill: SA_COMA
-    Probability:
-      - Level: 5
-        Probability: 100
-      - Level: 6
-        Probability: 200
-      - Level: 7
-        Probability: 300
-      - Level: 8
-        Probability: 400
-      - Level: 9
-        Probability: 500
-      - Level: 10
-        Probability: 600
-  - Skill: BA_MUSICALSTRIKE
-  - Skill: BA_FROSTJOKER
-  - Skill: DC_THROWARROW
-  - Skill: DC_SCREAM
-
-Footer:
-  Imports:
-  - Path: db/pre-re/abra_db.yml
-    Mode: Prerenewal
-  - Path: db/import/abra_db.yml
--- a/db/achievement_db.yml
+++ b/db/achievement_db.yml
@@ -1,54 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Achievement Database
-###########################################################################
-#
-# Achievement Settings
-#
-###########################################################################
-# - Id                  Achievement ID.
-#   Group               Achievement group type. (Defaut: None)
-#   Name                Achievement name.
-#   Targets:            List of targets the achievement requires. (Default: null)
-#     - Id              Index value used for import methods.
-#       Mob             Target mob. (Default: 0)
-#       Count           Target count. (Default: 1)
-#   Condition           Conditional statement that must be met for the achievement to be considered complete. (Default: null)
-#   Map                 Map name that is used for the AG_CHATTING type. (Default: -1)
-#   Dependents:         List of achievements that need to be completed before this achievement is considered complete. (Default: null)
-#     - Id: <bool>      Achievement ID pre-requisite.
-#   Rewards:            List of rewards that are given on completion. (Default: null)
-#     Item              Item name.
-#     Amount            Amount of item. (Default: 1)
-#     Script            Bonus Script. (Default: null)
-#     TitleId           Title ID. (Default: 0)
-#   Score               Achievement points that are given on completion. (Default: 0)
-###########################################################################
-
-Header:
-  Type: ACHIEVEMENT_DB
-  Version: 2
-
-Footer:
-  Imports:
-  - Path: db/pre-re/achievement_db.yml
-    Mode: Prerenewal
-  - Path: db/re/achievement_db.yml
-    Mode: Renewal
-  - Path: db/import/achievement_db.yml
--- a/db/achievement_level_db.yml
+++ b/db/achievement_level_db.yml
@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Achievement Level Database
-###########################################################################
-#
-# Achievement Level Settings
-#
-###########################################################################
-# - Level     Achievement Level.
-#   Points    Required total scoring points to reach this level.
-###########################################################################
-
-Header:
-  Type: ACHIEVEMENT_LEVEL_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/achievement_level_db.yml
-    Mode: Prerenewal
-  - Path: db/re/achievement_level_db.yml
-    Mode: Renewal
-  - Path: db/import/achievement_level_db.yml
--- a/db/attendance.yml
+++ b/db/attendance.yml
@@ -1,42 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Attendance Database
-###########################################################################
-#
-# Attendance Settings
-#
-###########################################################################
-# - Start                   Start date.
-#   End                     End date.
-#   Rewards:                List of rewards for each day.
-#     - Day                 Reward day.
-#       ItemId              Item ID.
-###########################################################################
-
-Header:
-  Type: ATTENDANCE_DB
-  Version: 1
-  
-Footer:
-  Imports:
-  - Path: db/pre-re/attendance.yml
-    Mode: Prerenewal
-  - Path: db/re/attendance.yml
-    Mode: Renewal
-  - Path: db/import/attendance.yml
--- a/db/attr_fix.yml
+++ b/db/attr_fix.yml
@@ -1,40 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2019 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Elemental Attribute Damage Adjustment Tables
-###########################################################################
-#
-# Elemental Attribute Damage Adjustment Settings
-#
-###########################################################################
-# - Level                        Level of the Attribute.
-#   <element>:                   Attacker's weapon element.
-#       <element>: <value>       Target's defense element. <value> in %, default 100. Value accepted from -100 to 200.
-###########################################################################
-
-Header:
-  Type: ATTRIBUTE_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/attr_fix.yml
-    Mode: Prerenewal
-  - Path: db/re/attr_fix.yml
-    Mode: Renewal
-  - Path: db/import/attr_fix.yml
--- a/db/battleground_db.yml
+++ b/db/battleground_db.yml
@@ -1,211 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Battleground Queue Database
-###########################################################################
-#
-# Battleground Queue Settings
-#
-###########################################################################
-# - Id                Unique ID for the battleground type.
-#   Name              Name of the battleground. Must be the exact same as in the client for players to be able to join.
-#   MinPlayers        Minimum number of players required on each team. (Default: 1)
-#   MaxPlayers        Maximum number of players on each team. (Default: MAX_BG_MEMBERS / 2)
-#   MinLevel          Minimum level required to join the battleground. (Default: 1)
-#   MaxLevel          Maximum level to join the battleground. (Default: MAX_LEVEL value)
-#   Deserter          Amount of time in seconds a player is marked deserter. (Default: 600)
-#   StartDelay        Amount of time in seconds once a queue is filled before players are warped. (Default: 0)
-#   Join:             Which application type is accepted. The entryqueuelist.lub can visually disable these options.
-#     Solo            Able to join a queue as an individual. (Default: true)
-#     Party           Able to join a queue as a party. (Default: true)
-#     Guild           Able to join a queue as a guild. (Default: true)
-#   JobRestrictions   List of jobs that are unable to join the battleground.
-#   Locations:        Battleground location settings.
-#     - Map           The map on which the battleground will be played.
-#       StartEvent    NPC event triggered when the battleground starts.
-#       TeamA:        TeamA settings.
-#         RespawnX    X coordinate for warping on death.
-#         RespawnY    Y coordinate for warping on death.
-#         DeathEvent  NPC event triggered when a player dies.
-#         QuitEvent   NPC event triggered when a player quits.
-#         ActiveEvent NPC event triggered when a player joints an active battleground.
-#         Variable    Name of BG ID variable used in the battleground script.
-#       TeamB:        TeamB settings.
-#         RespawnX    X coordinate for warping on death.
-#         RespawnY    Y coordinate for warping on death.
-#         DeathEvent  NPC event triggered when a player dies.
-#         QuitEvent   NPC event triggered when a player quits.
-#         ActiveEvent NPC event triggered when a player joints an active battleground.
-#         Variable    Name of BG ID variable used in the battleground script.
-###########################################################################
-
-Header:
-  Type: BATTLEGROUND_DB
-  Version: 1
-
-Body:
-  - Id: 1
-    Name: Tierra Gorge
-    MinPlayers: 6
-    MinLevel: 80
-    JobRestrictions:
-      Novice: true
-      SuperNovice: true
-      Novice_High: true
-      Baby: true
-      Super_Baby: true
-      Super_Novice_E: true
-      Super_Baby_E: true
-    Locations:
-      - Map: bat_a01
-        StartEvent: start#bat_a01::OnReadyCheck
-        TeamA:
-          RespawnX: 50
-          RespawnY: 374
-          QuitEvent: start#bat_a01::OnGuillaumeQuit
-          ActiveEvent: start#bat_a01::OnGuillaumeActive
-          Variable: $@TierraBG1_id1
-        TeamB:
-          RespawnX: 42
-          RespawnY: 16
-          QuitEvent: start#bat_a01::OnCroixQuit
-          ActiveEvent: start#bat_a01::OnCroixActive
-          Variable: $@TierraBG1_id2
-      - Map: bat_a02
-        StartEvent: start#bat_a02::OnReadyCheck
-        TeamA:
-          RespawnX: 50
-          RespawnY: 374
-          QuitEvent: start#bat_a02::OnGuillaumeQuit
-          ActiveEvent: start#bat_a02::OnGuillaumeActive
-          Variable: $@TierraBG2_id1
-        TeamB:
-          RespawnX: 42
-          RespawnY: 16
-          QuitEvent: start#bat_a02::OnCroixQuit
-          ActiveEvent: start#bat_a02::OnCroixActive
-          Variable: $@TierraBG2_id2
-  - Id: 2
-    Name: Flavius
-    MinPlayers: 6
-    MinLevel: 80
-    JobRestrictions:
-      Novice: true
-      SuperNovice: true
-      Novice_High: true
-      Baby: true
-      Super_Baby: true
-      Super_Novice_E: true
-      Super_Baby_E: true
-    Locations:
-      - Map: bat_b01
-        StartEvent: start#bat_b01::OnReadyCheck
-        TeamA:
-          RespawnX: 10
-          RespawnY: 290
-          QuitEvent: start#bat_b01::OnGuillaumeQuit
-          ActiveEvent: start#bat_b01::OnGuillaumeActive
-          Variable: $@FlaviusBG1_id1
-        TeamB:
-          RespawnX: 390
-          RespawnY: 10
-          QuitEvent: start#bat_b01::OnCroixQuit
-          ActiveEvent: start#bat_b01::OnCroixActive
-          Variable: $@FlaviusBG1_id2
-      - Map: bat_b02
-        StartEvent: start#bat_b02::OnReadyCheck
-        TeamA:
-          RespawnX: 10
-          RespawnY: 290
-          QuitEvent: start#bat_b02::OnGuillaumeQuit
-          ActiveEvent: start#bat_b02::OnGuillaumeActive
-          Variable: $@FlaviusBG2_id1
-        TeamB:
-          RespawnX: 390
-          RespawnY: 10
-          QuitEvent: start#bat_b02::OnCroixQuit
-          ActiveEvent: start#bat_b02::OnCroixActive
-          Variable: $@FlaviusBG2_id2
-  - Id: 3
-    Name: KVM (Level 80 and up)
-    MinPlayers: 5
-    MinLevel: 80
-    Locations:
-      - Map: bat_c01
-        StartEvent: KvM01_BG::OnStart
-        TeamA:
-          RespawnX: 52
-          RespawnY: 129
-          DeathEvent: KvM01_BG::OnGuillaumeDie
-          QuitEvent: KvM01_BG::OnGuillaumeQuit
-          ActiveEvent: KvM01_BG::OnGuillaumeActive
-          Variable: $@KvM01BG_id1
-        TeamB:
-          RespawnX: 147
-          RespawnY: 55
-          DeathEvent: KvM01_BG::OnCroixDie
-          QuitEvent: KvM01_BG::OnCroixQuit
-          ActiveEvent: KvM01_BG::OnCroixActive
-          Variable: $@KvM01BG_id2
-  - Id: 4
-    Name: KVM (Level 60~79)
-    MinPlayers: 5
-    MinLevel: 60
-    MaxLevel: 79
-    Locations:
-      - Map: bat_c02
-        StartEvent: KvM02_BG::OnStart
-        TeamA:
-          RespawnX: 52
-          RespawnY: 129
-          DeathEvent: KvM02_BG::OnGuillaumeDie
-          QuitEvent: KvM02_BG::OnGuillaumeQuit
-          ActiveEvent: KvM02_BG::OnGuillaumeActive
-          Variable: $@KvM02BG_id1
-        TeamB:
-          RespawnX: 147
-          RespawnY: 55
-          DeathEvent: KvM02_BG::OnCroixDie
-          QuitEvent: KvM02_BG::OnCroixQuit
-          ActiveEvent: KvM02_BG::OnCroixActive
-          Variable: $@KvM02BG_id2
-  - Id: 5
-    Name: KVM (Level 59 and below
-    MinPlayers: 5
-    MaxLevel: 59
-    Locations:
-      - Map: bat_c03
-        StartEvent: KvM03_BG::OnStart
-        TeamA:
-          RespawnX: 52
-          RespawnY: 129
-          DeathEvent: KvM03_BG::OnGuillaumeDie
-          QuitEvent: KvM03_BG::OnGuillaumeQuit
-          ActiveEvent: KvM03_BG::OnGuillaumeActive
-          Variable: $@KvM03BG_id1
-        TeamB:
-          RespawnX: 147
-          RespawnY: 55
-          DeathEvent: KvM03_BG::OnCroixDie
-          QuitEvent: KvM03_BG::OnCroixQuit
-          ActiveEvent: KvM03_BG::OnCroixActive
-          Variable: $@KvM03BG_id2
-
-Footer:
-  Imports:
-  - Path: db/import/battleground_db.yml
--- a/db/castle_db.txt
+++ b/db/castle_db.txt
@@ -0,0 +1,62 @@
+// Guild Castles Database
+//
+// Structure of Database:
+// CastleID,MapName,CastleName,OnGuildBreakEventName,Flag
+//
+// 01. CastleID                 Unique ID of the castle. Must remain unique across all map-servers.
+// 02. MapName                  Map name to be considered as the castle map.
+// 03. CastleName               Name of the castle (used by scripts and guardian name tags).
+// 04. OnGuildBreakEventName    NPC unique name to invoke ::OnGuildBreak on, when a occupied
+//                              castle is abandoned during guild break.
+
+// WOE FE castle
+0,aldeg_cas01,Neuschwanstein,Agit#aldeg_cas01	// kRO : Noisyubantian
+1,aldeg_cas02,Hohenschwangau,Agit#aldeg_cas02	// kRO : Hohensyubangawoo
+2,aldeg_cas03,Nuernberg,Agit#aldeg_cas03		// kRO : Nyirenverk
+3,aldeg_cas04,Wuerzburg,Agit#aldeg_cas04		// kRO : Byirtsburi
+4,aldeg_cas05,Rothenburg,Agit#aldeg_cas05		// kRO : Rotenburk
+5,gefg_cas01,Repherion,Agit#gefg_cas01			// kRO : Reprion
+6,gefg_cas02,Eeyolbriggar,Agit#gefg_cas02		// kRO : Yolbriger
+7,gefg_cas03,Yesnelph,Agit#gefg_cas03			// kRO : Isinlife
+8,gefg_cas04,Bergel,Agit#gefg_cas04				// kRO : Berigel
+9,gefg_cas05,Mersetzdeitz,Agit#gefg_cas05		// kRO : Melsedetsu
+10,payg_cas01,Bright Arbor,Agit#payg_cas01		// kRO : Mingting
+11,payg_cas02,Scarlet Palace,Agit#payg_cas02	// kRO : Tiantan
+12,payg_cas03,Holy Shadow,Agit#payg_cas03		// kRO : Fuying
+13,payg_cas04,Sacred Altar,Agit#payg_cas04		// kRO : Honglou
+14,payg_cas05,Bamboo Grove Hill,Agit#payg_cas05	// kRO : Zhulinxian
+15,prtg_cas01,Kriemhild,Agit#prtg_cas01			// kRO : Creamhilt
+16,prtg_cas02,Swanhild,Agit#prtg_cas02			// kRO : Sbanhealt
+17,prtg_cas03,Fadhgridh,Agit#prtg_cas03			// kRO : Lazrigees
+18,prtg_cas04,Skoegul,Agit#prtg_cas04			// kRO : Squagul
+19,prtg_cas05,Gondul,Agit#prtg_cas05			// kRO : Guindull
+
+// WOE NGuild castle
+20,nguild_alde,Earth,Agit_N01
+21,nguild_gef,Air,Agit_N02
+22,nguild_pay,Water,Agit_N03
+23,nguild_prt,Fire,Agit_N04
+
+// WOE SE castle
+24,schg_cas01,Himinn,Manager#schg_cas01			// kRO : Himinn
+25,schg_cas02,Andlangr,Manager#schg_cas02		// kRO : Andlangr
+26,schg_cas03,Viblainn,Manager#schg_cas03		// kRO : Viblainn
+27,schg_cas04,Hljod,Manager#schg_cas04			// kRO : Hljod
+28,schg_cas05,Skidbladnir,Manager#schg_cas05	// kRO : Skidbladnir
+29,arug_cas01,Mardol,Manager#arug_cas01			// kRO : Mardol
+30,arug_cas02,Cyr,Manager#arug_cas02			// kRO : Cyr
+31,arug_cas03,Horn,Manager#arug_cas03			// kRO : Horn
+32,arug_cas04,Gefn,Manager#arug_cas04			// kRO : Gefn
+33,arug_cas05,Bandis,Manager#arug_cas05			// kRO : Bandis
+
+// WOE TE castle
+34,te_aldecas1,Kafragarten 1,Manager_TE#Glaris
+35,te_aldecas2,Kafragarten 2,Manager_TE#Defolty
+36,te_aldecas3,Kafragarten 3,Manager_TE#Sorin
+37,te_aldecas4,Kafragarten 4,Manager_TE#Bennit
+38,te_aldecas5,Kafragarten 5,Manager_TE#W
+39,te_prtcas01,Gloria 1,Manager_TE#Gaebolg
+40,te_prtcas02,Gloria 2,Manager_TE#Richard
+41,te_prtcas03,Gloria 3,Manager_TE#Wigner
+42,te_prtcas04,Gloria 4,Manager_TE#Heine
+43,te_prtcas05,Gloria 5,Manager_TE#Nerious
--- a/db/castle_db.yml
+++ b/db/castle_db.yml
@@ -1,41 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Guild Castles Database
-###########################################################################
-#
-# Guild Castles Settings
-#
-###########################################################################
-# - Id                Unique ID of the castle.
-#   Map               Map name to be considered as the castle map.
-#   Name              Name of the castle (used by scripts and guardian name tags).
-#   Npc               NPC unique name to invoke ::OnGuildBreak on, when a occupied castle is abandoned during guild break.
-###########################################################################
-
-Header:
-  Type: CASTLE_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/castle_db.yml
-    Mode: Prerenewal
-  - Path: db/re/castle_db.yml
-    Mode: Renewal
-  - Path: db/import/castle_db.yml
--- a/db/const.txt
+++ b/db/const.txt
@@ -0,0 +1,215 @@
+// Script Constant Database
+//
+// Structure of Database:
+// Identifier	Value[	Type]
+//
+// Alternatively:
+// Identifier,Value[,Type]
+//
+// 01. Identifier   Unique name for the constant, must not have same name as script commands, functions or variables.
+// 02. Value        Value assigned to the constant. This value cannot be changed during the runtime of the server.
+// 03. Type         Specifies whether the identifier is a constant (0) or a parameter (1) (optional, defaults to 0).
+//
+// NOTE:            Parameters are special in that they retrieve certain runtime values depending on the specified ID
+//                  in field Value. Depending on the implementation values assigned by scripts to parameters will affect
+//                  runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
+
+RDMOPT_VAR_MAXHPAMOUNT	1
+RDMOPT_VAR_MAXSPAMOUNT	2
+RDMOPT_VAR_STRAMOUNT	3
+RDMOPT_VAR_AGIAMOUNT	4
+RDMOPT_VAR_VITAMOUNT	5
+RDMOPT_VAR_INTAMOUNT	6
+RDMOPT_VAR_DEXAMOUNT	7
+RDMOPT_VAR_LUKAMOUNT	8
+RDMOPT_VAR_MAXHPPERCENT	9
+RDMOPT_VAR_MAXSPPERCENT	10
+RDMOPT_VAR_HPACCELERATION	11
+RDMOPT_VAR_SPACCELERATION	12
+RDMOPT_VAR_ATKPERCENT	13
+RDMOPT_VAR_MAGICATKPERCENT	14
+RDMOPT_VAR_PLUSASPD	15
+RDMOPT_VAR_PLUSASPDPERCENT	16
+RDMOPT_VAR_ATTPOWER	17
+RDMOPT_VAR_HITSUCCESSVALUE	18
+RDMOPT_VAR_ATTMPOWER	19
+RDMOPT_VAR_ITEMDEFPOWER	20
+RDMOPT_VAR_MDEFPOWER	21
+RDMOPT_VAR_AVOIDSUCCESSVALUE	22
+RDMOPT_VAR_PLUSAVOIDSUCCESSVALUE	23
+RDMOPT_VAR_CRITICALSUCCESSVALUE	24
+RDMOPT_ATTR_TOLERACE_NOTHING	25
+RDMOPT_ATTR_TOLERACE_WATER	26
+RDMOPT_ATTR_TOLERACE_GROUND	27
+RDMOPT_ATTR_TOLERACE_FIRE	28
+RDMOPT_ATTR_TOLERACE_WIND	29
+RDMOPT_ATTR_TOLERACE_POISON	30
+RDMOPT_ATTR_TOLERACE_SAINT	31
+RDMOPT_ATTR_TOLERACE_DARKNESS	32
+RDMOPT_ATTR_TOLERACE_TELEKINESIS	33
+RDMOPT_ATTR_TOLERACE_UNDEAD	34
+RDMOPT_ATTR_TOLERACE_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
+
+SWORDCLAN	1
+ARCWANDCLAN	2
+GOLDENMACECLAN	3
+CROSSBOWCLAN	4
+JUMPINGCLAN	5
--- a/db/const.yml
+++ b/db/const.yml
@@ -1,51 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Script Constant Database
-###########################################################################
-#
-# Script Constant Settings
-#
-###########################################################################
-# - Name             Unique name for the constant. Must not have same name as script commands, functions, or variables.
-#   Value            Value assigned to the constant. This value cannot be changed during the runtime of the server.
-#   Parameter        Specifies whether the identifier is a parameter. (Default: false)
-#                    Note: Parameters are special in that they retrieve certain runtime values depending on the specified ID
-#                    in field Value. Depending on the implementation values assigned by scripts the parameters will affect
-#                    runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
-###########################################################################
-
-Header:
-  Type: CONSTANT_DB
-  Version: 1
-
-Body:
-  - Name: SWORDCLAN
-    Value: 1
-  - Name: ARCWANDCLAN
-    Value: 2
-  - Name: GOLDENMACECLAN
-    Value: 3
-  - Name: CROSSBOWCLAN
-    Value: 4
-  - Name: JUMPINGCLAN
-    Value: 5
-
-Footer:
-  Imports:
-  - Path: db/import/const.yml
--- a/db/create_arrow_db.txt
+++ b/db/create_arrow_db.txt
@@ -0,0 +1,289 @@
+// Arrow Crafting Database
+//
+// Structure of Database:
+// SourceID,MakeID1,MakeAmount1,...,MakeID5,MakeAmount5
+//
+// 01. SourceID     ID of the item, that is consumed by Arrow Crafting.
+// 02. MakeID       ID of the item received from Arrow Crafting.
+// 03. MakeAmount   Amount of MakeID item received from Arrow Crafting.
+// ...
+//
+// NOTE:
+// - Up to MAX_ARROW_RESULT (typically 5) ID/Amount pairs can be specified.
+// - To remove entry by importing, put 0 on 'MakeID'
+
+// Old Blue Box --> 50 Sharp Arrows, 50 Sleep Arrows
+603,1764,50,1768,50
+// Dead Branch --> 40 Mute Arrows
+604,1769,40
+// Amulet --> 40 Cursed Arrows
+609,1761,40
+// Empty Bottle --> 2 Iron Arrows
+713,1770,2
+// Emperium --> 600 Immaterial Arrows, 600 Mute Arrows, 600 Oridecon Arrows
+714,1757,600,1769,600,1765,600
+// Yellow Gemstone --> 30 Stone Arrows, 1 Sleep Arrow
+715,1756,30,1768,1
+// Red Gemstone --> 10 Rusty Arrows, 1 Poison Arrow, 1 Cursed Arrow
+716,1762,10,1763,1,1761,1
+// Blue Gemstone --> 30 Crystal Arrows, 1 Frozen Arrow
+717,1754,30,1759,1
+// Cursed Ruby --> 50 Cursed Arrows, 10 Sleep Arrows
+724,1761,50,1768,10
+// Cracked Diamond --> 50 Sharp Arrows
+733,1764,50
+// Rough Oridecon --> 50 Oridecon Arrows
+756,1765,50
+// Rough Elunium --> 200 Steel Arrows, 5 Stun Arrows
+757,1753,200,1758,5
+// Tree Root --> 7 Arrows
+902,1750,7
+// Scorpion Tail --> 3 Rusty Arrows
+904,1762,3
+// Jellopy --> 4 Arrows
+909,1750,4
+// Garlet --> 12 Iron Arrows
+910,1770,12
+// Scell --> 8 Steel Arrows
+911,1753,8
+// Zargon --> 50 Silver Arrows
+912,1751,50
+// Tooth of Bat --> 1 Shadow Arrow
+913,1767,1
+// Wolf Claw --> 15 Iron Arrows
+920,1770,15
+// Orc's Fang --> 30 Iron Arrows, 5 Steel Arrows, 10 Stone Arrows
+922,1770,30,1753,5,1756,10
+// Evil Horn --> 20 Shadow Arrows, 10 Flash Arrows, 5 Stun Arrows
+923,1767,20,1760,10,1758,5
+// Venom Canine --> 1 Poison Arrow
+937,1763,1
+// Bee Sting --> 1 Rusty Arrow
+939,1762,1
+// Horn --> 35 Iron Arrows
+947,1770,35
+// Cactus Needle --> 50 Arrows
+952,1750,50
+// Gill --> 80 Iron Arrows, 150 Crystal Arrows
+956,1770,80,1754,150
+// Decayed Nail --> 1 Rusty Arrow, 1 Shadow Arrow
+957,1762,1,1767,1
+// Horrendous Mouth --> 5 Shadow Arrows
+958,1767,5
+// Stinky Scale --> 1 Poison Arrow
+959,1763,1
+// Heroic Emblem --> 1 Oridecon Arrow, 5 Stun Arrows
+968,1765,1,1758,5
+// Gold --> 50 Flash Arrows, 50 Oridecon Arrows
+969,1760,50,1765,50
+// Oridecon --> 250 Oridecon Arrows
+984,1765,250
+// Elunium --> 1000 Steel Arrows, 50 Stun Arrows
+985,1753,1000,1758,50
+// Red Blood --> 600 Fire Arrows
+990,1752,600
+// Crystal Blue --> 150 Crystal Arrows
+991,1754,150
+// Wind of Verdure --> 150 Arrows of Wind
+992,1755,150
+// Green Live --> 150 Stone Arrows
+993,1756,150
+// Flame Heart --> 1800 Fire Arrows, 5 Mute Arrows
+994,1752,1800,1769,5
+// Mystic Frozen --> 450 Crystal Arrows, 5 Frozen Arrows
+995,1754,450,1759,5
+// Rough Wind --> 450 Arrows of Wind, 5 Sleep Arrows
+996,1755,450,1768,5
+// Great Nature --> 450 Stone Arrows, 5 Flash Arrows
+997,1756,450,1760,5
+// Iron --> 100 Iron Arrows
+998,1770,100
+// Steel --> 100 Steel Arrows
+999,1753,100
+// Star Crumb --> 30 Flash Arrows
+1000,1760,30
+// Star Dust --> 10 Flash Arrows
+1001,1760,10
+// Iron Ore --> 50 Iron Arrows
+1002,1770,50
+// Coal --> 8 Shadow Arrows
+1003,1767,8
+// Phracon --> 50 Iron Arrows
+1010,1770,50
+// Emveretarcon --> 200 Iron Arrows, 40 Silver Arrows
+1011,1770,200,1751,40
+// Mole Claw --> 50 Iron Arrows, 60 Stone Arrows
+1018,1770,50,1756,60
+// Trunk --> 40 Arrows
+1019,1750,40
+// Dokebi Horn --> 40 Iron Arrows, 2 Shadow Arrows
+1021,1770,40,1767,2
+// Porcupine Quill --> 70 Arrows, 30 Stone Arrows
+1027,1750,70,1756,30
+// Mantis Scythe --> 1 Sharp Arrow
+1031,1764,1
+// Dragon Canine --> 1 Oridecon Arrow, 50 Iron Arrows
+1035,1765,1,1770,50
+// Little Evil Horn --> 2 Cursed Arrows, 50 Iron Arrows
+1038,1761,2,1770,50
+// Lantern --> 80 Iron Arrows
+1041,1770,80
+// Orc Claw --> 10 Steel Arrows
+1043,1753,10
+// Zenorc's Fang --> 5 Rusty Arrows
+1044,1762,5
+// Ancient Tooth --> 20 Steel Arrows, 300 Crystal Arrows
+1053,1753,20,1754,300
+// Fang --> 2 Sharp Arrows, 40 Silver Arrows
+1063,1764,2,1751,40
+// Reins --> 100 Iron Arrows, 50 Steel Arrows
+1064,1770,100,1753,50
+// Fine-grained Trunk --> 20 Arrows
+1066,1750,20
+// Solid Trunk --> 20 Arrows
+1067,1750,20
+// Barren Trunk --> 20 Arrows
+1068,1750,20
+// Clock Hand --> 5 Sleep Arrows, 100 Arrows
+1095,1768,5,1750,100
+// Manacles --> 50 Steel Arrows
+1098,1753,50
+// Unicorn Horn --> 1000 Silver Arrows
+2257,1751,1000
+// Opera Masque --> 200 Steel Arrows, 40 Mute Arrows
+2281,1753,200,1769,40
+// Mr. Scream --> 200 Sharp Arrows, 300 Steel Arrows
+2288,1764,200,1753,300
+// Welding Mask --> 200 Steel Arrows, 40 Stun Arrows
+2292,1753,200,1758,40
+// Glittering Jacket --> 1000 Flash Arrows
+2319,1760,1000
+// Wooden Mail --> 700 Arrows, 500 Iron Arrows
+2328,1750,700,1770,500
+// Wooden Mail (Slotted) --> 1000 Arrows, 700 Iron Arrows
+2329,1750,1000,1770,700
+// Silver Robe --> 700 Silver Arrows
+2332,1751,700
+// Silver Robe (Slotted) --> 1000 Silver Arrows, 10 Immaterial Arrows
+2333,1751,1000,1757,10
+// Shackles --> 700 Iron Arrows, 50 Steel Arrows
+2408,1770,700,1753,50
+// Matyr's Leash --> 150 Arrows of Wind, 100 Steel Arrows, 10 Sharp Arrows
+2618,1755,150,1753,100,1764,10
+// Fin Helm --> 600 Crystal Arrows, 200 Steel Arrows
+5014,1754,600,1753,200
+// Ogre Tooth --> 30 Steel Arrows, 5 Rusty Arrows
+7002,1753,30,1762,5
+// Stiff Horn --> 2 Stun Arrows
+7008,1758,2
+// Tail of Steel Scorpion --> 250 Steel Arrows, 1 Poison Arrow
+7010,1753,250,1763,1
+// Young Twig --> 1000 Mute Arrows
+7018,1769,1000
+// Loki's Whispers --> 1000 Shadow Arrows
+7019,1767,1000
+// Mother's Nightmare --> 1000 Cursed Arrows
+7020,1761,1000
+// Foolishness of the Blind --> 200 Flash Arrows
+7021,1760,200
+// Old Hilt --> 1000 Oridecon Arrows
+7022,1765,1000
+// Blade of Darkness --> 600 Sharp Arrows, 200 Shadow Arrows
+7023,1764,600,1767,200
+// Bloody Edge --> 600 Sharp Arrows, 200 Cursed Arrows
+7024,1764,600,1761,200
+// Lucifer's Lament --> 800 Stun Arrows, 400 Mute Arrows, 800 Sleep Arrows
+7025,1758,800,1769,400,1768,800
+// Key of the Clock Tower --> 50 Oridecon Arrows
+7026,1765,50
+// Key of the Underground --> 100 Shadow Arrows
+7027,1767,100
+// Matchstick --> 3000 Fire Arrows
+7035,1752,3000
+// Fang of Garm --> 300 Crystal Arrows
+7036,1754,300
+
+//New Ingredients
+
+// Ice Cubic --> 100 Crystal Arrows
+7066,1754,100
+// Stone Fragment --> 50 Stone Arrows, 30 Stun Arrows
+7067,1756,50,1758,30
+// Burnt Tree --> 250 Fire Arrows
+7068,1752,250
+// Destroyed Armor --> 150 Steel Arrows
+7069,1753,150
+// Burning Heart --> 150 Fire Arrows
+7097,1752,150
+// Live Coal --> 100 Fire Arrows
+7098,1752,100
+// Sharp Leaf --> 30 Sharp Arrows
+7100,1764,30
+// Piece of Shield --> 100 Steel Arrows, 100 Oridecon Arrows, 300 Immaterial Arrows
+7108,1753,100,1765,100,1757,300
+// Shining Spear Blade --> 100 Oridecon Arrows
+7109,1765,100
+// Burning Horseshoe --> 100 Steel Arrows
+7120,1753,100
+// Dragon Skin --> 10 Steel Arrows, 50 Cursed Arrows, 50 Mute Arrows
+7123,1753,10,1761,50,1769,50
+// Piece of Bamboo --> 100 Arrows
+7150,1750,100
+// Poisonous Toad Skin --> 20 Poison Arrows
+7155,1763,20
+// Hard Feeler --> 20 Sharp Arrows
+7163,1764,20
+// Solid Peach --> 30 Stun Arrows
+7164,1758,30
+// Leopard Claw --> 10 Sharp Arrows
+7172,1764,10
+// Armor Piece of Dullahan --> 150 Shadow Arrows
+7210,1767,150
+// Tangled Chains --> 50 Steel Arrows, 50 Shadow Arrows
+7221,1753,50,1767,50
+// Cat's Eye --> 200 Arrows of Wind
+7263,1755,200
+// Dark Crystal Fragment --> 30 Cursed Arrows, 50 Shadow Arrows
+7315,1761,30,1767,50
+// Insect Leg --> 10 Sharp Arrows, 50 Poison Arrows
+7316,1764,10,1763,50
+// Old Pick --> 100 Rusty Arrows, 50 Steel Arrows
+7318,1762,100,1753,50
+// Used Iron Plate --> 100 Rusty Arrows, 100 Steel Arrows
+7319,1762,100,1753,100
+// Crystal Fragment --> 10 Flash Arrows, 30 Sleep Arrows
+7321,1760,10,1768,30
+// Battered Kettle --> 50 Steel Arrows
+7323,1753,50
+// Will of the Darkness --> 30 Cursed Arrows, 30 Poison Arrows, 50 Shadow Arrows
+7340,1761,30,1763,30,1767,50
+// Golden Ornament --> 200 Silver Arrows, 300 Holy Arrows
+7435,1751,200,1772,300
+// Cursed Seal --> 50 Cursed Arrows, 50 Mute Arrows
+7442,1761,50,1769,50
+// Green Bijou --> 100 Stone Arrows, 80 Poison Arrows
+7445,1756,100,1763,80
+// Blue Bijou --> 50 Arrows of Wind, 50 Crystal Arrows, 80 Frozen Arrows
+7446,1755,50,1754,50,1759,80
+// Red Bijou --> 100 Fire Arrows, 80 Flash Arrows
+7447,1752,100,1760,80
+// Yellow Bijou --> 50 Silver Arrows, 50 Immaterial Arrows, 80 Sleep Arrows
+7448,1751,50,1757,50,1768,80
+// Skeletal Armor Piece --> 500 Immaterial Arrows, 200 Shadow Arrows, 100 Oridecon Arrows
+7450,1757,500,1767,200,1765,100
+// Fire Dragon Scale --> 300 Fire Arrows, 300 Stun Arrows
+7451,1752,300,1758,300
+// Valhalla's Flower --> 600 Immaterial Arrows, 600 Holy Arrows, 600 Sharp Arrows
+7510,1757,600,1772,600,1764,600
+// Darkness Rune --> 300 Shadow Arrows, 150 Flash Arrows
+7511,1767,300,1760,150
+// Ice Heart --> 50 Crystal Arrows, 50 Frozen Arrows
+7561,1754,50,1759,50
+// Ice Scale --> 150 Crystal Arrows, 400 Frozen Arrows, 200 Mute Arrows
+7562,1754,150,1759,400,1769,200
+// Will of Red Darkness --> 200 Cursed Arrows, 200 Poison Arrows, 100 Shadow Arrows
+7566,1761,200,1763,200,1767,100
+// Clattering Skull --> 50 Shadow Arrows, 50 Cursed Arrows
+7752,1767,50,1761,50
+// Broken Farm Tools --> 50 Rusty Arrows, 10 Iron Arrows, 20 Cursed Arrows
+7753,1762,50,1770,10,1761,20
--- a/db/create_arrow_db.yml
+++ b/db/create_arrow_db.yml
@@ -1,749 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Arrow Crafting Database
-###########################################################################
-#
-# Arrow Crafting Settings
-#
-###########################################################################
-# - Source              AegisName of the item that is consumed.
-#   Make:               List of item(s) received by the player.
-#     - Item            AegisName of the item received.
-#       Amount          Amount of Item received. (Use 0 to remove the Item on import)
-###########################################################################
-
-Header:
-  Type: CREATE_ARROW_DB
-  Version: 1
-
-Body:
-  - Source: Old_Blue_Box
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 50
-      - Item: Sleep_Arrow
-        Amount: 50
-  - Source: Branch_Of_Dead_Tree
-    Make:
-      - Item: Silence_Arrow
-        Amount: 40
-  - Source: Amulet
-    Make:
-      - Item: Curse_Arrow
-        Amount: 40
-  - Source: Empty_Bottle
-    Make:
-      - Item: Iron_Arrow
-        Amount: 2
-  - Source: Emperium
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 600
-      - Item: Oridecon_Arrow
-        Amount: 600
-      - Item: Silence_Arrow
-        Amount: 600
-  - Source: Yellow_Gemstone
-    Make:
-      - Item: Sleep_Arrow
-        Amount: 1
-      - Item: Stone_Arrow
-        Amount: 30
-  - Source: Red_Gemstone
-    Make:
-      - Item: Curse_Arrow
-        Amount: 1
-      - Item: Poison_Arrow
-        Amount: 1
-      - Item: Rusty_Arrow
-        Amount: 10
-  - Source: Blue_Gemstone
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 30
-      - Item: Freezing_Arrow
-        Amount: 1
-  - Source: Cardinal_Jewel_
-    Make:
-      - Item: Curse_Arrow
-        Amount: 50
-      - Item: Sleep_Arrow
-        Amount: 10
-  - Source: Crystal_Jewel___
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 50
-  - Source: Oridecon_Stone
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 50
-  - Source: Elunium_Stone
-    Make:
-      - Item: Steel_Arrow
-        Amount: 200
-      - Item: Stun_Arrow
-        Amount: 5
-  - Source: Tree_Root
-    Make:
-      - Item: Arrow
-        Amount: 7
-  - Source: Scorpion's_Tail
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 3
-  - Source: Jellopy
-    Make:
-      - Item: Arrow
-        Amount: 4
-  - Source: Garlet
-    Make:
-      - Item: Iron_Arrow
-        Amount: 12
-  - Source: Scell
-    Make:
-      - Item: Steel_Arrow
-        Amount: 8
-  - Source: Zargon
-    Make:
-      - Item: Silver_Arrow
-        Amount: 50
-  - Source: Tooth_Of_Bat
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 1
-  - Source: Claw_Of_Wolves
-    Make:
-      - Item: Iron_Arrow
-        Amount: 15
-  - Source: Orcish_Cuspid
-    Make:
-      - Item: Iron_Arrow
-        Amount: 30
-      - Item: Steel_Arrow
-        Amount: 5
-      - Item: Stone_Arrow
-        Amount: 10
-  - Source: Evil_Horn
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 20
-      - Item: Flash_Arrow
-        Amount: 10
-      - Item: Stun_Arrow
-        Amount: 5
-  - Source: Posionous_Canine
-    Make:
-      - Item: Poison_Arrow
-        Amount: 1
-  - Source: Bee_Sting
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 1
-  - Source: Horn
-    Make:
-      - Item: Iron_Arrow
-        Amount: 35
-  - Source: Cactus_Needle
-    Make:
-      - Item: Arrow
-        Amount: 50
-  - Source: Gill
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 150
-      - Item: Iron_Arrow
-        Amount: 80
-  - Source: Decayed_Nail
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 1
-      - Item: Rusty_Arrow
-        Amount: 1
-  - Source: Horrendous_Mouth
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 5
-  - Source: Rotten_Scale
-    Make:
-      - Item: Poison_Arrow
-        Amount: 1
-  - Source: Voucher_Of_Orcish_Hero
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 1
-      - Item: Stun_Arrow
-        Amount: 5
-  - Source: Gold
-    Make:
-      - Item: Flash_Arrow
-        Amount: 50
-      - Item: Oridecon_Arrow
-        Amount: 50
-  - Source: Oridecon
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 250
-  - Source: Elunium
-    Make:
-      - Item: Steel_Arrow
-        Amount: 1000
-      - Item: Stun_Arrow
-        Amount: 50
-  - Source: Boody_Red
-    Make:
-      - Item: Fire_Arrow
-        Amount: 600
-  - Source: Crystal_Blue
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 150
-  - Source: Wind_Of_Verdure
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 150
-  - Source: Yellow_Live
-    Make:
-      - Item: Stone_Arrow
-        Amount: 150
-  - Source: Flame_Heart
-    Make:
-      - Item: Fire_Arrow
-        Amount: 1800
-      - Item: Silence_Arrow
-        Amount: 5
-  - Source: Mistic_Frozen
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 450
-      - Item: Freezing_Arrow
-        Amount: 5
-  - Source: Rough_Wind
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 450
-      - Item: Sleep_Arrow
-        Amount: 5
-  - Source: Great_Nature
-    Make:
-      - Item: Flash_Arrow
-        Amount: 5
-      - Item: Stone_Arrow
-        Amount: 450
-  - Source: Iron
-    Make:
-      - Item: Iron_Arrow
-        Amount: 100
-  - Source: Steel
-    Make:
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Star_Crumb
-    Make:
-      - Item: Flash_Arrow
-        Amount: 30
-  - Source: Sparkling_Dust
-    Make:
-      - Item: Flash_Arrow
-        Amount: 10
-  - Source: Iron_Ore
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-  - Source: Coal
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 8
-  - Source: Phracon
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-  - Source: Emveretarcon
-    Make:
-      - Item: Iron_Arrow
-        Amount: 200
-      - Item: Silver_Arrow
-        Amount: 40
-  - Source: Nail_Of_Mole
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-      - Item: Stone_Arrow
-        Amount: 60
-  - Source: Wooden_Block
-    Make:
-      - Item: Arrow
-        Amount: 40
-  - Source: Dokkaebi_Horn
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 2
-      - Item: Iron_Arrow
-        Amount: 40
-  - Source: Porcupine_Spike
-    Make:
-      - Item: Arrow
-        Amount: 70
-      - Item: Stone_Arrow
-        Amount: 30
-  - Source: Limb_Of_Mantis
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 1
-  - Source: Dragon_Canine
-    Make:
-      - Item: Iron_Arrow
-        Amount: 50
-      - Item: Oridecon_Arrow
-        Amount: 1
-  - Source: Petite_DiablOfs_Horn
-    Make:
-      - Item: Curse_Arrow
-        Amount: 2
-      - Item: Iron_Arrow
-        Amount: 50
-  - Source: Lantern
-    Make:
-      - Item: Iron_Arrow
-        Amount: 80
-  - Source: Nail_Of_Orc
-    Make:
-      - Item: Steel_Arrow
-        Amount: 10
-  - Source: Tooth_Of_
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 5
-  - Source: Tooth_Of_Ancient_Fish
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 300
-      - Item: Steel_Arrow
-        Amount: 20
-  - Source: Sharpened_Cuspid
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 2
-      - Item: Silver_Arrow
-        Amount: 40
-  - Source: Reins
-    Make:
-      - Item: Iron_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Tree_Of_Archer_1
-    Make:
-      - Item: Arrow
-        Amount: 20
-  - Source: Tree_Of_Archer_2
-    Make:
-      - Item: Arrow
-        Amount: 20
-  - Source: Tree_Of_Archer_3
-    Make:
-      - Item: Arrow
-        Amount: 20
-  - Source: Needle_Of_Alarm
-    Make:
-      - Item: Arrow
-        Amount: 100
-      - Item: Sleep_Arrow
-        Amount: 5
-  - Source: Manacles
-    Make:
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Snowy_Horn
-    Make:
-      - Item: Silver_Arrow
-        Amount: 1000
-  - Source: Phantom_Of_Opera
-    Make:
-      - Item: Silence_Arrow
-        Amount: 40
-      - Item: Steel_Arrow
-        Amount: 200
-  - Source: Mr_Scream
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 200
-      - Item: Steel_Arrow
-        Amount: 300
-  - Source: Welding_Mask
-    Make:
-      - Item: Steel_Arrow
-        Amount: 200
-      - Item: Stun_Arrow
-        Amount: 40
-  - Source: Glittering_Clothes
-    Make:
-      - Item: Flash_Arrow
-        Amount: 1000
-  - Source: Wooden_Mail
-    Make:
-      - Item: Arrow
-        Amount: 700
-      - Item: Iron_Arrow
-        Amount: 500
-  - Source: Wooden_Mail_
-    Make:
-      - Item: Arrow
-        Amount: 1000
-      - Item: Iron_Arrow
-        Amount: 700
-  - Source: Silver_Robe
-    Make:
-      - Item: Silver_Arrow
-        Amount: 700
-  - Source: Silver_Robe_
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 10
-      - Item: Silver_Arrow
-        Amount: 1000
-  - Source: Cuffs
-    Make:
-      - Item: Iron_Arrow
-        Amount: 700
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Matyr's_Flea_Guard
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 150
-      - Item: Incisive_Arrow
-        Amount: 10
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Fin_Helm
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 600
-      - Item: Steel_Arrow
-        Amount: 200
-  - Source: Ogre_Tooth
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 5
-      - Item: Steel_Arrow
-        Amount: 30
-  - Source: Stiff_Horn
-    Make:
-      - Item: Stun_Arrow
-        Amount: 2
-  - Source: Tail_Of_Steel_Scorpion
-    Make:
-      - Item: Poison_Arrow
-        Amount: 1
-      - Item: Steel_Arrow
-        Amount: 250
-  - Source: Young_Twig
-    Make:
-      - Item: Silence_Arrow
-        Amount: 1000
-  - Source: Loki's_Whispers
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 1000
-  - Source: Mother's_Nightmare
-    Make:
-      - Item: Curse_Arrow
-        Amount: 1000
-  - Source: Foolishness_Of_Blind
-    Make:
-      - Item: Flash_Arrow
-        Amount: 200
-  - Source: Old_Hilt
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 1000
-  - Source: Blade_Lost_In_Darkness
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 200
-      - Item: Incisive_Arrow
-        Amount: 600
-  - Source: Bloody_Edge
-    Make:
-      - Item: Curse_Arrow
-        Amount: 200
-      - Item: Incisive_Arrow
-        Amount: 600
-  - Source: Lucifer's_Lament
-    Make:
-      - Item: Silence_Arrow
-        Amount: 400
-      - Item: Sleep_Arrow
-        Amount: 800
-      - Item: Stun_Arrow
-        Amount: 800
-  - Source: Key_Of_Clock_Tower
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 50
-  - Source: Underground_Key
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 100
-  - Source: Matchstick
-    Make:
-      - Item: Fire_Arrow
-        Amount: 3000
-  - Source: Fang_Of_Garm
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 300
-  - Source: Ice_Piece
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 100
-  - Source: Stone_Piece
-    Make:
-      - Item: Stone_Arrow
-        Amount: 50
-      - Item: Stun_Arrow
-        Amount: 30
-  - Source: Burn_Tree
-    Make:
-      - Item: Fire_Arrow
-        Amount: 250
-  - Source: Broken_Armor_Piece
-    Make:
-      - Item: Steel_Arrow
-        Amount: 150
-  - Source: Burning_Heart
-    Make:
-      - Item: Fire_Arrow
-        Amount: 150
-  - Source: Live_Coal
-    Make:
-      - Item: Fire_Arrow
-        Amount: 100
-  - Source: Sharp_Leaf
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 30
-  - Source: Boroken_Shiled_Piece
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 300
-      - Item: Oridecon_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Shine_Spear_Blade
-    Make:
-      - Item: Oridecon_Arrow
-        Amount: 100
-  - Source: Burning_Horse_Shoe
-    Make:
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Dragon's_Skin
-    Make:
-      - Item: Curse_Arrow
-        Amount: 50
-      - Item: Silence_Arrow
-        Amount: 50
-      - Item: Steel_Arrow
-        Amount: 10
-  - Source: Bamboo_Cut
-    Make:
-      - Item: Arrow
-        Amount: 100
-  - Source: Poison_Toad's_Skin
-    Make:
-      - Item: Poison_Arrow
-        Amount: 20
-  - Source: Sharp_Feeler
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 20
-  - Source: Hard_Peach
-    Make:
-      - Item: Stun_Arrow
-        Amount: 30
-  - Source: Leopard_Talon
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 10
-  - Source: Dullahan_Armor
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 150
-  - Source: Tangled_Chain
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Cat_Eyed_Stone
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 200
-  - Source: Dark_Crystal_Fragment
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Curse_Arrow
-        Amount: 30
-  - Source: Long_Limb
-    Make:
-      - Item: Incisive_Arrow
-        Amount: 10
-      - Item: Poison_Arrow
-        Amount: 50
-  - Source: Old_Pick
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Old_Steel_Plate
-    Make:
-      - Item: Rusty_Arrow
-        Amount: 100
-      - Item: Steel_Arrow
-        Amount: 100
-  - Source: Fragment_Of_Crystal
-    Make:
-      - Item: Flash_Arrow
-        Amount: 10
-      - Item: Sleep_Arrow
-        Amount: 30
-  - Source: Battered_Kettle
-    Make:
-      - Item: Steel_Arrow
-        Amount: 50
-  - Source: Will_Of_Darkness
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Curse_Arrow
-        Amount: 30
-      - Item: Poison_Arrow
-        Amount: 30
-  - Source: Golden_Bracelet
-    Make:
-      - Item: Holy_Arrow
-        Amount: 300
-      - Item: Silver_Arrow
-        Amount: 200
-  - Source: Cursed_Seal
-    Make:
-      - Item: Curse_Arrow
-        Amount: 50
-      - Item: Silence_Arrow
-        Amount: 50
-  - Source: Dragonball_Green
-    Make:
-      - Item: Poison_Arrow
-        Amount: 80
-      - Item: Stone_Arrow
-        Amount: 100
-  - Source: Dragonball_Blue
-    Make:
-      - Item: Arrow_Of_Wind
-        Amount: 50
-      - Item: Crystal_Arrow
-        Amount: 50
-      - Item: Freezing_Arrow
-        Amount: 80
-  - Source: Dragonball_Red
-    Make:
-      - Item: Fire_Arrow
-        Amount: 100
-      - Item: Flash_Arrow
-        Amount: 80
-  - Source: Dragonball_Yellow
-    Make:
-      - Item: Immatrial_Arrow
-        Amount: 50
-      - Item: Silver_Arrow
-        Amount: 50
-      - Item: Sleep_Arrow
-        Amount: 80
-  - Source: Piece_Of_Bone_Armor
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 200
-      - Item: Immatrial_Arrow
-        Amount: 500
-      - Item: Oridecon_Arrow
-        Amount: 100
-  - Source: Scale_Of_Red_Dragon
-    Make:
-      - Item: Fire_Arrow
-        Amount: 300
-      - Item: Stun_Arrow
-        Amount: 300
-  - Source: Valhalla_Flower
-    Make:
-      - Item: Holy_Arrow
-        Amount: 600
-      - Item: Immatrial_Arrow
-        Amount: 600
-      - Item: Incisive_Arrow
-        Amount: 600
-  - Source: Rune_Of_Darkness
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 300
-      - Item: Flash_Arrow
-        Amount: 150
-  - Source: Ice_Heart
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 50
-      - Item: Freezing_Arrow
-        Amount: 50
-  - Source: Ice_Scale
-    Make:
-      - Item: Crystal_Arrow
-        Amount: 150
-      - Item: Freezing_Arrow
-        Amount: 400
-      - Item: Silence_Arrow
-        Amount: 200
-  - Source: Will_Of_Darkness_
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 100
-      - Item: Curse_Arrow
-        Amount: 200
-      - Item: Poison_Arrow
-        Amount: 200
-  - Source: Clattering_Skull
-    Make:
-      - Item: Arrow_Of_Shadow
-        Amount: 50
-      - Item: Curse_Arrow
-        Amount: 50
-  - Source: Broken_Farming_Utensil
-    Make:
-      - Item: Curse_Arrow
-        Amount: 20
-      - Item: Iron_Arrow
-        Amount: 10
-      - Item: Rusty_Arrow
-        Amount: 50
-
-Footer:
-  Imports:
-  - Path: db/import/create_arrow_db.yml
--- a/db/elemental_db.txt
+++ b/db/elemental_db.txt
@@ -0,0 +1,25 @@
+// Elemental Summons Database
+//
+// Structure of Database:
+// ID,Sprite_Name,Name,LV,HP,SP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Speed,aDelay,aMotion,dMotion
+//
+// Notes:
+// Summoned Elemental’s STATs are affected by the Caster’s Base Level and STATs.
+// In other words, all values specified will be added to (and will not override) the calculated STATs of the summoned elemental.
+
+// Monster Elementals
+2114,EL_AGNI_S,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,83,200,504,1020,360
+2115,EL_AGNI_M,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,83,200,504,1020,360
+2116,EL_AGNI_L,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,83,200,504,1020,360
+
+2117,EL_AQUA_S,Aqua,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,81,200,504,1020,360
+2118,EL_AQUA_M,Aqua,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,81,200,504,1020,360
+2119,EL_AQUA_L,Aqua,100,0,1,1,0,0,0,0,1,1,1,1,1,1,5,12,2,0,81,200,504,1020,360
+
+2120,EL_VENTUS_S,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,84,200,504,1020,360
+2121,EL_VENTUS_M,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,84,200,504,1020,360
+2122,EL_VENTUS_L,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,84,200,504,1020,360
+
+2123,EL_TERA_S,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,82,200,504,1020,360
+2124,EL_TERA_M,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,82,200,504,1020,360
+2125,EL_TERA_L,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,82,200,504,1020,360
--- a/db/elemental_db.yml
+++ b/db/elemental_db.yml
@@ -1,66 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Elemental Summons Database
-###########################################################################
-#
-# Elemental Summons Settings
-#
-###########################################################################
-# - Id                      Elemental ID.
-#   AegisName               Server name to reference the elemental in scripts and lookups, should use no spaces.
-#   Name                    Name in English.
-#   Level                   Level.
-#   Hp                      Additional HP. Base HP depends on caster HP. (Default: 0)
-#   Sp                      Additional SP. Base SP depends on caster SP. (Default: 1)
-#   Attack                  Additional minimum attack. Base attack depends on caster attack. (Default: 0)
-#   Attack2                 Additional maximum attack. Base attack depends on caster attack. (Default: 0)
-#   Defense                 Physical defense of the elemental, reduces melee and ranged physical attack/skill damage. Base defense depends on the caster defense. (Default: 0)
-#   MagicDefense            Magic defense of the elemental, reduces magical skill damage. Base magic defense depends on the caster magic defense. (Default: 0)
-#   Str                     Strength which affects attack. (Default: 0)
-#   Agi                     Agility which affects flee. (Default: 0)
-#   Vit                     Vitality which affects defense. (Default: 0)
-#   Int                     Intelligence which affects magic attack. (Default: 0)
-#   Dex                     Dexterity which affects hit rate. (Default: 0)
-#   Luk                     Luck which affects perfect dodge/lucky flee/perfect flee/lucky dodge rate. (Default: 0)
-#   AttackRange             Attack range. (Default: 1)
-#   SkillRange              Skill cast range. (Default: 5)
-#   ChaseRange              Chase range. (Default: 12)
-#   Size                    Size.
-#   Race                    Race. (Default: Formless)
-#   Element                 Element.
-#   ElementLevel            Level of element.
-#   WalkSpeed               Walk speed. (Default: 200)
-#   AttackDelay             Attack speed. (Default: 504)
-#   AttackMotion            Attack animation speed. Base AttackMotion depends on the caster AttackMotion. (Default: 1020)
-#   DamageMotion            Damage animation speed. (Default: 360)
-#   Mode:                   List of elemental skills by mode. (Optional)
-#     <mode>:               Mode name to define the skill available. Available modes are Passive, Assist, and Aggressive.
-#       Skill               Skill name.
-#       Level               Skill level. (Default: 1)
-###########################################################################
-
-Header:
-  Type: ELEMENTAL_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/re/elemental_db.yml
-    Mode: Renewal
-  - Path: db/import/elemental_db.yml
--- a/db/elemental_skill_db.txt
+++ b/db/elemental_skill_db.txt
@@ -0,0 +1,56 @@
+// Elemental Summons Skill Database
+//
+// Structure of Database:
+// ElementalID,SkillID,SkillLevel,ReqMode
+//
+// Spirit Modes:
+//	1 = Passive, 2 = Defensive, 4 = Aggressive
+
+// EL_AGNI_S
+2114,8413,1,1	//EL_PYROTECHNIC,Pyrotechnic
+2114,8401,1,2	//EL_CIRCLE_OF_FIRE,Circle of Fire
+2114,8425,1,4	//EL_FIRE_ARROW,Fire Arrow
+// EL_AGNI_M
+2115,8414,1,1	//EL_HEATER,Heater
+2115,8402,1,2	//EL_FIRE_CLOAK,Fire Cloak
+2115,8426,1,4	//EL_FIRE_BOMB,Fire Bomb
+// EL_AGNI_L
+2116,8415,1,1	//EL_TROPIC,Tropic
+2116,8403,1,2	//EL_FIRE_MANTLE,Fire Mantle
+2116,8428,1,4	//EL_FIRE_WAVE,Fire Wave
+// EL_AQUA_S
+2117,8416,1,1	//EL_AQUAPLAY,Aqua Play
+2117,8404,1,2	//EL_WATER_SCREEN,Water Screen
+2117,8430,1,4	//EL_ICE_NEEDLE,Ice Needle
+// EL_AQUA_M
+2118,8417,1,1	//EL_COOLER,Cooler
+2118,8405,1,2	//EL_WATER_DROP,Water Drop
+2118,8431,1,4	//EL_WATER_SCREW,Water Screw
+// EL_AQUA_L
+2119,8418,1,1	//EL_CHILLY_AIR,Cool Air
+2119,8406,1,2	//EL_WATER_BARRIER,Water Barrier
+2119,8433,1,4	//EL_TIDAL_WEAPON,Tidal Weapon
+// EL_VENTUS_S
+2120,8419,1,1	//EL_GUST,Gust
+2120,8407,1,2	//EL_WIND_STEP,Wind Step
+2120,8434,1,4	//EL_WIND_SLASH,Wind Slasher
+// EL_VENTUS_M
+2121,8420,1,1	//EL_BLAST,Blast
+2121,8408,1,2	//EL_WIND_CURTAIN,Wind Curtain
+2121,8435,1,4	//EL_HURRICANE,Hurricane Rage
+// EL_VENTUS_L
+2122,8421,1,1	//EL_WILD_STORM,Wild Storm
+2122,8409,1,2	//EL_ZEPHYR,Zephyr
+2122,8437,1,4	//EL_TYPOON_MIS,Typhoon Missile
+// EL_TERA_S
+2123,8422,1,1	//EL_PETROLOGY,Petrology
+2123,8410,1,2	//EL_SOLID_SKIN,Solid Skin
+2123,8439,1,4	//EL_STONE_HAMMER,Stone Hammer
+// EL_TERA_M
+2124,8423,1,1	//EL_CURSED_SOIL,Cursed Soil
+2124,8411,1,2	//EL_STONE_SHIELD,Stone Shield
+2124,8440,1,4	//EL_ROCK_CRUSHER,Rock Launcher
+// EL_TERA_L
+2125,8424,1,1	//EL_UPHEAVAL,Upheaval
+2125,8412,1,2	//EL_POWER_OF_GAIA,Power of Gaia
+2125,8442,1,4	//EL_STONE_RAIN,Stone Rain
--- a/db/exp_guild.yml
+++ b/db/exp_guild.yml
@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Guild Experience Database
-###########################################################################
-#
-# Guild Experience Settings
-#
-###########################################################################
-# - Level                Level required.
-#   Exp                  Experience required to level up.
-###########################################################################
-
-Header:
-  Type: GUILD_EXP_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/exp_guild.yml
-    Mode: Prerenewal
-  - Path: db/re/exp_guild.yml
-    Mode: Renewal
-  - Path: db/import/exp_guild.yml
--- a/db/exp_homun.yml
+++ b/db/exp_homun.yml
@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Homunculus Experience Database
-###########################################################################
-#
-# Homunculus Experience Settings
-#
-###########################################################################
-# - Level   Level required.
-#   Exp     Experience required for the next level.
-###########################################################################
-
-Header:
-  Type: HOMUN_EXP_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/exp_homun.yml
-    Mode: Prerenewal
-  - Path: db/re/exp_homun.yml
-    Mode: Renewal
-  - Path: db/import/exp_homun.yml
--- a/db/guild_skill_tree.txt
+++ b/db/guild_skill_tree.txt
@@ -0,0 +1,29 @@
+// Guild Skill Tree Database
+//
+// Structure of Database:
+// SkillID,MaxLv,Prerequisite SkillID1,Prerequisite SkillLv1,PrereqSkillID2,PrereqSkillLv2,PrereqSkillID3,PrereqSkillLv3,PrereqSkillID4,PrereqSkillLv4,PrereqSkillID5,PrereqSkillLv5	//GUILD SKILLNAME#Skill Name#
+//
+// 01. SkillID                  Skill ID of the guild skill.
+// 02. MaxLv                    Maximum level of the guild skill.
+// 03. Prerequisite SkillID     Guild skill required for the skill to become available.
+// 04. Prerequisite SkillLv     Level of the required guild skill.
+// ...
+//
+// NOTE: MAX_GUILD_SKILL_REQUIRE (typically 5) ID/Lv pairs must be specified.
+
+
+10000,1,0,0,0,0,0,0,0,0,0,0	//GD_APPROVAL#Official Guild Approval#
+10001,1,10000,1,0,0,0,0,0,0,0,0	//GD_KAFRACONTRACT#Contract with Kafra#
+10002,1,10000,1,0,0,0,0,0,0,0,0	//GD_GUARDRESEARCH#Guardian Research#
+10003,3,0,0,0,0,0,0,0,0,0,0	//GD_GUARDUP#Strengthen Guardians#
+10004,10,0,0,0,0,0,0,0,0,0,0	//GD_EXTENSION#Guild Extension#
+10005,0,0,0,0,0,0,0,0,0,0,0	//GD_GLORYGUILD#Guilds Glory#
+10006,5,0,0,0,0,0,0,0,0,0,0	//GD_LEADERSHIP#Great Leadership#
+10007,5,0,0,0,0,0,0,0,0,0,0	//GD_GLORYWOUNDS#Glorious Wounds#
+10008,5,10007,1,0,0,0,0,0,0,0,0	//GD_SOULCOLD#Cold Heart#
+10009,5,10006,1,0,0,0,0,0,0,0,0	//GD_HAWKEYES#Sharp Gaze#
+10010,1,10000,1,10004,2,0,0,0,0,0,0	//GD_BATTLEORDER#Battle Command#
+10011,3,10000,1,10004,5,10010,1,0,0,0,0	//GD_REGENERATION#Regeneration#
+10012,1,10011,1,0,0,0,0,0,0,0,0	//GD_RESTORE#Restoration#
+10013,1,10000,1,10002,1,10004,5,10010,1,10011,1	//GD_EMERGENCYCALL#Urgent Call#
+10014,1,0,0,0,0,0,0,0,0,0,0	//GD_DEVELOPMENT#Permanent Development#
--- a/db/guild_skill_tree.yml
+++ b/db/guild_skill_tree.yml
@@ -1,44 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-###########################################################################
-# Guild Skill Database
-###########################################################################
-#
-# Guild Skill Settings
-#
-###########################################################################
-# Id - Skill ID of the guild skill.
-###########################################################################
-# MaxLevel - Maximum level of the guild skill.
-###########################################################################
-# Required - A list of required skills for the skill to become available.
-#   Id: Skill ID of the required guild skill.
-#   Level: Level of the required guild skill.
-###########################################################################
-
-Header:
-  Type: GUILD_SKILL_TREE_DB
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/guild_skill_tree.yml
-    Mode: Prerenewal
-  - Path: db/re/guild_skill_tree.yml
-    Mode: Renewal
-  - Path: db/import/guild_skill_tree.yml
--- a/db/homun_skill_tree.txt
+++ b/db/homun_skill_tree.txt
@@ -89,31 +89,31 @@
 //Eira
 6048,8022,5,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_LIGHT_OF_REGENE
 6048,8023,5,114,0,0,0,0,0,0,0,0,0,0,0	//MH_OVERED_BOOST
-6048,8024,10,106,0,0,0,0,0,0,0,0,0,0,0	//MH_ERASER_CUTTER
-6048,8025,10,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_XENO_SLASHER
+6048,8024,5,106,0,0,0,0,0,0,0,0,0,0,0	//MH_ERASER_CUTTER
+6048,8025,5,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_XENO_SLASHER
 6048,8026,5,137,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILENT_BREEZE
 //Bayeri
-6049,8031,10,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_STAHL_HORN
+6049,8031,5,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_STAHL_HORN
 6049,8032,5,112,0,0,0,0,0,0,0,0,0,0,0 	//MH_GOLDENE_FERSE
 6049,8033,5,121,0,0,0,0,0,0,0,0,0,0,0 	//MH_STEINWAND
-6049,8034,10,138,0,0,0,0,0,0,0,0,0,0,0	//MH_HEILIGE_STANGE
+6049,8034,5,138,0,0,0,0,0,0,0,0,0,0,0	//MH_HEILIGE_STANGE
 6049,8035,5,130,0,0,0,0,0,0,0,0,0,0,0	//MH_ANGRIFFS_MODUS
 //Sera
 6050,8018,5,132,0,0,0,0,0,0,0,0,0,0,0 	//MH_SUMMON_LEGION
-6050,8019,10,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_NEEDLE_OF_PARALYZE
+6050,8019,5,105,0,0,0,0,0,0,0,0,0,0,0 	//MH_NEEDLE_OF_PARALYZE
 6050,8020,5,116,0,0,0,0,0,0,0,0,0,0,0 	//MH_POISON_MIST
-6050,8021,10,123,0,0,0,0,0,0,0,0,0,0,0 	//MH_PAIN_KILLER
+6050,8021,5,123,0,0,0,0,0,0,0,0,0,0,0 	//MH_PAIN_KILLER
 //Dieter
 6051,8039,5,122,0,0,0,0,0,0,0,0,0,0,0 	//MH_MAGMA_FLOW
 6051,8040,5,116,0,0,0,0,0,0,0,0,0,0,0 	//MH_GRANITIC_ARMOR
-6051,8041,10,109,0,0,0,0,0,0,0,0,0,0,0 	//MH_LAVA_SLIDE
-6051,8042,10,131,0,0,0,0,0,0,0,0,0,0,0 	//MH_PYROCLASTIC
+6051,8041,5,109,0,0,0,0,0,0,0,0,0,0,0 	//MH_LAVA_SLIDE
+6051,8042,5,131,0,0,0,0,0,0,0,0,0,0,0 	//MH_PYROCLASTIC
 6051,8043,5,102,0,0,0,0,0,0,0,0,0,0,0 	//MH_VOLCANIC_ASH
 //Elanor
 6052,8027,1,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_STYLE_CHANGE
 6052,8028,5,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_SONIC_CRAW
-6052,8029,10,114,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILVERVEIN_RUSH
-6052,8030,10,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_MIDNIGHT_FRENZY
+6052,8029,5,114,0,0,0,0,0,0,0,0,0,0,0 	//MH_SILVERVEIN_RUSH
+6052,8030,5,128,0,0,0,0,0,0,0,0,0,0,0 	//MH_MIDNIGHT_FRENZY
 6052,8036,5,100,0,0,0,0,0,0,0,0,0,0,0 	//MH_TINDER_BREAKER
 6052,8037,5,112,0,0,0,0,0,0,0,0,0,0,0 	//MH_CBC
 6052,8038,5,133,0,0,0,0,0,0,0,0,0,0,0 	//MH_EQC
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
aleos89	4609695882	Merge branch 'master' into refactor/StatusChangeDisplay	2017-11-03 13:27:25 -04:00
Jey	30eca30350	Minor comment adjustments.	2017-09-30 16:36:17 +02:00
Jey	0c8a62abbd	Reapplied Acid Terror status def ignore.	2017-09-29 21:15:21 +02:00
Jey	a73da61129	Merge branch 'master' into refactor/StatusChangeDisplay	2017-09-29 02:16:51 +02:00
aleos89	4dc7001d6a	Merge branch 'master' into refactor/StatusChangeDisplay	2017-09-21 13:54:22 -04:00
Aleos	8807632e4a	Merge branch 'master' into refactor/StatusChangeDisplay	2017-08-28 14:01:01 -04:00
aleos89	d4f21d9800	Minor spacing fixes	2017-07-31 14:12:50 -04:00
Aleos	16506fa61e	Merge branch 'master' into refactor/StatusChangeDisplay	2017-07-06 21:21:43 -04:00
Jey	dc90bc159d	Removed status.h dependency from battle.c	2017-05-08 04:15:56 +02:00
Jey	79a127e510	Status Change display in status window.	2017-05-08 03:15:24 +02:00